- 22 Eyl, 2013 40 kayıt (commit)
-
-
Caolán McNamara yazdı
Change-Id: Id1e74f18c90e69d1a781c8f02e30dc3c005ed4fd
-
Caolán McNamara yazdı
Change-Id: Ie7f33d0debfdb91db842608d5b14d0671b44c76d
-
Michael Stahl yazdı
Change-Id: Ib1869134b971c04a9cbd5d15b206898e943aaa5e
-
Michael Stahl yazdı
- fix the PATH - file url needs to start with file:///X:/ (three slashes, literal :) Change-Id: I0d16d1e946fd06ba5523961c23c3b46872c0c050
-
Michael Stahl yazdı
... should be obsoleted by previous commit. Change-Id: I378de1465d293a60dc20c545770f029c8f71bd50
-
Michael Stahl yazdı
- 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
-
Michael Stahl yazdı
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
-
Michael Stahl yazdı
Not sure if it causes actual problems but all other platforms ignore LIBS on static libraries already when linking. Change-Id: I8a5ff4b2243b625827f82b0f64f007cea7c9d7c5
-
Michael Stahl yazdı
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
-
Michael Stahl yazdı
Change-Id: Id0c5908adbdec40346c1b62304d1f72ed077ca54
-
Michael Stahl yazdı
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
-
Michael Stahl yazdı
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
-
Michael Stahl yazdı
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
-
Michael Stahl yazdı
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 0ffab936 "force 'main' to always be DLLPUBLIC." Change-Id: I3e1ee7425dd430bb83c7cd59e265869a0541b38d
-
Michael Stahl yazdı
... so that custom targets in i18npool run. Can't remember if that is a pre-existing problem or caused by one of my changes. Change-Id: Ic0aa1f2b8600f4951d30a5ac6f3ade1a4fb2d313
-
Michael Stahl yazdı
Clean up the horrible mess around unopkg.bin unopkg.com unopkg.exe and soffice.bin soffice.exe and crashrep.com executables and associated renaming via Packages in the desktop makefiles by simply using RepositoryFixes to correct the names. Change-Id: I4d3a549462cfa90a63d62b35db1b0407b25239f7
-
Michael Stahl yazdı
The library is already in the URE/bin directory, but that is not sufficient to be able to run sdk/bin/climaker.exe. There are apparently 4 ways for a .net/CLR executable to locate shared libraries: 1) in the same directory as the executable 2) in some mysterious "GAC" thing in C:/Windows (which is presumably how it works if you actually install LO) 3) via an application configuration file entry "probing", which only works when it's in a sub-directory of the one the executable is in 4) via a DEVPATH variable, but that only works with a special configuration entry in a system "machine config" file of the .net framework Specifically PATH is apparently ignored. Since building on Windows is enough of a PITA already and we don't want developers to have to edit another config file, put another copy of the library into sdk/bin. http://tutorials.csharp-online.net/.NET_CLR_Components%E2%80%94Resolving_Names_to_Locations http://tutorials.csharp-online.net/.NET_CLR_Components%E2%80%94CLR_Loader Change-Id: I511957ad9a9a918ed0c316126304a1980fb2d289
-
Michael Stahl yazdı
Change-Id: I76b4815208354e78eb3575982235b6f26f1e02fd
-
Michael Stahl yazdı
Putting it in a subdirectory on solver is no longer necessary since python3 started delivering to INSTDIR, so lose the crazy naming. Change-Id: I17e924e5d872768a64f6a3112f1294f3def7120e
-
Michael Stahl yazdı
... 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
-
Michael Stahl yazdı
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
-
Michael Stahl yazdı
... 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
-
Michael Stahl yazdı
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
-
Michael Stahl yazdı
It is actually installed by scp2/source/ooo/ure.scp already. Change-Id: I0ca538e3d6c52b1e228f1b1191778d8fb5d84954
-
Michael Stahl yazdı
Change-Id: Ib22fcbe5e9427750196f11c512fd4d3134108731
-
Michael Stahl yazdı
These are currently installed in the "program" dir, whether that is a good idea or not. Change-Id: I842bc0a72f9a6f78462ad18151cd42f85753aadf
-
Michael Stahl yazdı
This actually should no longer be necessary since AUXTARGETS were fixed in 85b6a93c. This reverts commit e818f8fa.
-
Michael Stahl yazdı
Change-Id: I625291ea86c1c3caf7fa5400e380defa6d0d0bc8
-
Michael Stahl yazdı
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
-
Michael Stahl yazdı
... 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
-
Michael Stahl yazdı
and remove comment obsoleted by 170668d8 Change-Id: Iba8db6214e04480eaf45bcd069ccd8b41fd25874
-
Michael Stahl yazdı
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
-
Bjoern Michaelsen yazdı
Change-Id: I8efd69d5a6f26fdfd334ff0bc38848eccc7a85fd
-
Michael Stahl yazdı
Change-Id: Ib22df5811ab07e93a9d7e987b66b12506265bf96
-
Michael Stahl yazdı
Change-Id: Ic0a2fd3c1adeb55ec27f6a2eb4709be598120fba
-
Michael Stahl yazdı
Change-Id: Idce74274169970bdd35869578cc0046fe502e614
-
Michael Stahl yazdı
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
-
Michael Stahl yazdı
It would not be necessary to mangle the affine_uno_uno/log_uno_uno/unsafe_uno_uno library names in RepositoryFixes.mk if they were simply named right in the first place. Change-Id: I0fce919549764d2335c5501c1110878b8709fa09
-
Michael Stahl yazdı
Change-Id: Id744a6035ad60cc66d791e8ce34b60ad5b200923
-
Michael Stahl yazdı
Change-Id: Ie8d8ac0ead879c90557f8f76d1a63fe9fde764d0
-