Commit graph

141 commits

Author SHA1 Message Date
Christian Lohmaier
ee8257a1c7 migrate android build to gradle
move preparation tasks (creating assets/processing files) from the
makefile into the gradle script

This allows much easier integration into android-studio (just open
android/source with android studio after running make to compile the
native library)

Change-Id: I9a9d6832797c24a7e195a1c7954cd6d20f5a8496
2015-10-11 02:03:13 +02:00
Stephan Bergmann
5067d31364 Remove setting Make SHELL completely from the build system
...this is a follow-up to efad388f75 "Clean up
Make SHELL handling," which broke out-of-tree builds.

There appears to be no good reason at all to fiddle with Make's own behavior of
determining its SHELL variable (which defaults to /bin/sh and can be overridden
via a SHELL=... command line argument when invoking Make).  The SHELL_BASH
fiddling in configure.ac and Makefile.in was probably cargo cult carried along
ever since 815f157c05 "CWS-TOOLING: integrate CWS
configuretoplevel," in a time when the OOo build system still defaulted to tcsh.

Change-Id: If906164abb6aae649ce8088d945a40213deed361
Reviewed-on: https://gerrit.libreoffice.org/19093
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
2015-10-02 10:07:40 +00:00
Stephan Bergmann
efad388f75 Clean up Make SHELL handling
* In configure.ac, honour a preset SHELL_BASH when determining SHELL_BASH (so it
  can be passed in via autogen.input).

* For both toplevel "make" and per-module "cd $module && make", consistenly use
  the SHELL_BASH determined in configure.ac as the Make SHELL.  (By moving the
  setting to a new, common soleng/gbuild/shell.mk.  This also exports SHELL as
  an environment variable to sub-processes now; this exporting can probably be
  reverted if it is not what is actually wanted---but note that this exporting
  of an environment variable to sub-processes is unrelated to how nested
  invocations of $(MAKE) obtain their Make SHELL setting, see below.)

* Remove the gb_SHELL override feature from solenv/gbuild/gbuild.mk; for one, it
  is unclear how it was intended to interact with setting SHELL=@SHELL_BASH@ in
  the toplevel Makefile; for another, overriding SHELL can be done globally via
  setting SHELL_BASH in autogen.input now.

