diff options
| author | Andras Timar <andras.timar@collabora.com> | 2016-10-10 13:56:31 -0700 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-12-11 07:31:20 -0800 |
| commit | bc72923f02685ad0bccea6fab9524214afa901fe (patch) | |
| tree | ee7a2f5af2353f894af4e21f13264ba40fecafeb /solenv | |
| parent | e2e1aa6b08a914c6268bfe9c8b0a4bf1c1d0f45b (diff) | |
Enable MSP patching
Change-Id: I1de9776e161161daf7349be304e05d5bb959f891
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 5a7423aa48f8..40c48236f6d1 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -221,7 +221,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; |