[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - 3 commits - distro-configs/CPOSX.conf instsetoo_native/util solenv/bin

[Andras Timar]

 distro-configs/CPOSX.conf                     |    2 +-
 instsetoo_native/util/makefile.mk             |    4 ++--
 solenv/bin/modules/installer/simplepackage.pm |    4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit ad938851739b77ca50c9796810059c217cfd1327
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Nov 11 10:50:23 2013 +0100

    fix instsetoo_navite targets once more...
    
    Change-Id: I68fb6ed2b2bdf7ee99062f7af0c677ca9725e1b8

diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 0f3f79e..9bd3d26 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -100,13 +100,13 @@ ALLTAR  : $(LOCALPYFILES)
 .IF "$(GUI)"=="WNT"
 ALLTAR : openofficeall $(OOOHELPPACK)
 .ELSE
-ALLTAR : openoffice_$(defaultlangiso) $(eq,$(OS),MACOSX $(NULL) ooolanguagepack) $(eq,$(OS),MACOSX $(NULL) $(OOOHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lotest_en-US)
+ALLTAR : $(eq,$(OS),MACOSX openofficeall openoffice_$(defaultlangiso)) $(eq,$(OS),MACOSX $(NULL) ooolanguagepack) $(eq,$(OS),MACOSX $(NULL) $(OOOHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lotest_en-US)
 .ENDIF
 .ELSE
 .IF "$(GUI)"=="WNT"
 ALLTAR : openofficeall $(OOOHELPPACK) sdkooall
 .ELSE
-ALLTAR : openoffice_$(defaultlangiso) $(eq,$(OS),MACOSX $(NULL) ooolanguagepack) $(eq,$(OS),MACOSX $(NULL) $(OOOHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lotest_en-US) sdkoo_en-US
+ALLTAR : $(eq,$(OS),MACOSX openofficeall openoffice_$(defaultlangiso)) $(eq,$(OS),MACOSX $(NULL) ooolanguagepack) $(eq,$(OS),MACOSX $(NULL) $(OOOHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lotest_en-US) sdkoo_en-US
 .ENDIF
 .ENDIF
 .ELSE # "$(ENABLE_RELEASE_BUILD)"=="TRUE"
commit 440c4cd9ec40fc28bb93219c0fad421e28266d09
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Nov 11 07:47:15 2013 +0100

    do not fail the build, if codesign returns non-zero
    
    Change-Id: Ie8beb4b788b652522415d21ce432dcf48fa7327a

diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 32d3066..2a4d924 100755
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -445,8 +445,10 @@ sub create_package
 
 		if ($returnvalue)
 		{
-		    $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
+                    $infoline = "WARNING: \"$systemcall\" returned with non-zero!\n";
+                    $infoline .= "Return value: " . ($returnvalue >> 8) . "\n";
 		    push( @installer::globals::logfileinfo, $infoline);
+                    print $infoline;
 		}
 		else
 		{
commit ca0f3dd8c3ddfaffdb3aa2d2c42a66450fd1320a
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue Nov 5 19:44:00 2013 +0100

    comment out Mac OS X SDK configure switch
    
    Change-Id: I45e4f2a1246d9f721b549e0196e766aa5e3e03af

diff --git a/distro-configs/CPOSX.conf b/distro-configs/CPOSX.conf
index fda38ac..e070a05 100644
--- a/distro-configs/CPOSX.conf
+++ b/distro-configs/CPOSX.conf
@@ -14,7 +14,7 @@
 --disable-online-update
 --disable-odk
 --enable-epm
---with-macosx-sdk=10.8
+#--with-macosx-sdk=10.9
 --with-macosx-version-min-required=10.6
 --enable-ext-wiki-publisher
 --enable-ext-report-builder