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

[Tor Lillqvist]

 distro-configs/CPOSX.conf                     |    1 -
 instsetoo_native/util/makefile.mk             |   18 +++++-------------
 solenv/bin/modules/installer.pm               |    2 +-
 solenv/bin/modules/installer/systemactions.pm |    2 +-
 4 files changed, 7 insertions(+), 16 deletions(-)

New commits:
commit 55e92938d4739238ab01ea03b2d869e854edf8d0
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Oct 3 18:17:53 2013 +0300

    Maybe we want helppack integration, let's try
    
    Change-Id: I322ce0c53df535a5e8a1528726baf4eb2f901df8

diff --git a/distro-configs/CPOSX.conf b/distro-configs/CPOSX.conf
index 15add0e..9d22921 100644
--- a/distro-configs/CPOSX.conf
+++ b/distro-configs/CPOSX.conf
@@ -9,7 +9,6 @@
 --with-startcenter-space-bitmap=$(SRC_ROOT)/icon-themes/galaxy/brand_cp/shell/backing_space.png
 --with-help
 --without-junit
---without-helppack-integration
 --enable-extension-integration
 --disable-online-update
 --disable-odk
commit 19f90d6b77e18f915b68cb8a9a87d9ae93dd9116
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Oct 3 18:16:51 2013 +0300

    Don't build separate helppacks unless --without-helppack-integration
    
    Change-Id: I3c49f1190128bd062346ef75729595048a053d41

diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 59b3a5b..d55812c 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -68,7 +68,7 @@ LOCALPYFILES= \
     $(BIN)$/pythonloader.py
 .ENDIF
 
-.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/HELP//)"
+.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/HELP//)" || "$(WITH_HELPPACK_INTEGRATION)"=="YES"
 OOOHELPPACK=
 OOODEVHELPPACK=
 .ELSE
commit b6e0b65c1758117593d722b80d6da0e2b9495dc6
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Oct 3 18:08:25 2013 +0300

    Use MD5SUM from the environment, not a hardcoded md5sum command
    
    Change-Id: Ic46319173e3893bed75d5d1469c8a17728bce2d3

diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index addfe7e..00f1c51 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -480,7 +480,7 @@ sub run {
         if (length($loglanguagestring) > $installer::globals::max_lang_length)
         {
             my $number_of_languages = installer::systemactions::get_number_of_langs($loglanguagestring);
-            chomp(my $shorter = `echo $loglanguagestring | md5sum | sed -e "s/ .*//g"`);
+            chomp(my $shorter = `echo $loglanguagestring | $ENV{'MD5SUM'} | sed -e "s/ .*//g"`);
             my $id = substr($shorter, 0, 8); # taking only the first 8 digits
             $loglanguagestring = "lang_" . $number_of_languages . "_id_" . $id;
         }
diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm
index 22d83fb..dc36d3e 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -267,7 +267,7 @@ sub create_directories
                 if (length($languagestring) > $installer::globals::max_lang_length )
                 {
                     my $number_of_languages = get_number_of_langs($languagestring);
-                    chomp(my $shorter = `echo $languagestring | md5sum | sed -e "s/ .*//g"`);
+                    chomp(my $shorter = `echo $languagestring | $ENV{'MD5SUM'} | sed -e "s/ .*//g"`);
                     my $id = substr($shorter, 0, 8); # taking only the first 8 digits
                     $languagestring = "lang_" . $number_of_languages . "_id_" . $id;
                 }
commit d41f065fca80d45196b90fd67a5a922cf16d6702
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Oct 3 18:03:55 2013 +0300

    We want a multilingual OS X app bundle
    
    For the Collabora build, with just a limited set of UI languages, we
    don't want separate langpack installer apps.
    
    Change-Id: I8a8a958299df6714d9e5ccefa1eb92664a1e6e32

diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index c741027..59b3a5b 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -97,17 +97,9 @@ ALLTAR  : $(LOCALPYFILES)
 .ELSE			# "$(GUI)"!="WNT" && "$(EPM)"=="NO"
 .IF "$(ENABLE_RELEASE_BUILD)"=="TRUE"
 .IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
-.IF "$(GUI)"=="WNT"
 ALLTAR : openofficeall $(OOOHELPPACK)
 .ELSE
-ALLTAR : openoffice_$(defaultlangiso) 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) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) $(OOOHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lotest_en-US) sdkoo_en-US
-.ENDIF
 .ENDIF
 .ELSE # "$(ENABLE_RELEASE_BUILD)"=="TRUE"
 .IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
@@ -333,6 +325,9 @@ $(BIN)$/dev$/intro.zip : $(SOLARCOMMONPCKDIR)$/brand_dev$/intro.zip
     $(COPY) $< $@
 
 hack_msitemplates .PHONY:
+.IF "$(OS)" != "WNT"
+    @true
+.ELSE
     -$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)
     -$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)
     -$(MKDIRHIER) $(MSIHELPPACKTEMPLATEDIR)
@@ -368,8 +363,7 @@ hack_msitemplates .PHONY:
     $(COPY) $(PRJ)$/res$/banner_cp.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
     $(COPY) $(PRJ)$/res$/banner_cp.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
     $(COPY) $(PRJ)$/res$/banner_cp.bmp $(MSITESTTEMPLATEDIR)$/Binary$/Banner.bmp
-
-.IF "$(OS)" == "WNT"
+.ENDIF
 
 ALLLANGSTRING:=$(alllangiso)
 
@@ -385,5 +379,3 @@ lotestall: hack_msitemplates $(LOCALPYFILES) lotest_$(ALLLANGSTRING:s/ /,/)$(PKG
 
 lodevtestall: hack_msitemplates $(LOCALPYFILES) lodevtest_$(ALLLANGSTRING:s/ /,/)$(PKGFORMAT:^".")
 
-.ENDIF			# "$(OS)" == "WNT"
-