summaryrefslogtreecommitdiff
path: root/solenv/gbuild/ExternalPackage.mk
AgeCommit message (Collapse)Author
2014-04-18add missing functionDavid Tardon
Change-Id: I911d1131a91f0a5baea3324c0d48cb4fa5c5c344
2013-10-31gbuild: gb_Helper_abbreviate_dirs should replace INSTDIR not OUTDIRMichael Stahl
Change-Id: I17bb3d4efc676f2904ad9e23433a4c98bc2669ad
2013-10-27gbuild: remove gb_ExternalPackage_add_library_for_installMichael Stahl
Deliver all external libraries to INSTDIR directly. Change-Id: I8d3e035e5cfa07bd0f53ee4a226c48d4b86a4032
2013-10-25gbuild: remove gb_ExternalPackage_add_jar_for_installMichael Stahl
Deliver all external jar files to INSTDIR directly. Change-Id: Ibfaabf713da01e752517dc400200a6918d82db6d
2013-09-25Start hacking --enable-canonical-installation-tree-structure back into shapeTor Lillqvist
Had been totaly broken by the recent changes. (Which is fine, it is just an experimental hack anyway, I am not sure whether it will ever be used in anger. Just a pet peeve of mine, I dislike seeing libraries, configuration files, resources etc mixed together in one "program" folder, especially on OS X, where the convention is to have app-specific dylibs and frameworks in "Frameworks", and resource files in "Resources". But this is not any requirement as such; there are apps in the Mac App Store that blatantly "break" this convention.) Basically, replace uses of gb_PROGRAMDIRNAME and gb_Package_PROGRAMDIRNAME with more specific LIBO_FOO_FOLDER, which for normal builds all expand to the same "program" anyway. Change-Id: I16c2b3351caa00e251e229aafbccb8346042d3c1
2013-09-25gbuild: fix ExternalPackage dependencies for files in instdirMatúš Kukan
Change-Id: Ia46119dea124a6260a12504651d6f766d0285985
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: 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: ExternalPackage: fix stupid typoMichael Stahl
Change-Id: Ie8d8ac0ead879c90557f8f76d1a63fe9fde764d0
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-10fix lcms2 library in solverMatúš Kukan
This commit repairs broken link liblcms2.so -> liblcms2.so.2.0.4 as liblcms2.so -> liblcms2.so.2. Change-Id: Idccd65bba5cec822d285859f609e222c84f2fad9
2013-09-09gbuild: ExternalPackage: use gb_Helper_installMatúš Kukan
Change-Id: I001563c8aaf4e21e57c53aa2045b6709a35464d7
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-05-13the program dir is called MacOS on MacOS XDavid Tardon
program is only a symlink to it there, created by the installer. (Hmm, would it be possible to have MacOS symlink to program instead? It would simplify things :-) Change-Id: If21df47da5ac7c77358656f40d9caaaa62a7e87f
2013-05-01add spec. handling of jars to ExternalPackageDavid Tardon
Change-Id: Ib6561120f1c6f9804e5bf9ca36b6a655f1449d4f
2013-05-01add function for adding runtime libs to ExternalPackageDavid Tardon
This allows us to deliver libs needed at runtime to instdir in addition to solver. It could possibly also be used for autoinstalling external libs, just like we can already do for internal libs. Change-Id: I96d314c55581190e129adae8383224535748ac43
2013-04-14add gb_ExternalPackage_set_outdirDavid Tardon
Change-Id: Ic12bfc750a127172f3b081a915d90dacbd1bde37
2013-04-01gbuild: ExternalPackage: fix incremental builds:Michael Stahl
The added files must have a rule that touches them in order to be copied in an incremental build. Change-Id: If53efb711b92fa1005298941f21b2dab23e44e6c
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-10-22add note to ExternalPackage docDavid Tardon
Change-Id: I920e0f6cea18c825dc5786b6b4f2df1c0ddb890d
2012-09-26Revert "gbuild: use one pattern rule for creating directories"Matúš Kukan
It does not work with make 3.82 which prefers pattern rules with longest match, so wrong rules are chosen in workdir. This reverts commit bc234b4e1103cf8f79a7526ad80dcd9d0b78b89b.
2012-09-26gbuild: use one pattern rule for creating directoriesMatúš Kukan
Change-Id: I0164552ea9f2024eb5c44ad3b2b6181f6a9e3a1e
2012-09-22Package is replaceable by ExternalPackageDavid Tardon
Change-Id: I6d46f4ae957576927432dca63a281a376ce15600
2012-09-22add gbuild class ExternalPackageDavid Tardon
This should make delivering of header files (but other kinds of files too) from the unpacked tarballs more reliable with respect to project updates. Change-Id: Ic9dac800eddecedffba5f955f1e8d585da9c1b17