[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - configure.ac .gitignore instsetoo_native/util setup_native/source solenv/bin

[Andras Timar]

 .gitignore                                           |    1 +
 configure.ac                                         |    3 +++
 instsetoo_native/util/openoffice.lst.in              |    2 +-
 setup_native/source/packinfo/finals_instsetoo.txt.in |    1 +
 solenv/bin/modules/installer/globals.pm              |    2 +-
 solenv/bin/modules/installer/windows/msp.pm          |    2 +-
 6 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 7e948427b09f4eb13eea812379ddacc01c28ef17
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Oct 10 13:56:31 2016 -0700

    Enable MSP patching
    
    (cherry picked from commit ae8938f8848bcce96e21ee207c0226ff0a3cb4a2)
    
    Change-Id: I1de9776e161161daf7349be304e05d5bb959f891

diff --git a/.gitignore b/.gitignore
index ab3a638307b5..aad4142986f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,6 +64,7 @@
 /README
 /AUTHORS
 /MAINTAINERS
+/setup_native/source/packinfo/finals_instsetoo.txt
 
 # make id
 /ID
diff --git a/configure.ac b/configure.ac
index 5fbc6569cb55..576c5a843c6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3061,6 +3061,7 @@ if test "$_os" = "WINNT"; then
         BITNESS_OVERRIDE=64
     fi
 fi
+AC_SUBST(WINDOWS_SDK_ARCH)
 if test "$_os" = "iOS"; then
     cross_compiling="yes"
 fi
@@ -4369,6 +4370,7 @@ if test "$cross_compiling" = "yes"; then
         bin/odfvalidator.sh.in \
         bin/officeotron.sh.in \
         instsetoo_native/util/openoffice.lst.in \
+        setup_native/source/packinfo/finals_instsetoo.txt.in \
         config_host/*.in \
         sysui/desktop/macosx/Info.plist.in) \
     | (cd CONF-FOR-BUILD && tar xf -)
@@ -12586,6 +12588,7 @@ AC_CONFIG_FILES([config_host.mk
                  bin/odfvalidator.sh
                  bin/officeotron.sh
                  instsetoo_native/util/openoffice.lst
+                 setup_native/source/packinfo/finals_instsetoo.txt
                  sysui/desktop/macosx/Info.plist])
 AC_CONFIG_HEADERS([config_host/config_buildid.h])
 AC_CONFIG_HEADERS([config_host/config_clang.h])
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 4d5a01bbf158..721e6788fd0d 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -27,7 +27,7 @@ Globals
             REGISTRYLAYERNAME Layers
             SERVICEPACK 1
             UPDATE_DATABASE 1
-            CREATE_MSP_INSTALLSET 0
+            CREATE_MSP_INSTALLSET 1
             UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
             PACKAGEMAP package_names.txt,package_names_ext.txt
             WINDOWSPATCHLEVEL @LIBO_VERSION_PATCH@
diff --git a/setup_native/source/packinfo/finals_instsetoo.txt b/setup_native/source/packinfo/finals_instsetoo.txt.in
similarity index 82%
rename from setup_native/source/packinfo/finals_instsetoo.txt
rename to setup_native/source/packinfo/finals_instsetoo.txt.in
index d5a68d369f7b..b871d6c64238 100644
--- a/setup_native/source/packinfo/finals_instsetoo.txt
+++ b/setup_native/source/packinfo/finals_instsetoo.txt.in
@@ -30,3 +30,4 @@
 # OpenOffice	pro		de			\\<server>\<path>\msi\OOO300_m6_native_packed-1_de.9352\openofficeorg30.msi
 # OpenOfficeLanguagePack	pro	es	\\<server>\<path>\msi\OOO300_m6_native_packed-1_es.9352\openofficeorg30.msi
 # URE			pro		en-US		\\<server>\<path>\msi\OOO300_m6_native_packed-1_en-US.9352\ure14.msi
+CollaboraOffice		pro		en-US,ar,as,ast,bg,bn-IN,br,ca,ca-valencia,cy,cs,da,de,el,en-GB,es,et,eu,fi,fr,ga,gd,gl,gu,he,hi,hr,hu,id,is,it,ja,km,kn,ko,lt,lv,ml,mr,nb,nl,nn,oc,or,pa-IN,pl,pt,pt-BR,ro,ru,sk,sl,sr,sr-Latn,sv,ta,te,tr,uk,vi,zh-CN,zh-TW		c:\lo\src\cp-6.0-5- at WINDOWS_SDK_ARCH@\Collabora_Office_6.0-5-Win_ at WINDOWS_SDK_ARCH@.msi
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 2cd0cc21062c..324379896547 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -222,7 +222,7 @@ BEGIN
     $fix_number_of_cab_files = 1;
     $cabfilecompressionlevel = 21; # Using LZX compression, possible values are: 15 | 16 | ... | 21 (best compression)
     $number_of_cabfiles = 1;    # only for $fix_number_of_cab_files = 1
-    $include_cab_in_msi = 1;
+    $include_cab_in_msi = 0;
     $msidatabasename = "";
     $prepare_winpatch = 0;
     $previous_idt_dir = "";
diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm
index 1bbeea8d20cb..75bcceefcdf8 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -288,7 +288,7 @@ sub set_mspfilename
 {
     my ($allvariables, $mspdir, $languagesarrayref) = @_;
 
-    my $databasename = $allvariables->{'PRODUCTNAME'} . "-" . $allvariables->{'PRODUCTVERSION'} . "-" . $allvariables->{'WINDOWSPATCHLEVEL'} . ".msp";
+    my $databasename = $allvariables->{'ONEWORDPRODUCTNAME'} . "-" . $allvariables->{'PRODUCTVERSION'} . "-" . $allvariables->{'WINDOWSPATCHLEVEL'} . ".msp";
 
     my $fullmspname = $mspdir . $installer::globals::separator . $databasename;