summaryrefslogtreecommitdiff
path: root/solenv/gbuild/Jar.mk
AgeCommit message (Collapse)Author
2019-07-05Make font-based unit test depend on instdir fontsJan-Marek Glogowski
The current dependency is already a hack, because there is no way I know of to depend on delivered top-level modules like more_fonts. The original patch parses the gb_Package_MODULE_ooo_fonts list of registered packages to add them as build dependencies. But this is not sufficient, as it just adds the dependencies on the installed / unpacked fonts in the workdir (actually it's just the installer filelist), where they can't be found by the unit test running in the instdir environment. So this converts the depndency into a make error, if either the filelist is missing or the included font files. But if we are in a full run and know the more_fonts module, we simply depend on its delivered files. This needs some minimal changes to gbuild, as neither the delivered file list nor the modules class names are yet available. And this moves the fontconfig handling to extras, where the opensymbol font is already handled. Change-Id: I1b70a4c45ff189266ce56c57e534ddc45e7c5c19 Reviewed-on: https://gerrit.libreoffice.org/74624 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2014-12-21try to keep Class-Path lenght under controlNorbert Thiebaud
Change-Id: I5cc6f325eff9f5177e77de661728621383fa5558
2014-11-27Missing slashStephan Bergmann
Change-Id: I56a37e08b533afb7a2aa91c82862c232c99f7112
2014-10-28Remove unused gb_Jar_JAVACOMMANDStephan Bergmann
Change-Id: Iccaf452a16e1971afbca9c7af330d8ab3aa7318d
2014-07-29gbuild: clean target is phonyDavid Tardon
Change-Id: I39dd1d10f086fd17fd9cf3a511452831a06bf81a
2014-02-13gbuild: improve error messages about missing registrationsMichael Stahl
Change-Id: Ib3c5d8f3921801f143447d8e01463905d80ac319
2014-02-04gbuild: component files for Jars in NONE layer and move testComponentMichael Stahl
... from URE to NONE. Change-Id: If43e07b88f2ab0e845f77d1f1a835627e5c48dd7
2013-11-04gbuild: remove error stubs for renamed/removed functionsMichael Stahl
Change-Id: If1d0d5294af87f2b780deadb21d12a6ee90dead6
2013-10-25stop using apache-commons jars from OUTDIR tooMichael Stahl
Change-Id: I0d9282cd3a267ad2d25b43adbf995365aaa56fa1
2013-10-25gbuild: refactor Jar target to stop using OUTDIRMichael Stahl
- gb_Jar_get_target points to layer-specific location - remove gb_Jar_get_outdir_target - add OXT and NONE layers - add a rule for every installed Jar to avoid problems with conflicting pattern rules in instdir Change-Id: Icf11869a454a7a52791c5ae257fc5da87aa46dc2
2013-10-25gbuild: add gb_Jar_use_external_jarMichael Stahl
... which is an ugly hack to handle jar files that are from externals and are not bundled in the main instset, only in extensions. Change-Id: I992242b7c990c24318b040e98b6632e3b78b6f63
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-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: fix Jar layers for WNTMichael Stahl
Change-Id: I516abd165f947c155f3e969e27f51fb093bfa8fc
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-06-07use .component files directly from workdirMatúš Kukan
Change-Id: Idaf2e1c33dcdf060756b5739c4a8d904dbdc699b
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-08Do not add unoil.jar to manifest Class-PathStephan Bergmann
...it must implicitly be loaded by the UNO type manager classloader anyway (via URE_MORE_JAVA_TYPES), so not explicitly mentioning it can help find problems early should it /not/ already be loaded by the type manager classloader. Change-Id: I35b4f2804b68a35682e93699840101a15317a096
2013-05-01gbuild: add group NONE for jars without comp. fileDavid Tardon
This is mainly to avoid polluting instdir because these jars are only used during build. Change-Id: Ia5bab3155787b690bd915f3e83e6b6144715948b
2013-05-01copy jars into instdirDavid Tardon
Change-Id: I52d69be6b3b4208c90fd8e3ed4271f48fdc1ed47
2013-03-31fix user-friendly targets' depsDavid Tardon
An user-friendly target sometimes needs to depend on a different target than gb_Classname_get_target to really build everything (esp. to deliver the built product). The rule of thumb is: use the same target that is used for gb_Module_register_targets. Change-Id: I874751871b4569b2a68766cc3f3b5c7645347af0
2013-03-03make sure the outdir existsDavid Tardon
Change-Id: I652e4f9e73a0b2e0bccd204218b90ffda3e54165
2013-01-11Set version number in AC_INIT() in configure.ac onlyTor Lillqvist
Output a solenv/inc/minor.mk based on that. Get rid of RSCVERSION and RSCREVISION. Automate the end of the copyright year range, although I am actually not sure if that is OK. Change-Id: Ibae2d139b1dd468ee80d18a2a41b786a532df809
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-29Setting CLASSPATH/XCLASSPATH appears to be a leftoverStephan Bergmann
...from the old dmake and/or Hamburg-specific set up. Change-Id: I441ce66dd91d353196cd9d1a9853720195a6fcdc
2012-08-17gbuild: remove some cruft from java stuffMichael Stahl
Change-Id: If1917d5aecfbb4cea230075d974d7f57a7a8ea4e
2012-08-17gbuild: add gb_Junit_use_external and clean up connectivity complex testMichael Stahl
Change-Id: I8c4b6ff6b1993d1c4de68696089f86fbcf4cecc6
2012-08-17gbuild: ignore the registered URE Jars for manifest classpathMichael Stahl
Change-Id: If8daaf86973656df737daf1b82c3fd2a3f55d58b
2012-08-17gbuild: register all jarsMichael Stahl
Change-Id: I9f49970e5e06d1afd3fc066a20d1671c93e262fc
2012-08-16No need to bother with the MISCDUMMY file hereTor Lillqvist
This rule failed if the MISCDUMMY file did not exist yet. Change-Id: Ie9b1ecab2848f5ed2c459020a50013db691a9ca3
2012-08-15gbuild: remove most uses of gb_Jar_set_jarclasspath:Michael Stahl
With gb_Jar_add_jar and gb_Jar_add_system_jar adding to the manifest classpath automatically it is no longer necessary to call gb_Jar_set_jarclasspath manually except for the URE jars, which are apparently not supposed to be added automatically. Change-Id: I1e743e7ecb9cb5651e02005aa09e127bea1b0a29
2012-08-15gbuild: s/gb_JavaClassSet_set_classpath/gb_JavaClassSet_add_classpath/Michael Stahl
Change-Id: I549888fcfe08d83101e414de86e8c9db1357d6eb
2012-08-15gbuild: refactor external jar handling:Michael Stahl
Using a system jar should really put the system jar onto the manifest class-path, but that is currently difficult because externals are used by JavaClassSet and not Jar; fortunately it seems nobody uses gb_JavaClassSet_use_external directly so move the implementation to gb_Jar_use_external. Change-Id: Ieac480b3dec0ad39d2404b0a64b641eaf73c1e4a
2012-05-29allow adding more package files at onceDavid Tardon
2012-05-09gbuild: remove gb_Helper_abbreviate_dirs_nativeMatúš Kukan
Change-Id: I0a3ad6553692fc21eaf96cf35e9c343b4d716c21
2012-04-09remove unused makefile codeMatúš Kukan
2012-04-08gbuild: "use" vs. "add":Michael Stahl
Naming convention for gbuild methods: - "add" is used for stuff that is logically a part of the target (i.e. not registered at the Module, but defined in the target's makefile) - "use" is used for stuff that is logically a different target (i.e. it is registered at the Module, has it's own makefile, may be in a different module than the target)
2012-04-06gbuild: add customtarget dependencies for java stuffMatúš Kukan
2012-03-22Produce more beautiful jar manifestsStephan Bergmann
2012-02-16gbuild: Jar: fix building .jars on WindowsMatus Kukan
2011-12-25impl. package deps for JavaClassSetDavid Tardon
2011-12-23gb_Jar_add_packagefile needs three args after allDavid Tardon
This partially reverts commit 713e536fe987f4dbd901656fda19ec4908a0a2f1 .
2011-12-23allow use of generated files in gb_JarDavid Tardon
2011-12-23work around deficiency in jarDavid Tardon
2011-12-23eval at the calling side, like other gbuild classesDavid Tardon
2011-11-10New LO_{LIB,JAVA}_DIR make special inbuild component handling superfluous.Stephan Bergmann
2011-11-02Add gbuild support for .jar in .oxt.Stephan Bergmann
2011-10-23no need for SRCDIR parameter hereMatúš Kukan
2011-10-18Undo basis/brand split: move program/classes/ from basis to brand.Stephan Bergmann
Also removed apparently unused UNO_JAVA_COMPPATH ProfileItem.
generated by cgit (git 2.34.1) at 2025-01-29 04:27:38 +0000