[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - solenv/bin

[Norbert Thiebaud]

 solenv/bin/macosx-codesign-app-bundle |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit eeddff97b915588e5bbd273d689e4e79a5d6ec9a
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Fri Dec 20 15:12:42 2013 -0600

    fix Framework Codesigning on MacOSX
    
    on the 32 bits build 10.6 SDK we deliver Python Framework
    The code to sign the framework, although clearly the command that
    is recommanded for such things, failed with
    "object file format invalid"
    
    This patch make it 'works'... and with it the 10.6 build does not
    complain anymore about not satsifying it's 'requierments'
    
    Change-Id: I4fb5c6f3a9ed573d0bb2a09bddaf44300dc6f98b
    Reviewed-on: https://gerrit.libreoffice.org/7152
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/solenv/bin/macosx-codesign-app-bundle b/solenv/bin/macosx-codesign-app-bundle
index 5d65b2a..1546d8f 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -19,6 +19,8 @@ for V in \
     fi
 done
 
+echo "codesigning using MACSOX_CODESIGNING_IDENTITY=[${MACOSX_CODESIGNING_IDENTITY?}]"
+
 APP_BUNDLE=$1
 
 # Sign dylibs
@@ -55,8 +57,10 @@ done
 # completeness.
 
 for framework in `find $APP_BUNDLE -name '*.framework' -type d`; do \
+    fn="$(basename $framework)"
+    fn=${fn%.*}
     for version in $framework/Versions/*; do \
-        if test ! -L $version -a -d $version; then codesign --verbose --prefix=$MACOSX_BUNDLE_IDENTIFIER. --sign "$MACOSX_CODESIGNING_IDENTITY" $version; fi; \
+        if test ! -L $version -a -d $version; then codesign --force --verbose --prefix=$MACOSX_BUNDLE_IDENTIFIER. --sign "$MACOSX_CODESIGNING_IDENTITY" $version/$fn; fi; \
     done; \
 done