Commit graph

281 commits

Author SHA1 Message Date
Bjoern Michaelsen
c6fe5c6f37 initial install-package-foo target for partial installs
Change-Id: I4ee41fdb600cb3a89da387dffe64e6a30192761c
2013-12-08 03:56:41 +01:00
Tor Lillqvist
61e66d762d Add initial hacks for eventual Xcode support
Just some late-night hacking without much thinking whether it makes
any sense and without any clear picture of what I am doing. Probably
useless. No promises I will ever continue on this.

Change-Id: Ie61925129bb678a17b30cb25a7882ccfe3a1de82
2013-11-27 11:21:44 +02:00
Tor Lillqvist
1b90c10dbb I think this is what was meant?
Change-Id: I5ff6e2588361ab58d7cda9ddbd5db61c300c9956
2013-11-26 21:28:07 +02:00
Bjoern Michaelsen
6991dd741e make packageinfo target
Change-Id: Id5f6f5c1f3e46df2d9033ccd5bbf2af6ab38a9e8
Reviewed-on: https://gerrit.libreoffice.org/6754
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-11-21 10:36:51 -06:00
Michael Stahl
deb249e1b3 Makefile.in: "make check" should build "all" too
Change-Id: I6b72c3deb1a056149e965b78d12d3c37c6bfd5b9
2013-11-21 13:12:33 +01:00
Bjoern Michaelsen
a691e0ed1e l10n and non-l10n targets missing dep on build
Change-Id: Ia6d09a1625819593291649369a7533bbd2ee8227
2013-11-21 12:48:47 +01:00
Bjoern Michaelsen
f9041c386c oops, we still need the ?=, of course
Change-Id: Ifa3e6639a5fdbd58e99fe3f1feadc009ddcee880
2013-11-21 03:46:02 +01:00
Bjoern Michaelsen
6788b92e15 lazy eval is lazy. and nasty too
Change-Id: I4191277a2df0ea060d86090ee6e99490840f8f48
2013-11-21 03:37:03 +01:00
Bjoern Michaelsen
a2541298c6 move finunusedcode to a script
Change-Id: Ie4a422a818095313d9765a4c5e9ebba838eed76d
2013-11-21 00:57:38 +01:00
Bjoern Michaelsen
4a016d139e simplify top-level Makefile some more
Change-Id: Ie1d53db34f812a83940196d0bf6e4ad8aaa8eab6
2013-11-21 00:34:20 +01:00
Matúš Kukan
38a22f56ca just use wildcard here
Change-Id: I2c145328b03f66a6a67c0afa0463005112fd77da
2013-11-21 00:05:56 +01:00
Bjoern Michaelsen
1bd21f8016 install-gdb-printer -L fails with 'unknown option' anyway
Change-Id: I5927427264eaed86d2e93bee1cfc8f1ff55690c3
2013-11-20 21:15:34 +01:00
Bjoern Michaelsen
ac32aafc7b clean up echo deserts, consolidate blurbs
Change-Id: If268d37e8e96adcb8902c8b3fc855ecddea69ba5
2013-11-20 21:15:33 +01:00
Bjoern Michaelsen
60c64b437c some namespacing
Change-Id: I7f4fc456d7e9690443d94175e94b69db50c3e2b5
2013-11-20 21:15:33 +01:00
Bjoern Michaelsen
00e9a7a557 toplevel 'make check' should also do subsequentcheck
Change-Id: Ib41660a1fef332573ef1c477c12bc8fdfedfc4db
2013-11-20 21:15:33 +01:00
Bjoern Michaelsen
4eebd65858 fix Makefile.in
- unify ~all gbuild targets to one gbuild call
- kill CHECK_PARALLELISM as we dont respect it consistently anyway
- ${MODULE}.subsequentcheck needs no specialcasing now anymore too
- should fix e.g. "make unitcheck slowcheck subsequentcheck" calls

Change-Id: I4238d7de599cb9fbaf09f60539d6655b85b87c29
Reviewed-on: https://gerrit.libreoffice.org/6722
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-11-19 11:30:24 -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
Bjoern Michaelsen
04dead1c6b make l10n buildable separately
- this renames the 'almost' module target to non-l10n
- and adds a l10n target which is intended to only build l10n parts of
  the product
- packagers should then be able to build l10n and non-l10n parts of the
  product independently, thus:
   - enable quicker rebuilds
   - distribution of load
   - updates to l10n without a full rebuild
   - security fixes to binaries without rebuilding all l10n
- the new targets are called build-l10n-only and build-non-l10n-only
- note this is not intended to move a concept of split packages
  upstream -- while this exsists in distros, the number of test
  scenarios for this would explode upstream

