summaryrefslogtreecommitdiff
path: root/solenv/gbuild/Executable.mk
AgeCommit message (Collapse)Author
2013-09-23Fixes for cross-compilation on OS X (to iOS)Tor Lillqvist
Introduce SDKDIRNAME as a configury variable and use it instead of the gbuild gb_Package_SDKDIRNAME. Then we can easily construct the SDKDIRNAME_FOR_BUILD variant that is needed to find the specially named SDK in instdir on OS X when cross-compiling. Move the version number section in configure.ac earlier. Change-Id: Iee3db1a50ad4c7a9f91bbc5e0d0b01d76a76f701
2013-09-23Try to fix cross-compilationTor Lillqvist
Add more FOO_FOR_BUILD variables and some gb_Foo_for_build functions. Get rid of gb_INSTROOT and gb_DEVINSTALLROOT, just use INSTROOT. Change-Id: Iee531b02d14fae41edb68ad589a5dec829a60255
2013-09-22gbuild: add consistent directory dependencies for LinkTargetsMichael Stahl
- StaticLibrary and CppunitTest have all files in one directory - Executable may have the executable itself in a different one - Library may have files in up to 3 directories ... so create 2 directories (which may be the same) in gb_LinkTarget_LinkTarget and a 3rd one in gb_Library__Library_impl. This allows to get rid of the "mkdir LinkTarget/pdb/..." thing in the header target rule, which was always ugly since it did not get rebuilt when deleting it (or whole LinkTarget dir) from workdir. Oh and the pattern dependency causes trouble: $(WORKDIR)/LinkTarget/% : $(call gb_LinkTarget_get_headers_target,%) ... for files in ExtensionLibrary; it would be possible to put ExtensionLibrary somewhere else of course but actually this pattern dependency is unnecessary since we get the same thing whenever any object is added to a link target and there shouldn't be link targets without objects anyway. Furthermore directory dependencies must be on the headers_target because MSVC will write a PDB file when compiling objects. Change-Id: Icd92e8768d6aafb094a4144f90165aa5ff233647
2013-09-22gbuild: remove executables from OUTDIR and WORKDIRMichael Stahl
Call and link executables directly in INSTDIR. - gb_Library_get_target is now same as the gb_LinkTarget_get_target - disable gb_Library_add_auxtarget, no auxtargets need to be copied - adjust paths of all external executables to OUTDIR_FOR_BUILD for now - use lazy assignment instead of := in AllLangResTarget because it's read before Executable - link.exe generates an import library for lots of executables because they export symbols, especially since commit 0ffab9363d527d55b12b9b09d7136ca1c9d171e0 "force 'main' to always be DLLPUBLIC." Change-Id: I3e1ee7425dd430bb83c7cd59e265869a0541b38d
2013-09-22odk: remove Package_bin, instead auto-install executablesMichael Stahl
This is somewhat annoying since it requires re-introducing stupid directories in scp2, but if the executables should be put in INSTDIR directly then the Package_bin needs to go. Change-Id: I893694c7f9d4cb5b9ef8ec4a3d30e08536223740
2013-09-22gbuild: remove libraries from OUTDIR and WORKDIRMichael Stahl
Refactor everything to find and link libraries directly in INSTDIR. - add gb_LinkTarget_get_linksearchpath_for_layer, and use it to set up -L paths for T_LDFLAGS in such a way that only allowed libraries can be linked against; i.e. it's not possible to link URE linktargets against OOO or not-installed libraries - gb_Library_get_target is now same as the gb_LinkTarget_get_target (TODO: this needs cleanup) - since a pattern rule won't work for linking libraries in INSTDIR, add a separate per-file rule for every INSTDIR lib - pattern rule can't find link target in the clean target any more so add a LINKTARGET variable - disable gb_Library_add_auxtarget, no auxtargets need to be copied - tweak the call to gb_Library_Library_platform to pass in a path in sdk/lib for the versioned URE libs - fix the Library clean target - add LAYER parameter to gb_LinkTarget_LinkTarget - adjust platform link commands - MSVC link command now uses explicit -manifestfile and -pdb parameters to keep misc. files out of INSTDIR - remove gb_Helper_OUTDIR_FOR_BUILDLIBDIR - adjust Extension, CppunitTest, JunitTest, PythonTest, Gallery, various CustomTargets to search INSTDIR - remove SDK library symlinks and import libs from odk/Package_lib - on Mac OS X, put .dylib symlinks into sdk/lib even though those are not packaged and would be created by the SDK configury; we need these to be somewhere for linking anyway - add a (unfortunately cyclic) dependency on Package ure_install to sal Change-Id: I70d88742f8c8232ad7b9521416275c67b64fe6cf
2013-09-22gbuild: refactor LinkTarget representationMichael Stahl
If the link targets are not in workdir then 2 different aspects are needed: the previously used location relative to workdir's LinkTarget dir (for all the misc. related targets), and the full target file. Adding an additional parameter to all LinkTarget functions would be quite annoying, especially since it would need passing through all the gb_LinkTarget__use functions in RepositoryExternal.mk; instead encode both into the linktarget itself, and modify the functions gb_LinkTarget_get_target to return the target and all others to return the workdir linktargetname. - replace gb_Library_get_linktargetname with either: * gb_Library__get_workdir_linktargetname * gb_Library__get_linktarget_target * gb_Library_get_linktarget - similar for gb_Executable_get_linktargetname - similar for gb_StaticLibrary_get_linktargetname - similar for gb_CppunitTest__get_linktargetname - add calls to gb_LinkTarget__get_workdir_linktargetname where needed Change-Id: I917ad7957fee50ec2517a9f9cc9ff452c8d97d1b
2013-09-11Towards a working instdir for Mac OS X: some LIBO_URE_BIN_FOLDER fixesStephan Bergmann
Change-Id: I0583136acd5d92101ad1a23392735ed76581c0b8
2013-09-11Towards a working instdir for Mac OS XStephan Bergmann
Introduced gb_INSTROOT, which is the same as $(INSTDIR) except for Mac OS X, where it is $(INSTDIR)/LibreOffice.app/Contents. Most stuff ends up there (so most occurrences of $(INSTDIR) have been replaced with $(gb_INSTROOT)), but SDK- related stuff goes to $(INSTDIR)/$(gb_Package_SDKDIRNAME). (And GeneratedPackage needed to be made more flexible, to allow for packages that go into either of those two places.) For Android and iOS, gb_INSTROOT probably still needs to be set. The most obvious missing thing yet to make instdir work for Mac OS X is the instdir/*/LibreOffice.app/Contents/ure/ vs. instdir/*/LibreOffice.app/Contents/ure-link/ split. Change-Id: I4478edd27b14c92c96d92d5169bdca3ec50d78f5
2013-09-09start to use instdir for subsequentcheck tests; avoid make dev-installMatúš Kukan
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-09gbuild: avoid packages when copying files into instdirMatúš Kukan
There should be only two ways how to add file into instdir: - gb_Helper_install used in gbuild - gb_Package_set_outdir used also elsewhere, preferably with scp2 containing its .filelist. Change-Id: I75ec0ba63f32acf4b56b17dc972f4488edf6a777
2013-07-17remove gb_LinkTarget_add_noexception_objectBjoern Michaelsen
Change-Id: I44f7df6e5f816cfcf7a44c6c4c76e80924237d45 Reviewed-on: https://gerrit.libreoffice.org/4955 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-06-17do not copy executables into instdir yet (by default)Matúš Kukan
It causes some weird problems with solenv/bin/linkoo. Change-Id: Ic1613394ec3f0fe508ca813c2600f9bc5439dce7
2013-06-15gbuild: add gb_Helper_install and use it for ExecutablesMatúš Kukan
It's simpler than creating a package for every executable. Change-Id: I5f853ef2d5574b1a1c65232d1d09bc307c46f67e
2013-06-15gbuild: allow to use RepositoryFixes also for executablesMatúš Kukan
Helps to kill package in cpputools. And autoinstall uno executable. Change-Id: Ib1d546371ec8d2b06381d88eff98dbc5b70da400
2013-06-03re-base on ALv2 code. Includes:Michael Meeks
Patches contributed by Mathias Bauer gnumake4 work variously http://svn.apache.org/viewvc?view=revision&revision=1394707 http://svn.apache.org/viewvc?view=revision&revision=1394326 http://svn.apache.org/viewvc?view=revision&revision=1397337 http://svn.apache.org/viewvc?view=revision&revision=1397315 http://svn.apache.org/viewvc?view=revision&revision=1396797 Patches contributed by Andre Fischer Fixed getcsym.awk to handle #-comments that contain special regexp chars. http://svn.apache.org/viewvc?view=revision&revision=1230971 118778: Added ADDITIONAL_REPOSITORIES environment variable and its automatic setup in configure. http://svn.apache.org/viewvc?view=revision&revision=1232004 118160: Added external CoinMP library. http://svn.apache.org/viewvc?view=revision&revision=1233909 Patches contributed by Herbert Duerr #i119168# use generic LICENSE file for langpacks and sdks http://svn.apache.org/viewvc?view=revision&revision=1310178 macosxotoolhelper: need to quote perl regexp if it may contain regexp metachars http://svn.apache.org/viewvc?view=revision&revision=1183367 allow gbuild with empty sysroot on linux http://svn.apache.org/viewvc?view=revision&revision=1179186 Patches contributed by Ingo Schmidt native373: #164472# improvements for msi database http://svn.apache.org/viewvc?view=revision&revision=1167540 http://svn.apache.org/viewvc?view=revision&revision=1167539 Patches contributed by Jurgen Schmidt adapt setup package scripts to handle special DS_Store file for developer snapshot builds http://svn.apache.org/viewvc?view=revision&revision=1232430 imported patch extensions_i117681.patch http://svn.apache.org/viewvc?view=revision&revision=1172102 Patches contributed by Michael Stahl gbuild: RepositoryFixes.mk should be optional http://svn.apache.org/viewvc?view=revision&revision=1166123 xslt filter: remove the FLA horror wordml import filter: replace FLA usage with plain XSLT http://svn.apache.org/viewvc?view=revision&revision=1363727 Patch contributed by Oliver-Rainer Wittmann i#88652: applied patch, remove unicows deps http://svn.apache.org/viewvc?view=revision&revision=1177585 Remove lots of OS2 conditionals, re-extract Rhino Java, unwind cppunit pieces, cleanup Mac image bits, remove coin-mp and re-package lpsolve, Oxygen & Crystal, fixup qstart bits, expand MPLv2 subset checking. Change-Id: Iad5c8a76399620b892671633c0d8c29996db3564
2013-05-24gbuild: simplify reg. of targets for PostprocessDavid Tardon
Change-Id: Id184df89c5c15c55e42f376ed06c83174c486f67
2013-05-01the internal packages should not be registeredDavid Tardon
Change-Id: I83f4c55582d1ff8ec6b468776090b453c4f85b89
2013-04-28gbuild: copy executables into $(INSTDIR)David Tardon
Change-Id: I88f6327c12fa2b782aa5c82e5891006713348477
2013-03-13more subtle dependencies for cross-compilationMatúš Kukan
Now we build only what we really need for 'build' platform - there is new build-tools make target. The list of tools is in solenv/gbuild/extensions/pre_BuildTools.mk. Also similar is done to some extent for 'host' platform using gb_Module_add_targets_for_build which is ignored for 'host'. Change-Id: I6acd1762b16aca366aac1a0688500f27869cfca2
2013-03-03use pattern rule for PostprocessDavid Tardon
Change-Id: Ib8d2ddb2efaef26a0a2aba36e9e1c67b1fb019d7
2013-02-26move postprocess to gbuildBjoern Michaelsen
the gb_Postprocess* foo could also be in gb_Module* as it is conceptionally close ('do things globally/productwide'). OTOH I see no obvious reason for e.g. signing not to be done right along with building a lib/executable anyway instead of in postprocess. The same is likely true for the other stuff too. Change-Id: I9c8f569564c056643af7ca39bfe038ed228dcd3d Reviewed-on: https://gerrit.libreoffice.org/2426 Reviewed-by: Matúš Kukan <matus.kukan@gmail.com> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-02-25Last use of obsolete gb_*_add_api is long goneStephan Bergmann
Change-Id: Ia6c938ef0e45ec86c0c202e95ef28d49fccd3497
2012-12-31I did not want to push that...David Tardon
It does not work, anyway. This reverts commit ee18b30b0391a443a51d7b97060f118478c202af. Change-Id: Ibe21a2a62ecbfaf8dcd87113bde386050ffde25a
2012-12-31always set library pathDavid Tardon
Change-Id: Ie3248563815c2558c573e525e79024ef083345b7
2012-12-31move gb_Executable_get_command back into Executable.mkDavid Tardon
Change-Id: Ia556cbfda5c5c3d9e1b2b7b1f488b079ce420367
2012-12-30these functions must be defined earlyDavid Tardon
... because their result is assigned to variables in various gbuild classes. Change-Id: I07c0fc54e10ddd76a6246ac4e9ed56541c9c1257
2012-12-30allow setting runtime deps of executables in one placeDavid Tardon
Change-Id: I325287cba773df848a8797486c149502abae9c9d
2012-12-10userfriendly make targets for build and cleanLuboš Luňák
So that now it's possible to do just 'make CppunitTest_sw_macros_test' instead of 'make /home/llunak/build/src/l2/workdir/unxlngx6/CppunitTest/sw_macros_test.test' Change-Id: Ibd1e9ef4fc825043a71bd669b2f5c37ffec68e33 Reviewed-on: https://gerrit.libreoffice.org/1253 Reviewed-by: Peter Foley <jpfoley2@gmail.com> Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de> Reviewed-by: Luboš Luňák <l.lunak@suse.cz> Tested-by: Luboš Luňák <l.lunak@suse.cz>
2012-12-10rename to gb_Library_set_precompiled_headerLuboš Luňák
There can be only one precompiled header with some compilers anyway. Change-Id: I59e84bee2f57f36753b59b7518d701573affac12
2012-12-10bring back precompiled headers supportLuboš Luňák
This is mostly a revert of 992757cc5ebfb1df42636b8d3269cdbc10fc4148 and bc78ac68c2492e63a680f68b524c4a51179ea83e, with tweaks to apply. Also only MSVC support for now. Change-Id: Ia926b3c28125b52012156ccfd47932837b09d20a
2012-10-23gbuild: fix AUXTARGETS:Michael Stahl
This finally blew up spectacularly on Windows because we now have packages delivering external libraries to the solver, where the libraries are not defined by Library class, which leads to accidental inheritance of AUXTARGETS variable and failure to deliver nonexistent UnpackedTarball/.../libpq/postgresql-sdbc-impl.uno.dll Remove the custom deliver rule that uses AUXTARGETS, and instead let those files be handled individually by default Package.mk rules. This requires a dummy touch rule for each file, and unfortunately a pattern rule cannot be used here because of silly naming differences between implibs and dlls on Windows... AUXTARGETS do not cause problems for clean targets because there is no interdependency there, so keep them there. Change-Id: I2138f635334ff4517a2d31ef91cfd03a46745fd6
2012-10-22allow LDFLAGS from gbuild to be selective tooLubos Lunak
Just like CXXFLAGS can be controlled using --enable-selective-debuginfo. Non-debug libraries can be debug-stripped this way, which can save quite some disk space with those cppunittests which just include all .o's from sw/sc. Change-Id: Ib947f76f535161e4eef1421a5539df5e25fa4042
2012-09-28gbuild: invert handling of standard system libraries:Michael Stahl
Always link in gb_STDLIBS, except when the library explicitly opts out with gb_LinkTarget_disable_standard_system_libs. Change-Id: I489a99114fbfa46d0421a27cf6c7b899dc268a4a
2012-09-28gbuild: gb_Library_PLAINLIBS_NONE cleanup for WNT:Michael Stahl
add a new gb_LinkTarget_use_system_win32_libs to abstract different linker options on MSVC and GCC. Change-Id: Ic9bf2545f59bf7871e6fc06b290c486ddfbec03d
2012-09-28gbuild: clean up Mac OS X framework handling:Michael Stahl
There are currently 3 different mechanisms being used for frameworks, which is of course intolerable so we invent a 4th one and standardize on it: gb_LinkTarget_use_darwin_frameworks (This doesn't mean using add_libs or externals was wrong, it was just inconsistent... and i don't see an obvious benefit of using externals here) Change-Id: I5de9020402c87e7236c6a358c47f02fa56642d3d
2012-09-28gbuild: replace direct gb_STDLIBS use with ...Michael Stahl
... new gb_LinkTarget_add_standard_system_libs Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69
2012-09-08rename: set_cxx_suffix -> set_generated_cxx_suffix; used for external libsMatúš Kukan
Change-Id: I023c6b35c2a65da566ff5bb3aea772c99c90dda3
2012-08-31gbuild: UnpackedTarball: do not rename files; set cxx suffix for libraryMatúš Kukan
Change-Id: I8bf119a4ab3fc7c2febfa80176358f668003b7d1
2012-08-24add support for external tarballs to gbuildDavid Tardon
Change-Id: Ic6645e9943b2445ebb37bb99114f777527c69af9
2012-08-14this line is wrong; removingMatúš Kukan
Change-Id: I5159f3f41c3e0d6ec775a7d1700cbe1272cdb059
2012-08-01Revert "force depfile concat on deliver"Michael Stahl
This reverts commit b8f7cc3c26a95b7dfb41415b24f0e2a3a9f1e33c. This does not work, because there is no dependency between the *Object .d files and the *Objects, and so the concat-deps races with the compiler writing the dep files. Introducing such a dependency would of course be reverting 8b5a984d45005d3df1c89eae897d6e04612625d8
2012-08-01force depfile concat on deliverBjoern Michaelsen
* in some scenarios gcc (or ccache) generate relative paths * thus we need to concat the depfiles in the same makerun as the compiles * stiil not foolproof: - cd sw && make and abort with Ctrl-C - cd .. && make sw - now we have deps from mixed workdirs * in the end we should likely always cd to SRCDIR before all compiles Change-Id: I007da96f38ed2cfe403b692400f447764f6d6988
2012-07-02fix build, typoMatúš Kukan
Change-Id: I532a6822d6ee023d72a71e012c97929f56c7b05a
2012-07-02targetted improvement of UNO API includes / usageMichael Meeks
2012-05-08gbuild: replace gb_LinkTarget_set_objcflags with add_objcflagsMichael Stahl
2012-05-08gbuild: refactor selective symbols again:Michael Stahl
The previous commit works but results in a ~0.4 second slowdown on tail_build, which is completely unacceptable; seems that at the cost of another ugly global variable in Module.mk we can get the performance back and then some, so refactor this again...
2012-05-08gbuild: refactor the selective symbols supportMichael Stahl
so it doesn't use wildcard but instead the actually registered LinkTargets.
2012-05-01build: cleaning up previously converted idlc moduleDavid Ostrovsky
Change-Id: Ic90495f677dc42c0430492548deaa9f9b10e4d44
2012-04-23more flexible --enable-symbols=<for>Luboš Luňák
the argument given now can - be 'all', meaning everything - start with -, meaning not to enable symbols for that item - end with /, meaning everything in that toplevel directory - be a target of the form targettype_name, e.g. Library_swui Note that there is no ordering and removal takes precedence.
generated by cgit (git 2.34.1) at 2025-02-02 00:40:31 +0000