* Make treats SHELL specially, in that it never uses the SHELL environment
  variable to determine the Make SHELL variable.  Instead, if this Make
  invocation, or any outer Make invocation it is nested in via calls of $(MAKE),
  was called with a SHELL=... command line argument, then that value is used
  (and otherwise the default is hardwired as /bin/sh).  So, when calling nested
  invocations of $(MAKE) from the toplevel Makefile, pass down the current SHELL
  value via a SHELL=... command line argument via GMAKE_OPTIONS.  (And further
  nested invocations of $(MAKE) will then automatically inherit the SHELL value
  given on the outer invocation's command line.)

Change-Id: I67fa1b88e4e90d09456c1fcad2d082fdce3c019b
2015-10-02 10:59:34 +02:00
Michel Renon
71ace48844 QtCreator integration : git must ignore .pro and .pro.user files.
Change-Id: Ifd21679fb7dd2b5c0c3bfe7726bf2c4d19897e21
Reviewed-on: https://gerrit.libreoffice.org/17467
Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Tested-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
2015-08-02 13:15:44 +00:00
Zsolt Bölöny
d67f4ed258 Fix typo in .gitignore
Change-Id: Ibecee87ffe3ec6990e36952488668b790a8e54eb
Reviewed-on: https://gerrit.libreoffice.org/16076
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Joren De Cuyper <jorendc@libreoffice.org>
2015-06-04 11:00:05 +00:00
Miklos Vajna
562d8f57f0 lokdocview: adapt Android path
Change-Id: I786fd580b3d08fa076eeb2bf90bd23b09c9f8182
2015-05-21 17:57:38 +01:00
Yurii Kolesnykov
80bbca88d3 An attempt to fix xcode-ide-integration
Added more Xcode specific files to .gitignore.
Made some properties common in gbuil-to-ide to avoid code duplication/bugs.
Xcode projects are broken for now.

Change-Id: I9530435ffe54158ae68ddae0581ac68f968af235
Reviewed-on: https://gerrit.libreoffice.org/15694
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-05-19 11:49:08 +00:00
Adolfo Jayme Barrientos
48f8144b9d .gitignore: Add stupid KDE .directory files
Change-Id: I22c5ee3e7ef7cd2b3b40953d114e01dd3d36e0cb
2015-05-09 12:33:55 -05:00
Thorsten Behrens
d677e27cfa Also ignore idutils DB file.
Change-Id: I8e50e66b0834547d10748594eac2be0b5e65e163
2015-04-01 10:23:52 +02:00
David Tardon
f47e0bed6e gbuild: allow to react on change in configured langs
Change-Id: I15492fcc687a21b740dc2d97a47485e2e760055f
2015-03-25 17:52:20 +01:00
Adolfo Jayme Barrientos
99abe3b7cc .gitignore: Spelling.
Change-Id: I6d54f0aa3978996427551b429f88a74e81b90037
2015-03-22 14:09:17 -06:00
Vort
42bb1308ff Also ignore Visual Studio 2013 files
Change-Id: I21bba16d70f9f8c43b60b2bd2a5005a888d0c11d
Reviewed-on: https://gerrit.libreoffice.org/14073
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-01-21 12:36:30 +00:00
Takeshi Abe
775d99c87b add 'make etags' to generate etags
Change-Id: Id87f71b6d31720173f0c5ec2a4fc395065223b79
Reviewed-on: https://gerrit.libreoffice.org/12300
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-11-11 11:40:13 +00:00
Stephan Bergmann
bd633f4c85 Proper AC_CONFIG_FILE treatment
Change-Id: Ic029d0d174a00af783fd276852231523aae59866
2014-10-07 11:56:24 +02:00
Tor Lillqvist
68c99344ff Had /ure/source/unorc twice in here
Change-Id: Ia54dd005d7d3fb71eac646e1e24bc7c6b43410f5
2014-09-18 10:09:32 +03:00
Tor Lillqvist
332f6a5f99 The URE unorc is now set up in instsetoo_native/CustomTarget_setup.mk
So no need to expand it at configure time in ure/source/unorc, and no need to
handle the related builddir!=srcdir complications.

Change-Id: Ifa34d25fab9ad2da13ed039bf6c5921b0fb58703
2014-09-17 17:41:28 +03:00
Jan-Marek Glogowski
90e3e9c3c8 .gitignore /.gdb_history
Change-Id: I254c0104010cc1a1c12bbf1af048966de66924e6
Reviewed-on: https://gerrit.libreoffice.org/10973
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-08-18 05:06:30 -05:00
Lionel Elie Mamane
e93bba26dd git-ignore ure/source/unorc
Change-Id: If6526bfa6cbbb74c32325cf03e2845957fec7be6
2014-08-12 09:11:44 +02:00
Tor Lillqvist
835d3e818f Add ure/source/unorc
Change-Id: I9439a00d2186696a4891e5eefad066d50917f9c7
2014-08-11 18:31:36 +03:00
Jan-Marek Glogowski
5a6b71547f Git: ignore autogen, doxygen and gdb config files
Adds some additional files to .gitignore.

Change-Id: Ia5af298a91919fe00392282c0e5bb88fa2811a52
Reviewed-on: https://gerrit.libreoffice.org/8437
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-05-01 09:33:18 +00:00
Anderson Roberto
2604726a02 Add file extensions from MSVS to gitignore file
Change-Id: Icb976111a3442eff2cd3ba0b015eef7067fe7006
Reviewed-on: https://gerrit.libreoffice.org/7582
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-01-24 16:18:59 +00:00
Michael Stahl
0edcb54386 .gitignore: add test-install/
Change-Id: I41c617e27f34f730a3905fca67d841bdf237b5fe
2014-01-06 13:17:37 +01:00
Tor Lillqvist
ef8c2098a8 Ignore also instdir_for_build and workdir_for_build
Change-Id: I2e6a26cd1e54ad28ec27f2205262413db039a136
2013-12-05 12:38:57 +02:00
Norbert Thiebaud
09e2349c51 Save downloaded tarballs under external/tarballs/
The choice of src/ as a place to save those tarballs was unfortunate,
since it is used everywhere else for own source code. After moving all
external modules to external/, it makes sense to put the tarballs there
too and, while at it, use a more appropriate name.

If src exist as a directory, we move it to external/tarballs and leave
a link behind for backward compat for people switching from after to
before the change in the git repo.

Change-Id: I045c4470945f5fadf7760855833ef58e6594ec80
Reviewed-on: https://gerrit.libreoffice.org/6597
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-11-21 02:06:05 -06:00
Bjoern Michaelsen
ba99e29607 related fdo#70414 gbuild to ide: kdevelop
This provides kdevelop integration and generates one project file for each
old-style module (top level dir). This project file has:

- has four build configurations:
  - build the module of the project or build all of LibreOffice
  - for each of the above a debug and a nondebug build
- has seven launch targets:
  - running the unitchecks, the slowchecks and subsequentchecks
  - for each of the above once for the module and once for all
  - running LibreOffice interactively
- has custom include paths and thus provides full autocompletion

Change-Id: I6dd51133147d019fc403e3bd814bc6103df94cac
Reviewed-on: https://gerrit.libreoffice.org/6694
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-11-19 05:32:30 -06:00
Michael Stahl
5d8f48c81e solver doesn't solve anything...
... it is an abbreviation of "Solar Version".

Since nobody can remember that:

remove OUTDIR OUTDIR_FOR_BUILD SOLARVER SOLARVERSION solarpath
and any mention thereof.

Change-Id: Idb3031c4f25a76ac05b22ec67e3ca3e1e8e512ad
Reviewed-on: https://gerrit.libreoffice.org/6515
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-10-31 15:42:24 +00:00
Michael Stahl
5c94caf12b .gitignore: ignore "tags"
Change-Id: I79dc9c9bb2ad299adb6b06b66410d12a9b77c3cd
2013-10-26 23:21:34 +02:00
Siqi LIU
c073bc0962 move XCode specific gitignore to top level so that all XCode projects are clean 2013-08-31 12:21:44 +02:00
Siqi LIU
7cc4ee7625 remove all DS_Store 'that have crept in' 2013-08-31 12:13:59 +02:00
Siqi LIU
5512bdd0e7 add DS_Store to gitignore 2013-08-31 12:08:07 +02:00
Siqi LIU
dd53fc8368 gitignore userstate for xcode 2013-08-31 12:04:55 +02:00
Siqi LIU
bf825affb3 remove userstate from the repo
Change-Id: I60c7d5c74f919bc165e1c2629f7b05aad2442eb7
2013-08-07 12:57:18 +08:00
siqi
138ecf7825 remove userstate from repo 2013-07-15 12:03:06 +02:00
David Ostrovsky
0e68bac852 set up python unit test infrastructure
Extract boostraping code from convwatch.py to unotest.py. Use python builtin
unittest module as unit test framework. Specify the unit test modules in make
file. Another option would be to use discover mode of unittest module.

Add __pycache__ to global .gitignore to keep the source directory clean.
Another option would be to deliver the unit tests to workdir prior to test
execution.

Currently only system python3 is supported.

Change-Id: I2692817673f786e950e1176a17c7675f989755b6
Reviewed-on: https://gerrit.libreoffice.org/3214
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
2013-04-09 05:52:23 +00:00
David Tardon
2149279914 add instdir to .gitignore
Change-Id: I73ce022d064c7ccfeb71f5560f112aac3d777bf7
2013-04-06 13:33:33 +02:00
Stephan Bergmann
69072caa91 autogen.lastrun -> autogen.input
Change-Id: If205ae9eb25882a107fd1cadfab9ec3516d520db
2013-04-03 19:19:15 +02:00
Luboš Luňák
4f1616a59e .gitignore for the whole config_build/ directory 2013-03-01 18:28:00 +01:00
Stephan Bergmann
a595c6e12b dmake is dead and burried
Change-Id: I5662db1cfe3506b3a8d4444248f872345cca4343
2013-02-28 08:24:44 +01:00
Stephan Bergmann
357b2be9b7 ...and add new lo.xcent to .gitignore
Change-Id: Ic4d098694b1dc6149aa690fa2bb106a8162ca6ab
2013-02-04 09:57:27 +01:00
Tor Lillqvist
c5b1441ede Use separate config_*.h files for BUILD and HOST when cross-compiling
We have only been lucky so far that there hasn't been any compilation errors
caused by using the HOST platform config_*.h files also for the BUILD
platform. But as more and more information found out during configury is
stored in config_*.h files, sooner or later it will be a problem.

Move config/* to config_host/*. When not cross-compiling, the config_*.h files
in config_host expanded from config_*.h.in are all there is. When
cross-compiling, the generated config_*.h files for the BUILD platform are
put into a config_build folder.

Then use config_build when building the cross_toolset and config_host
otherwise.

Change-Id: I3c28cc83866bffd696b45d00dfb68e00bc2ae538
2013-01-31 21:43:59 +02:00
Michael Stahl
49440d2588 .gitignore: re-add VIM swap files
Change-Id: I08ab04005720e0de826d6a0cd33211e3a70d5965
2013-01-03 16:02:12 +01:00
Peter Foley
5b0d2d02a5 convert external to gbuild
Change-Id: I7127db6aad9e97a0f3e758aa83b22ac8465d3f43
2012-12-25 09:39:47 +01:00
Norbert Thiebaud
d6bbdaf02d clean-up .gitignore
the general goal is

1/ to avoid the bloat of pet conviniences rules that
can be managed using other git provided means

2/ to work toward the goal of a read-only-source-tree build

Change-Id: I5ff9836e135507dcc53b37fd1098aa7876612bfc
2012-12-21 17:26:38 -06:00
Stephan Bergmann
d15fbd21db No more .memdump files left behind by xstlproc in postprocess
...since e37eb6345d "postprocess: convert to
gbuild"

Change-Id: Ia7f29efebb2872e096d36ab04f5d13bc2d437d71
2012-12-19 16:53:09 +01:00
Matúš Kukan
6af14cc8ec src.downloaded is gone
Change-Id: I09a6ad82bbb54ce8329e8b2f6152e9f5a1880a68
2012-12-15 12:56:36 +01:00
Norbert Thiebaud
ae4e327739 Prepare for read-only source build
This patch allows to do

mkdir <build_dir>
cd <build_dir>
<src_root>/autogen.sh
make

Only the remaining dmake modules are poluting the <src_root>...
which will get eventually convererd to gmake...

Change-Id: Iefd64732fa12e096d554cff4eee6b777deb92338
Reviewed-on: https://gerrit.libreoffice.org/1273
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2012-12-11 14:26:30 +00:00
Stephan Bergmann
de2c6007fc Do not accumulate warnings across configure runs
...and remove temporary file again.

Change-Id: I199b054d8e7b87d1c9268abbe628393d480e42f7
2012-12-06 14:59:42 +01:00
Matúš Kukan
16aa073855 move ooo.lst and download parts to Makefile.fetch
Change-Id: I2d27341566d383002446c23bdf60c7aa0cabf37d
2012-11-27 22:40:22 +01:00
Matúš Kukan
827c3806ad repo-list is gone since 664012b313
Change-Id: I2178f60a75a0436c66f825fe001e23f6aefb0e97
2012-11-20 22:18:11 +01:00
Matteo Casalin
e7037b2e7e Kill set_oenv remnants (by just renaming the required timestamp file)
Change-Id: I779128111a4f69235a4c8cc6510018fc61d1b24b
Reviewed-on: https://gerrit.libreoffice.org/1026
Tested-by: Tor Lillqvist <tml@iki.fi>
Reviewed-by: Tor Lillqvist <tml@iki.fi>
2012-11-11 08:05:14 +00:00