diff options
author | Andras Timar <andras.timar@collabora.com> | 2018-07-09 09:50:37 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2018-07-09 09:50:37 +0200 |
commit | b3bae2851e808bd6dfb47ffe2ae58e9bba29f77e (patch) | |
tree | d219b32a78f542b4d4159577312810d96281b8e7 | |
parent | 09d544de65a25337b2c8c170577a4c2a113aaeb5 (diff) |
Revert "Enable MSP patching"
This reverts commit 7e948427b09f4eb13eea812379ddacc01c28ef17.
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | configure.ac | 3 | ||||
-rw-r--r-- | instsetoo_native/util/openoffice.lst.in | 2 | ||||
-rw-r--r-- | setup_native/source/packinfo/finals_instsetoo.txt (renamed from setup_native/source/packinfo/finals_instsetoo.txt.in) | 1 | ||||
-rw-r--r-- | solenv/bin/modules/installer/globals.pm | 2 | ||||
-rw-r--r-- | solenv/bin/modules/installer/windows/msp.pm | 2 |
6 files changed, 3 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore index aad4142986f0..ab3a638307b5 100644 --- a/.gitignore +++ b/.gitignore @@ -64,7 +64,6 @@ /README /AUTHORS /MAINTAINERS -/setup_native/source/packinfo/finals_instsetoo.txt # make id /ID diff --git a/configure.ac b/configure.ac index 68d0accb1fa4..7e27553b12ae 100644 --- a/configure.ac +++ b/configure.ac @@ -3061,7 +3061,6 @@ if test "$_os" = "WINNT"; then BITNESS_OVERRIDE=64 fi fi -AC_SUBST(WINDOWS_SDK_ARCH) if test "$_os" = "iOS"; then cross_compiling="yes" fi @@ -4370,7 +4369,6 @@ 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 -) @@ -12588,7 +12586,6 @@ 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 721e6788fd0d..4d5a01bbf158 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 1 + CREATE_MSP_INSTALLSET 0 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.in b/setup_native/source/packinfo/finals_instsetoo.txt index b871d6c64238..d5a68d369f7b 100644 --- a/setup_native/source/packinfo/finals_instsetoo.txt.in +++ b/setup_native/source/packinfo/finals_instsetoo.txt @@ -30,4 +30,3 @@ # 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-@WINDOWS_SDK_ARCH@\Collabora_Office_6.0-5-Win_@WINDOWS_SDK_ARCH@.msi diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index 324379896547..2cd0cc21062c 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 = 0; + $include_cab_in_msi = 1; $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 e76d5da7ab7f..1e76947df7b0 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->{'ONEWORDPRODUCTNAME'} . "-" . $allvariables->{'PRODUCTVERSION'} . "-" . $allvariables->{'WINDOWSPATCHLEVEL'} . ".msp"; + my $databasename = $allvariables->{'PRODUCTNAME'} . "-" . $allvariables->{'PRODUCTVERSION'} . "-" . $allvariables->{'WINDOWSPATCHLEVEL'} . ".msp"; my $fullmspname = $mspdir . $installer::globals::separator . $databasename; |