Change-Id: Ib8ccc9bc52718d9b0ebbfee76ad93dc29c260863

Conflicts:
	filter/Module_filter.mk
2013-11-14 16:45:02 +01:00
Michael Stahl
bd5a6c285c a little instdir sub-dir cleanup
Change-Id: I97df3f949da7403e46951cf159a9fc1fca4cc23f
2013-11-07 22:53:46 +01:00
Michael Stahl
b800216933 remove INPATH and PROEXT
- WORKDIR path is just workdir
- INSTDIR path is just instdir
- WORKDIR_FOR_BUILD is workdir_for_build
- INSTDIR_FOR_BUILD is instdir_for_build
- replace other usage of INPATH by combination of OS and CPUNAME

Change-Id: Ie398387ebd82a968ec2605f2103c55b43a231482
Reviewed-on: https://gerrit.libreoffice.org/6601
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-11-07 14:27:50 -06:00
Michael Stahl
bc5069ac40 remove SOLARENV variable
It is constant and can just be replaced by $(SRCDIR)/solenv.

Use BUILD_TYPE where it was used to check if config_*.mk is sourced.

Change-Id: Ib9d480c57194b6340093aa47776f8768df69b7d1
2013-11-02 22:07:53 +01: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
60211134bc gbuild: add ExtensionPackageSet class
Change-Id: I947207c78e28b416aebe2e33172043fd8cfa4f17
2013-10-31 10:42:25 +01:00
Michael Stahl
704451d95d gbuild: add ExtensionPackage class
Change-Id: I65ca50ccc512e35a5b95c2482f3a8833d1a7294b
2013-10-31 10:42:24 +01:00
Michael Stahl
2cb380bad6 solenv: remove gdb Package and CustomTarget
Since it's necessary to call install-gdb-printers anyway (which is what
the CustomTarget_gdb does), just do it first thing in "build" target
so that unit tests running during a from-scratch build get the pretty
printers too.

Change-Id: I357dfb828a2e0eed675aa552d3256f96a312a890
2013-10-30 00:01:33 +01:00
Michael Stahl
6bd0f9ba9d gbuild: refactor CliUnoApi
- stop copying the DLL to OUTDIR
- since that was the main reason for the separation between
  CliUnoApi and CliUnoApiTarget, merge the targets;
  the newly inherited variables are not expected to cause problems
- hardcode target to URE bin dir for now, no immediate need for
  multiple layers

Change-Id: I428d801ec7058e1c6374d8162a4118a3fe581978
2013-10-28 14:01:08 +01:00
Michael Stahl
dddff6e51d Makefile: make convenience targets like "make icu" work for external/
Change-Id: I6cf2e6bd1c52412339ec6bab98b3f1b28cef1032
2013-10-23 19:21:13 +02:00
Michael Stahl
0f96de25ee Makefile: remove broken "usedcxxfiles" target
Was (accidentally?) added in 99f8cf1221.

Change-Id: I099be6c3e480a8365f2ffea371be435194973c5b
2013-10-22 14:42:17 +02:00
Stephan Bergmann
9e973325ec distclean generated ios/lo.xcconfig
Change-Id: I5db55ab575e3343664080936bd14a0c04f134fb6
2013-10-17 23:37:29 +02:00
Bjoern Michaelsen
99f8cf1221 fdo#70393: move libpng to a subdir of external
Change-Id: Ia52da28fc6a979c4712fc191ab5e71c1926b0c93
Reviewed-on: https://gerrit.libreoffice.org/6231
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-10-16 12:51:10 +00:00
Bjoern Michaelsen
e4fbcc549a fdo#70371: create findunusedheaders target
- you can now do "make unusedheaders" to look for headers that seem to be used
- also renamed the script in ./bin to follow the conventions there

Change-Id: Ia9487af02effd05bfbc5c3f5c04b928a407b0fa4
2013-10-15 10:18:29 +02:00
Michael Stahl
bbadfca2ca refactor make check to run subsequentcheck parallel to instset
... which saves 4 minutes on a "make check" here, when configured
--with-package-format="archive"

