summaryrefslogtreecommitdiff
path: root/solenv
AgeCommit message (Collapse)Author
2013-10-01callcatcher doesn't need ooinstall to run tests any moreMichael Stahl
Change-Id: I370345bc9b2ec1158a873a3c691b6a6f929e04b1
2013-10-01test-install: get rid of opt/Michael Stahl
Change-Id: Ie390749c0b28e47848c361d874bb447f39cfeb12
2013-10-01put result of make test-install into top-level test-install dirMichael Stahl
... and rename all DEVINSTALL variables to TESTINSTALL. Change-Id: I2f745ff6324c078d5fd7d272911a9268fc5efd27
2013-10-01gbuild: fix dependencies in gb_SrsPartTarget__command_depMichael Stahl
Use -MP to output dummy rules for included files so build doesn't break when an included file is removed. Change-Id: Ib230cfa5d5da71c7f5c15af5bdaa5004e6b7a122
2013-10-01gbuild: use .xcd configuration files from instdirMatúš Kukan
..instead of .xcu files in solver/*/xml/registry when running unittests and gengal. Change-Id: I390a6c531d653acca7ef3379c49fe65fcb8f3c2a Reviewed-on: https://gerrit.libreoffice.org/6057 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-09-30-Werror,-Wunused-functionStephan Bergmann
Change-Id: I55e586fe1d145be139bf1c5b00f434ea31ba50d7
2013-09-30gbuild: remove "templates"Michael Stahl
Nobody uses those anyway. Change-Id: Ifa20827c0526a6eb3c9f554e652a354327282f48
2013-09-30gbuild: remove processdelivered.mkMichael Stahl
obsolete since 6280f921050e6e879ca752abf4e8fb7553aba6f5. Change-Id: Idab0c904f05da66956ecbd8a01f3e9d2e2d7c605
2013-09-29I forgot to add -d swith to signtoolAndras Timar
The UAC prompt shows a temporary random Program Name for msi, if the -d switch is not given. One more change: probably it is not wise to print the password of code signing key in clear text to log and to screen. Change-Id: I1f555754eee19708bbd7a3c70280fe662c77fc3a
2013-09-27gbuild: remove unused gb_CppunitTest_LIBDIRMatúš Kukan
Change-Id: I42ffe7c32d249bdd9cfa03800e78c431df0bb52f
2013-09-27gbuild: remove now unused gb_Library_OUTDIRLOCATIONMatúš Kukan
Change-Id: I696b550b495d1bf6549e3c54a3157d467a7ead8d
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-25Add LO_JAVA_DIR to CppunitTest env.Andrzej J.R. Hunt
This is needed for e.g. HSQLDB to run in a unit test. Change-Id: I71d6de35fc20512afaebf8a76a052640a07fba6b Reviewed-on: https://gerrit.libreoffice.org/6023 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2013-09-25gbuild: fix ExternalPackage dependencies for files in instdirMatúš Kukan
Change-Id: Ia46119dea124a6260a12504651d6f766d0285985
2013-09-24fix --enable-mergelibs dependenciesMatúš Kukan
..and create gb_BUILD_HELPER_LIBS in instdir, so that they are found when gb_BUILD_HELPER_TOOLS link against them. Altough it's ugly - we don't want them in instdir otherwise. Change-Id: Ia946eceeaf7eada0c3b42379e95af9bdbf52957f
2013-09-24gb_Library__get_final_target: don't be phony targetMatúš Kukan
Change-Id: I299b088aebc0bb40bc395b774154d2fae1f5d669
2013-09-24make dependency on directory order-onlyMatúš Kukan
Change-Id: I800a7c1ea7ae48252a22ab1dc848fdc5e6f6b3b9
2013-09-24Create a proper Info.plist for the OS X app bundle already in configureTor Lillqvist
After recent instdir changes the SCPZIP_REPLACE thing was not used any more for Info.plist, so all the ${FOO} things were left in Info.plist unexpanded with predictably wonky results, a non-working app. Instead just expand it from the configure script. While at it, use a correct CFBundleShortVersionString: only three integers should be in that. Also, hardcode FILEFORMATNAME as OpenOffice.org and FILEFORMATVERSION as 1.0, and drop the "variables", as that is what those "variables" *means*. They were used to refer to the OOo 1.0 formats. (It would have been utterly wrong to define them as something else, like another product name and a newer version number, in openoffice.lst, so pointless to have them there.) Drop the meaningless BUILDIDCWS. Change-Id: I4030aa060b78e8b3fb812a6362869996e8db7d3d
2013-09-23Print a helpful error message if we are going to failTor Lillqvist
Change-Id: I0685c9d2d857a9e994c616acb6d7ce106c7a7dad
2013-09-23Duplicate "-Wl,-rpath-link," typoStephan Bergmann
Change-Id: I4d1feb61db753b150ec112579f5c493f9d1c1140
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-23gbuild: try to fix linking with default --as-neededMichael Stahl
As reported by Jbfaure, linking npsoplugin library fails on Ubuntu because of unresolved libdl symbols from a StaticLibrary. It turns out that --start-group/--end-group only affects static libraries, so reorder the link command again to put the StaticLibrary first. (regression from f861ae6acdbde8acc9560366d344852391d17b8d) Change-Id: Icd31faace8bf7764fee97cd93c3ecd0caad85947
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-22fdo#69601: quick fix for wrong cli_cppuhelper.dll in instsetMichael Stahl
This needs more investigation to find proper solution but the problem is probably that URE/bin/cli_cppuhelper.dll is not signed by "sn.exe". Change-Id: I318293603be838c41d09791136697de74091d37d
2013-09-22gbuild: fix gb_LinkTarget_set_precompiled_headerMichael Stahl
... for --enable-selective-debuginfo, use the right argument for that. Change-Id: I34bc1f473e02d8f7038478afadc8de24780ae88a
2013-09-22make the PythonTest run on WNTMichael Stahl
- fix the PATH - file url needs to start with file:///X:/ (three slashes, literal :) Change-Id: I0d16d1e946fd06ba5523961c23c3b46872c0c050
2013-09-22gbuild: drop mkdir -p calls from gb_LinkTarget__commandMichael Stahl
... should be obsoleted by previous commit. Change-Id: I378de1465d293a60dc20c545770f029c8f71bd50
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: clean up naming of PDB files for MSVCMichael Stahl
There are 2 of these, one is written to by cl.exe and read by link.exe and the second one written by link.exe. Name the second one as the linktargetname with .pdb appended, no need to substitue 5 different crazy suffixes. Change-Id: I2decad898ed1292b069bdda3124ce6f6c3667108
2013-09-22gbuild: MSVC: ignore LIBS for static librariesMichael Stahl
Not sure if it causes actual problems but all other platforms ignore LIBS on static libraries already when linking. Change-Id: I8a5ff4b2243b625827f82b0f64f007cea7c9d7c5
2013-09-22gbuild: remove static libraries from OUTDIRMichael Stahl
Refactor to find and link static libraries directly in WORKDIR. - gb_StaticLibrary_get_target is now same as the gb_LinkTarget_get_target - fix the StaticLibrary clean target Change-Id: Icf29d32d6487747a2e39d4599ceebccfead04667
2013-09-22find lots of external static libraries in UnpackedTarball dirMichael Stahl
Note: do NOT put file paths to static libraries into FOO_LIBS variables that are passed to bundled externals that are built with --enable-static: on Mac OS X this will result in .a archives that contain other .a archives as entries, and trying to link those results in errors like: ld: warning: ignoring file .../libodfgen-0.0.a, file was built for archive which is not the architecture being linked (i386) Change-Id: If2c5a458058e4da76f80b3643e55b489d1edee24
2013-09-22gbuild: rename LinkTarget variable LIBSMichael Stahl
LIBS is apparently used by autotools build system and passed to configure at least in mythes and hunspell, where the LinkTarget variable could cause problems by inheritance. Change-Id: Ia267dd0a24c96914208869d7b47552b44a701735
2013-09-22gbuild: change linking order on ELF platformsMichael Stahl
If there are static libraries in $(LIBS) then things get really annoying if they depend on other static libs that are StaticLibraries, e.g. orcus and boost_system. So reorder this to include $(LIBS) in the --start-group --end-group and hope that doesn't break anything. Hopefully $(LIBS) does not need -Wl$(COMMA)--no-as-needed, that should only be required for $(LINKEDLIBS). Change-Id: Ie15239a0fb7b5295f85941150e2c60912be73bfb
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-22sal: rename "cppunit/cppunittester" executableMichael Stahl
... and put it in OOO layer since it's used by the smoketest instset. It was in subdirectory for hysteric reasons, to pick up libraries from module local output directories in the dmake build system. Change-Id: I73b66672b17ede52c03071eb2ddee1a23c059ea9
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: add a SHLXTHDL layer for librariesMichael Stahl
... because this is the time of day when one thinks, wouldn't life simply be more awesome if there were a SHLXTHDL layer? Change-Id: I02df8a8bf9d7d641ea060e2cfef6643fe2202353
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-22Revert "fdo#51115: gb_Extension_add_file: fix Windows build:"Michael Stahl
This actually should no longer be necessary since AUXTARGETS were fixed in 85b6a93cf41fb05e726027e34fcd805330e20414. This reverts commit e818f8fa1f79c2eb2d647678333b8d12599dda69.
2013-09-22gbuild: remove SOVERSION variable since it is hardcoded anywayMichael Stahl
Change-Id: I625291ea86c1c3caf7fa5400e380defa6d0d0bc8
2013-09-22gbuild: make the versioned library the linktarget on UnixesMichael Stahl
If there is a SOVERSION then the versioned library is a real file and the unversioned one just a symlink; better to have the real file be the target. - add gb_Library_UDK_MAJORVER variable for SOVERSION - remove version parameter of gb_Library_set_soversion_script; instead hardcode the SOVERSION since it must be included in the file name in gb_Library_FILENAMES anyway - store the unversioned symlink in the ILIBTARGET variable - via new gb_Library_get_workdir_target_versionlink function - removed gb_Helper_install call that resulted in both versioned and unversioned libs in instdir Change-Id: I2c6f1698f0e39fdb2c07964d43ed9485cbca0b30
2013-09-22gbuild: make the DLL the LinkTarget of Library and CppunitTestMichael Stahl
... instead of the import lib. If the DLL is an auxtarget, it cannot be deleted without annoying errors, and we want to be able to rm -r $(INSTIDR) and build incrementally from there. - replace DLLTARGET -> ILIBTARGET - replace gb_Library_DLLFILENAMES -> gb_Library_FILENAMES - replace gb_Library_FILENAMES -> gb_Library_ILIBFILENAMES - replace gb_Library_get_dllname -> gb_Library_get_filename - replace gb_Library_get_filename -> gb_Library_get_ilibfilename - replace gb_CppunitTest_get_libfilename -> gb_CppunitTest_get_ilibfilename - replace gb_LinkTarget_set_dlltarget -> gb_LinkTarget_set_ilibtarget Change-Id: I92a2f061a653b9b5941f3232d729987b1317b6f8
2013-09-22gbuild: deduplicate gb_Library_get_exports_targetMichael Stahl
and remove comment obsoleted by 170668d83911c12475eccf69eba5e191863d4a56 Change-Id: Iba8db6214e04480eaf45bcd069ccd8b41fd25874
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-22PoC: no libs in solverBjoern Michaelsen
Change-Id: I8efd69d5a6f26fdfd334ff0bc38848eccc7a85fd
2013-09-22gbuild: document parameters of LinkTarget methodsMichael Stahl
Change-Id: Ib22df5811ab07e93a9d7e987b66b12506265bf96
2013-09-22gbuild: add gb_Library_use_restargetMichael Stahl
Change-Id: Ic0a2fd3c1adeb55ec27f6a2eb4709be598120fba
2013-09-22gbuild: remove unused gb_LinkTarget_use_headersMichael Stahl
Change-Id: Idce74274169970bdd35869578cc0046fe502e614
2013-09-22installer: actually WINDOWSBASISROOTNAME was wrongMichael Stahl
What _actually_ determines the prefix of the destination is the HostName property of the scp2 Directory with Style OFFICEDIRECTORY, so check that. The two are often the same but not when building a LibreOffice_Dev_SDK. Change-Id: Ic127447ef40731f0967b89ece631f9c7b076720f
generated by cgit (git 2.34.1) at 2024-07-05 03:09:35 +0000