summaryrefslogtreecommitdiff
path: root/solenv/gbuild/platform
AgeCommit message (Collapse)AuthorFilesLines
2014-04-02Add apr and serf externals for alternative webdav implementation.Matúš Kukan2-0/+11
Change-Id: I5e93bb6fb53537b889c6ba9888f0f32a0d6f8050 (cherry picked from commit 0b27253aff771e104a9fd5d17595b205b2fc39fd)
2014-02-26fdo#75526: sdk: install URE library symlinks / import libs againMichael Stahl5-0/+8
This is a bit involved because since the LinkTarget now creates the instdir/sdk/lib/* files itself a Package cannot be used; so convert the URE libraries to AutoInstall and add special handling for them to gb_Helper_register_libraries_for_install to create the necessary links in the "sdk" install-module. (regression from 70c35265f517ef372cb739d4cc64499abf57a838) (cherry picked from commit 482ab0d09620f92eb3618125930dc7c4c8335b5e) Conflicts: solenv/gbuild/AutoInstall.mk fdo#75526: argh missing semicolon (cherry picked from commit 7eeac88bdb111cc069d208cc2d82a6143748d9d3) Change-Id: Ia5467f3303d59f7f5f4a88adc22ceffb82a21ff1 Reviewed-on: https://gerrit.libreoffice.org/8365 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2013-12-09Name the .pdb files so that WinDbg can consume them.Jan Holesovsky1-2/+11
Change-Id: I62cecfb36dd912a1a736d063761faa445a29f3a7
2013-11-20gbuild: TARGETGUI variable must be set on all LinkTargetsMichael Stahl2-2/+1
... otherwise it will get inherited from Executables to StaticLibraries and then mt.exe will be unhappy and complain. Change-Id: Ic9cc32ea3d0fb5d1fe91c1e9efa354fdf30c8264
2013-11-20gbuild: MSVC 2012 does not like /pdb for static librariesMichael Stahl1-3/+4
Complains with warning LNK4044 and ignores it. Change-Id: Ie91369339d121a652ce51e9229c3ef3b1c39d214
2013-11-20Windows: Require at least Windows XP SP2Thomas Arnhold3-4/+4
* Windows XP SP2 is 0x0502, see http://msdn.microsoft.com/en-us/library/aa383745.aspx * If a module changes the Windows SDK version setting, this is done module wide now. So the overall behavior is as before. This seems to be the best compromise for now. * We need at least SP2 because of the bluetooth stuff used in sd/source/ui/remotecontrol. * Now, we require at least Internet Explorer 7.0. IE6 has been outdated for a long time. * Leave StdAfx.h file definitions, as those are Microsoft project specific precompiled header files. * All local definitions of WINVER are removed, because the global WINVER setting makes them obsolete now. To the relation of the three macros: Setting _WIN32_WINNT sets WINVER and NTDDI_VERSION automatically to the same value as _WIN32_WINNT. WINVER and NTDDI_VERSION can be set idenpendently each for itself. Change-Id: Ibcc12493aae4fcaf7bcfda88be99c1b61bc326cb Reviewed-on: https://gerrit.libreoffice.org/6496 Reviewed-by: Thorsten Behrens <thb@documentfoundation.org> Tested-by: Thorsten Behrens <thb@documentfoundation.org>
2013-11-11Add EBOOK_LIBSTor Lillqvist1-0/+1
Change-Id: I180346fe33814ac72e2293bd010b993caefbc71e
2013-11-07remove unused gb_smoketest_instsetMichael Stahl1-3/+0
Change-Id: I73739639be5aac39e50cf6cbe6dc576f350d07fa
2013-11-04add original PATH to PATH during unit testsMarkus Mohrhard1-1/+1
we need this for our opencl tests to be able to execute the opencl compiler during the test Change-Id: I9f9e8f3ceb26ff62789d888e6eb9f4f94010bb1f Signed-off-by: I-Jui (Ray) Sung <ray@multicorewareinc.com>
2013-11-02remove SOLARENV variableMichael Stahl1-2/+2
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-01Add FREEHAND_LIBSTor Lillqvist1-0/+1
Change-Id: I86d01c9afdedc2477c2894694ab04c4a493bfa65
2013-10-31solver doesn't solve anything...Michael Stahl11-25/+16
... 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-31readlicense_oo: stop delivering files to OUTDIRMichael Stahl6-6/+6
- remove Package_readme, use generated files from WORKDIR via include path - Package_license and Package_files deliver to INSTDIR - split up Package_odk_shared_readme to have extra Package for generated files - gb_Extension_LICENSEFILE_DEFAULT points to INSTDIR Change-Id: I019d3431e30d982e887ae0000c755e0d61f98893
2013-10-25No libs in solver now any moreTor Lillqvist1-1/+4
Change-Id: I6f0f91c5fdb467fea2c706b4d426a973277c5230
2013-10-24The icu, xml2 and libxslt libs movedTor Lillqvist1-0/+3
Change-Id: I202ab418d2cf0d4f0f9d7786fec837dd76abd7b5
2013-10-24gbuild: gb_Helper_extend_ld_path was rather broken...Michael Stahl2-3/+3
Change-Id: I03b2d8590fada4709f2223dcd05760bf2fddb196
2013-10-24gbuild: try to un-break cppunit tests on MACOSX and WNTMichael Stahl2-2/+2
Change-Id: I174c113dcaf31a09026d6620e8183b756396c4f1
2013-10-24cppunit: use libraries from WORKDIRMichael Stahl9-14/+15
Change-Id: I5ce895e6cadc874a3464e6109dfbedd785dbac77
2013-10-23icu: use executables from WORKDIRMichael Stahl2-0/+5
Change-Id: I74b9d1dbcb3e8f7f2cc092dad60266cf60475367
2013-10-20Whatever the assertion failures in saxparser when doing i18npool...Stephan Bergmann1-5/+1
...actually were, I cannot reproduce any problems at least with recent Xcode 5.0 on Mac OS X 10.8. Maybe the real problem was addressed meanwhile with 254f59f623f58c320175a06a2c93bcee7868b623 "rhbz#1014010: Missing dependencies in isBootstrapType list." Change-Id: I24a920c12f70feef670f0988a6f69c26033789fd
2013-10-11Use -fvisibility=hidden also for 3rd-party libs for iOSTor Lillqvist1-1/+5
Change-Id: Ib2806d71f9c2dc18c64f2c92012eaa1c77ddd9d2
2013-10-07Try again to use -O2 but keep -Oy- this timeTor Lillqvist1-10/+1
Change-Id: Iee396f289df4dc4134c30e6b6b1126d2745c1f6f
2013-10-02Need to list all places we have libs here, tooTor Lillqvist1-0/+13
They are no longer simply in solver. Change-Id: Ibf00854a8a17d97357748caf14e7323e029dfd44
2013-10-01gbuild: fix dependencies in gb_SrsPartTarget__command_depMichael Stahl1-1/+1
Use -MP to output dummy rules for included files so build doesn't break when an included file is removed. Change-Id: Ib230cfa5d5da71c7f5c15af5bdaa5004e6b7a122
2013-09-27gbuild: remove unused gb_CppunitTest_LIBDIRMatúš Kukan5-5/+0
Change-Id: I42ffe7c32d249bdd9cfa03800e78c431df0bb52f
2013-09-27gbuild: remove now unused gb_Library_OUTDIRLOCATIONMatúš Kukan1-4/+1
Change-Id: I696b550b495d1bf6549e3c54a3157d467a7ead8d
2013-09-25Start hacking --enable-canonical-installation-tree-structure back into shapeTor Lillqvist1-1/+1
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-23Duplicate "-Wl,-rpath-link," typoStephan Bergmann1-1/+1
Change-Id: I4d1feb61db753b150ec112579f5c493f9d1c1140
2013-09-23Fixes for cross-compilation on OS X (to iOS)Tor Lillqvist7-23/+5
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 Stahl2-2/+2
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 Lillqvist7-38/+20
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 Stahl1-1/+1
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-22make the PythonTest run on WNTMichael Stahl1-1/+1
- 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 Stahl7-14/+1
... should be obsoleted by previous commit. Change-Id: I378de1465d293a60dc20c545770f029c8f71bd50
2013-09-22gbuild: clean up naming of PDB files for MSVCMichael Stahl1-17/+16
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 Stahl1-2/+1
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 Stahl2-0/+2
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-22gbuild: rename LinkTarget variable LIBSMichael Stahl7-8/+8
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 Stahl2-4/+10
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 Stahl2-10/+14
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-22gbuild: add a SHLXTHDL layer for librariesMichael Stahl2-0/+5
... 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 Stahl8-58/+68
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: remove SOVERSION variable since it is hardcoded anywayMichael Stahl3-7/+7
Change-Id: I625291ea86c1c3caf7fa5400e380defa6d0d0bc8
2013-09-22gbuild: make the versioned library the linktarget on UnixesMichael Stahl4-30/+32
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 Stahl7-65/+58
... 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 Stahl2-10/+0
and remove comment obsoleted by 170668d83911c12475eccf69eba5e191863d4a56 Change-Id: Iba8db6214e04480eaf45bcd069ccd8b41fd25874
2013-09-22gbuild: refactor LinkTarget representationMichael Stahl5-11/+12
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 Michaelsen2-3/+3
Change-Id: I8efd69d5a6f26fdfd334ff0bc38848eccc7a85fd
2013-09-22undefined function warning gb_Library__set_soversion_script_platformMichael Stahl2-0/+5
Change-Id: I81df2b8d2016a900bdebc0feaa33db7e587ba4bb
2013-09-14Clean up Mac OS X .jnilibsStephan Bergmann1-2/+1
Those .jnilibs that are not needed as .dylibs (this includes those that are also UNO components) are handled via RepositoryFixes.mk. The remaining one, libjava_uno.jnilib is packaged as a symlink in instdir. Everything else is not necessary and removed (including the venerable oddity macosx-create-bundle). Change-Id: I34a1801b0733cdff885c1c72db16fa631c5d82ef
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-17 22:37:25 +0000