Change-Id: I415e0e95ae7f4e289fa4797643f5d744015d80ad
2013-10-04 21:34:33 +02:00
Stephan Bergmann
e05b3e558b There shouldn't be any config_host/*.mk files that need distcleaning
Change-Id: I9c56428f6ff015abc585e070b18ad181c48e31e6
2013-10-02 21:23:28 +02:00
Stephan Bergmann
a326725d98 distclean configure-generated Info.plist
Change-Id: I8729123a34bedfa1f9d5dfd04438da96e422a003
2013-10-02 21:23:27 +02:00
Michael Stahl
0d3c536d05 fix make test-install on WNT
Change-Id: I681f2c4989b88943fe57e6173554a019539a18cc
2013-10-02 10:58:59 +02:00
Michael Stahl
50e3ac997d install-tb target should hopefully be obsoleted by instdir too
Change-Id: I14a74b660d965d19027cefab2c84d1c0ea38ce79
2013-10-01 18:03:37 +02:00
Michael Stahl
b81f49ce0f test-install: get rid of opt/
Change-Id: Ie390749c0b28e47848c361d874bb447f39cfeb12
2013-10-01 18:03:36 +02:00
Michael Stahl
f1d0889058 put result of make test-install into top-level test-install dir
... and rename all DEVINSTALL variables to TESTINSTALL.

Change-Id: I2f745ff6324c078d5fd7d272911a9268fc5efd27
2013-10-01 18:03:36 +02:00
Michael Stahl
be59288ff4 make dev-install is obsolete
There is no need for developers to run it as part of the daily workflow
because instdir is much easier to use, so just let it print an error
message.  Also remove the "install" symlink.

Provide the previous dev-install functionality as "test-install" target
so that it is possible to quickly create some kind of actual
installation against which the subsequentchecks can run by
setting OOO_TEST_SOFFICE, to e.g. check that scp2 isn't missing files.

Change-Id: I8c0b05a87f55b1db8c1d1e76f64ab64b9cc695eb
2013-10-01 18:03:36 +02:00
Matúš Kukan
58ff5d5f4e clean also INSTDIR_FOR_BUILD
Change-Id: Id85d07650f9dd479c5eee7c8c765e59ab1d55955
2013-09-25 10:19:44 +02:00
Matúš Kukan
f5b840a3ee goodbye linkoo.. you have served well
This commit:
- removes linkoo and --disable-linkoo option
- removes 'dev-update' make target
- creates --disable-ooenv option
- removes LD_LIBRARY_PATH and PATH settings in ooenv

Change-Id: I9530558531e9cb58b8282754ec8a6c655f190480
2013-09-17 19:37:42 +02:00
Matúš Kukan
f44f94b95b fix gdb pretty printers for --enable-mergelibs
And install them into $(INSTDIR) at the end of build,
as it is done in dev-install case.

Change-Id: I1a9852684361a12333046fa58f83720aa2c835da
2013-09-10 12:20:58 +02:00
Matúš Kukan
573b8543cb start to use instdir for subsequentcheck tests; avoid make dev-install
This commit breaks linkoo.

make dev-install continues to work as before but it's not necessary to
use it anymore.
make check now uses files copied into instdir by gbuild.
TODO: fix remaining issues so that instdir is the same as install/.

Change-Id: I66836170f0922ee9ba204a61ffacc30d9e9a5d98
2013-09-09 22:09:16 +02:00
Tor Lillqvist
d00e125cbe Factor out the app bundle code signing into a script
Call that script for make dev-install and when creating the .dmg.

Change-Id: Ic468cafe04b2755f371d449fef0b84e2fdc7e197
2013-08-27 21:50:30 +03:00
Tor Lillqvist
c89d6bcdb4 Don't sign the Current symlink in a framework
Change-Id: I14106827d86f798687cdeb560c0df007070469ee
2013-08-25 21:29:40 +03:00
Tor Lillqvist
18041138d3 make install or install-strip hardly make sense on OS X
Change-Id: Ib21607e3fef7c2a52c443d6d16c5466e0a2d4340
2013-08-18 21:11:16 +03:00
Tor Lillqvist
70be692727 Bypass install-gdb-printers on OS X, they don't work anyway
Change-Id: I5636ba90d5513ecd6cb3bd20b3f583f8cd221717
2013-08-10 14:16:47 +03:00
Tor Lillqvist
2be3dcd9cc Use BUILDDIR, not SRC_ROOT
Change-Id: I497238fbc8344a1bb8703dfd8090bd4e5c420ff1
2013-07-26 18:35:59 +03:00
David Tardon
af1365fbc2 reconfigure on any change in config_host/*.h.in
... to avoid bad commits like 68c8dcec1f .

Change-Id: I21c72f63c6363a7d2a34b4e30b932f9dd45926aa
2013-07-24 12:17:34 +02:00
Caolán McNamara
4f3287c8b8 bodge callcatcher some more
Change-Id: Ie2e126700540cbec2a94f40250b2a114d1ea9306
2013-06-19 20:09:20 +01:00