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 /solenv | |
| parent | 09d544de65a25337b2c8c170577a4c2a113aaeb5 (diff) | |
Revert "Enable MSP patching"
This reverts commit 7e948427b09f4eb13eea812379ddacc01c28ef17.
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/globals.pm | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/windows/msp.pm | 2 |
2 files changed, 2 insertions, 2 deletions
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; |