[Libreoffice-commits] core.git: Changes to 'feature/instdirlinktargets'

Michael Stahl mstahl at redhat.com
Thu Sep 19 12:14:44 PDT 2013 

New branch 'feature/instdirlinktargets' available with the following commits:
commit 2f752327cea964b3de478e5eb83877c05251a8b4
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Sep 19 10:55:26 2013 +0200

    gbuild: remove static libraries from OUTDIR
    
    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

commit c8c6d88bc1e82e30eb1a7abd2543cd929c9a2491
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Sep 19 19:32:31 2013 +0200

    stop delivering lots of external static libraries
    
    Change-Id: Id0c5908adbdec40346c1b62304d1f72ed077ca54

commit 8bb9deddc201f9f4e2c9d04038e4b4ea520acc47
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Sep 19 19:28:36 2013 +0200

    find lots of external static libraries in UnpackedTarball dir
    
    Change-Id: If2c5a458058e4da76f80b3643e55b489d1edee24

commit 326306fd78f0c9c11898161dd0114c38c7d06bd3
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Sep 19 18:27:11 2013 +0200

    gbuild: rename LinkTarget variable LIBS
    
    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

commit 9d1a44955cd6476aa5f96a24032c7214a24f003a
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Sep 19 18:05:02 2013 +0200

    gbuild: change linking order on ELF platforms
    
    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

commit 3a3637d912bc5daaa6bde0ff2ffda3617f7026bb
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Sep 19 00:08:31 2013 +0200

    gbuild: remove executables from OUTDIR and WORKDIR
    
    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
    
    Change-Id: I3e1ee7425dd430bb83c7cd59e265869a0541b38d

commit 0a491d3e5e3806c87cbc8acd37141ea65720ba4e
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Sep 19 10:39:56 2013 +0200

    sal: rename "cppunittest/cppunittester" executable
    
    ... 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

commit a66b62d3f4502f47047ac7f6c4a01b8377cf5d6b
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Sep 19 00:06:24 2013 +0200

    odk: remove Package_bin, instead auto-install executables
    
    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

commit c91b54f32210c16e93ba8cd4c1e2eae679e5f977
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Sep 18 15:03:50 2013 +0200

    gbuild: remove libraries from OUTDIR and WORKDIR
    
    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
    - 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
    - add a (unfortunately cyclic) dependency on Package ure_install to sal
    
    Change-Id: I70d88742f8c8232ad7b9521416275c67b64fe6cf

commit 0fcd3871b2494d534d40a2c4a604316032feee05
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Sep 18 21:01:14 2013 +0200

    Repository.mk: adjust layer of libraries in smoketest instset
    
    These are currently installed in the "program" dir, whether that is a
    good idea or not.
    
    Change-Id: I842bc0a72f9a6f78462ad18151cd42f85753aadf

commit 7b8125d46b4f59d5a92d6e9cec987a62a719ba75
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Sep 18 15:53:04 2013 +0200

    Revert "fdo#51115: gb_Extension_add_file: fix Windows build:"
    
    This actually should no longer be necessary since AUXTARGETS were fixed
    in 85b6a93cf41fb05e726027e34fcd805330e20414.
    
    This reverts commit e818f8fa1f79c2eb2d647678333b8d12599dda69.

commit 93a9ba9c0e8a811603829e39e065dc5822b7d684
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Sep 18 00:18:28 2013 +0200

    gbuild: remove SOVERSION variable since it is hardcoded anyway
    
    Change-Id: I625291ea86c1c3caf7fa5400e380defa6d0d0bc8

commit 93cdbd6985409e186c09548eda0312f9d62681b2
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Sep 17 22:24:10 2013 +0200

    gbuild: make the versioned library the linktarget on Unixes
    
    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

commit 36343a8f37478d8bbeadc18a53ee933afdc2be69
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Sep 17 19:50:20 2013 +0200

    gbuild: make the DLL the LinkTarget of Library and CppunitTest
    
    ... 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

commit 03e6cf5cb30b75f521d89a75e1edc1953c28cd60
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Sep 17 18:41:07 2013 +0200

    gbuild: deduplicate gb_Library_get_exports_target
    
    and remove comment obsoleted by 170668d83911c12475eccf69eba5e191863d4a56
    
    Change-Id: Iba8db6214e04480eaf45bcd069ccd8b41fd25874

commit f798852ad9f454a03d2cd4e3c3b85cd27d65330a
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Sep 16 12:13:02 2013 +0200

    gbuild: refactor LinkTarget representation
    
    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

commit a113c5372772345c7de378b3f1905e6d44be8f78
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Sep 13 23:42:50 2013 +0200

    PoC: no libs in solver
    
    Change-Id: I8efd69d5a6f26fdfd334ff0bc38848eccc7a85fd

commit 93a45643622f60f74942b2d62089d16e9466ddff
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Sep 16 00:03:04 2013 +0200

    gbuild: document parameters of LinkTarget methods
    
    Change-Id: Ib22df5811ab07e93a9d7e987b66b12506265bf96

commit 4c0273584d1c402b31a8261e620a61653bf0dc46
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sat Sep 14 23:11:14 2013 +0200

    gbuild: add gb_Library_use_restarget
    
    Change-Id: Ic0a2fd3c1adeb55ec27f6a2eb4709be598120fba

commit a205f2705d8c3baaf153d8f39105a37ff0a60f26
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sat Sep 14 22:56:53 2013 +0200

    gbuild: remove unused gb_LinkTarget_use_headers
    
    Change-Id: Idce74274169970bdd35869578cc0046fe502e614

commit 6c9d5fc38df6f9c9809475e6209fb4c2f0290a35
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Sep 16 23:35:26 2013 +0200

    cppu: rename purpose environment libraries
    
    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

commit d2aa4c0643e30109509e4a9550c80cea8cecd4ce
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Sep 17 17:23:42 2013 +0200

    gbuild: gb_SdiObject_get_dep_target does not exist
    
    Change-Id: Id744a6035ad60cc66d791e8ce34b60ad5b200923

commit 4bd04e29a97836183d58acc59020b6307e51788c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Sep 17 17:09:12 2013 +0200

    gbuild: ExternalPackage: fix stupid typo
    
    Change-Id: Ie8d8ac0ead879c90557f8f76d1a63fe9fde764d0

commit 42034c6319be9d4eb2869df602fc462231439250
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Sep 17 17:08:25 2013 +0200

    gb_StaticLibrary_set_generated_c_suffix does not exist
    
    Change-Id: I933e811bc4f68ead2e39be9050d9db37a9c924a1

commit 24d3a93835e39bed8550a4a677ee7badfd581bf6
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Sep 17 17:07:31 2013 +0200

    undefined function warning gb_Library__set_soversion_script_platform
    
    Change-Id: I81df2b8d2016a900bdebc0feaa33db7e587ba4bb

commit 89c0bea633b7ade28b2a126654be85f0b64ce6b0
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Sep 17 15:26:39 2013 +0200

    gbuild: remove gb_NoExPrecompiledHeader_get_clean_target
    
    Obsolete since 2bf530153e9fb24aef62bf5e16e23ea1412887dd.
    
    Change-Id: I6a66e14420bd3c6cb7557932a83cf0c4b95cdd11

commit b2fa50c829420053b7a15fbac0c84a8af9387310
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sun Sep 8 12:15:22 2013 +0200

    FIXME: speedup hack
    
    Change-Id: I15544f6820fa9cf5963536ef99c9065fcd36d134

More information about the Libreoffice-commits mailing list