instsetoo_native/util/openoffice.lst.in | 2 --
solenv/bin/modules/installer.pm | 2 +-
solenv/bin/modules/installer/windows/msp.pm | 15 ++++++---------
solenv/bin/modules/installer/windows/update.pm | 6 +++---
4 files changed, 10 insertions(+), 15 deletions(-)
New commits:
commit f74a6338b3897df49f3041e7ce33453eaba9e2e5
Author: Andras Timar <andras.ti...@collabora.com>
Date: Mon Jan 13 00:26:17 2014 -0800
MSP patchsequence fix
Change-Id: Iaf4a6e5eb8291d78835a391894ba1b1cc675390a
diff --git a/solenv/bin/modules/installer/windows/msp.pm
b/solenv/bin/modules/installer/windows/msp.pm
index 01052fc..1bbeea8 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -877,19 +877,14 @@ sub get_patchsequence
my $packageversion = $allvariables->{'PACKAGEVERSION'};
- if ( $packageversion =~ /^\s*(\d+)\.(\d+)\.(\d+)\s*$/ )
+ if ( $packageversion =~ /^\s*(\d+)\.(\d+)\.(\d+)\.(\d+)\s*$/ )
{
my $major = $1;
my $minor = $2;
my $micro = $3;
- my $concat = 100 * $minor + $micro;
- $packageversion = $major . "\." . $concat;
+ my $patch = $4;
+ $patchsequence = $major . "\." . $minor . "\." . $micro . "\." .
$patch;
}
- my $vendornumber = 0;
- if ( $allvariables->{'VENDORPATCHVERSION'} ) { $vendornumber =
$allvariables->{'VENDORPATCHVERSION'}; }
- $patchsequence = $packageversion . "\." . $installer::globals::buildid .
"\." . $vendornumber;
-
- if ( $allvariables->{'PATCHSEQUENCE'} ) { $patchsequence =
$allvariables->{'PATCHSEQUENCE'}; }
return $patchsequence;
}
commit 557cfd3bb1e9eb2792b0aa3831ad107d52ed9909
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sun Jan 12 11:04:41 2014 -0800
fixes related to MSP digital signature
Change-Id: I06bcf0d2cc8c4915eff3658905087be6a2eadca6
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index ab8406f..487bba8 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 9441559..01052fc 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);
commit 4f4bd6c852e2daac9ee30957538cf796f9f8e989
Author: Andras Timar <andras.ti...@collabora.com>
Date: Fri Aug 22 06:41:57 2014 -0700
use MSM directly from MSVC dir
Change-Id: I62ebf7f7bc10a81a3949b0aad6e6353619ef6b22
diff --git a/solenv/bin/modules/installer/windows/update.pm
b/solenv/bin/modules/installer/windows/update.pm
index d49625a..0edaaf2 100644
--- a/solenv/bin/modules/installer/windows/update.pm
+++ b/solenv/bin/modules/installer/windows/update.pm
@@ -423,10 +423,10 @@ sub readmergedatabase
foreach my $mergemodule ( @{$mergemodules} )
{
my $filename = $mergemodule->{'Name'};
- my $mergefile =
installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename,
$includepatharrayref, 1);
+ my $mergefile = $ENV{'MSM_PATH'} . $filename;
- if ( $$mergefile eq "" ) { installer::exiter::exit_program("ERROR: msm
file not found: $filename !", "readmergedatabase"); }
- my $completesource = $$mergefile;
+ if ( ! -f $mergefile ) { installer::exiter::exit_program("ERROR: msm
file not found: $filename !", "readmergedatabase"); }
+ my $completesource = $mergefile;
my $mergegid = $mergemodule->{'gid'};
my $workdir = $mergemoduledir . $installer::globals::separator .
$mergegid;
commit 29c4a88e01b6892f097c6c1e34649e7011b95fe9
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sat Aug 23 03:48:56 2014 -0700
Revert "--with-lang=ALL build exceeds maximum # of files in CAB"
This reverts commit 3bfac473a1b1dfb2210ec07245e649697679bd83.
With Matus Kukan's work, which packs .ui files into .zip archives,
file count is reduced dramatically. Multiple .cab files won't be a
problem in theory, but unfortunately both .cab files had the same
disk id 'DISK1' and it caused problems with MSP patch generation.
diff --git a/instsetoo_native/util/openoffice.lst.in
b/instsetoo_native/util/openoffice.lst.in
index 0e323a7..0b2344d 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -71,7 +71,6 @@ LibreOffice
STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
STARTCENTER_HIDE_EXTERNAL_LINKS 0
- CABFILENUMBER 2
}
active 1
compression 5
@@ -125,7 +124,6 @@ LibreOffice_Dev
STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
STARTCENTER_HIDE_EXTERNAL_LINKS 0
- CABFILENUMBER 2
}
active 1
compression 5
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
