diff options
| author | Andras Timar <andras.timar@collabora.com> | 2014-01-12 11:04:41 -0800 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-08-23 05:47:14 -0700 |
| commit | 3a12769091a03341257b5b36567ae9890420875d (patch) | |
| tree | 5646e402e9ae106cadaf157464bba5ff4d18bb4a /solenv | |
| parent | b66c3f05933329a3cafadf11103f22e6fe751d2a (diff) | |
fixes related to MSP digital signature
Change-Id: I06bcf0d2cc8c4915eff3658905087be6a2eadca6
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer.pm | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/windows/msp.pm | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm index 237947d43631..6957a669ea3e 100644 --- a/solenv/bin/modules/installer.pm +++ b/solenv/bin/modules/installer.pm @@ -1651,7 +1651,7 @@ sub run { if ( $allvariableshashref->{'OOODOWNLOADNAME'} ) { $$downloadname = installer::download::set_download_filename($languagestringref, $allvariableshashref); } else { $$downloadname = installer::download::resolve_variables_in_downloadname($allvariableshashref, $$downloadname, $languagestringref); } installer::systemactions::rename_one_file( $finalinstalldir . $installer::globals::separator . $installer::globals::shortmsidatabasename, $finalinstalldir . $installer::globals::separator . $$downloadname . ".msi" ); - if ( defined($ENV{'WINDOWS_BUILD_SIGNING'}) && ($ENV{'WINDOWS_BUILD_SIGNING'} eq 'TRUE') ) + if ( defined($ENV{'WINDOWS_BUILD_SIGNING'}) && ($ENV{'WINDOWS_BUILD_SIGNING'} eq 'TRUE') && ( $allvariableshashref->{'CREATE_MSP_INSTALLSET'} eq '0')) { my $systemcall = "signtool.exe sign "; if ( defined($ENV{'PFXFILE'}) ) { $systemcall .= "-f $ENV{'PFXFILE'} "; } diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm index 944155978d09..01052fca99cc 100644 --- a/solenv/bin/modules/installer/windows/msp.pm +++ b/solenv/bin/modules/installer/windows/msp.pm @@ -1194,12 +1194,14 @@ sub create_msp_patch # Sign .msp file if ( defined($ENV{'WINDOWS_BUILD_SIGNING'}) && ($ENV{'WINDOWS_BUILD_SIGNING'} eq 'TRUE') ) { + my $localmspfilename = $mspfilename; + $localmspfilename =~ s/\\/\\\\/g; my $systemcall = "signtool.exe sign "; if ( defined($ENV{'PFXFILE'}) ) { $systemcall .= "-f $ENV{'PFXFILE'} "; } if ( defined($ENV{'PFXPASSWORD'}) ) { $systemcall .= "-p $ENV{'PFXPASSWORD'} "; } if ( defined($ENV{'TIMESTAMPURL'}) ) { $systemcall .= "-t $ENV{'TIMESTAMPURL'} "; } else { $systemcall .= "-t http://timestamp.globalsign.com/scripts/timestamp.dll "; } $systemcall .= "-d \"" . $allvariables->{'PRODUCTNAME'} . " " . $allvariables->{'PRODUCTVERSION'} . " Patch " . $allvariables->{'WINDOWSPATCHLEVEL'} . "\" "; - $systemcall .= $mspfilename; + $systemcall .= $localmspfilename; installer::logger::print_message( "... code signing and timestamping with signtool.exe ...\n" ); my $returnvalue = system($systemcall); |