instsetoo_native/util/openoffice.lst | 26 +++++++++++-----------
setup_native/source/packinfo/finals_instsetoo.txt | 2 -
solenv/bin/modules/installer.pm | 2 -
solenv/bin/modules/installer/globals.pm | 2 -
solenv/bin/modules/installer/windows/msp.pm | 4 ++-
solenv/inc/minor.mk | 6 ++---
6 files changed, 22 insertions(+), 20 deletions(-)
New commits:
commit 845322cec73b84262375446436e65298c7fada7b
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 00f1c51..3fe1485 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -1741,7 +1741,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 e321745..a19420b 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -1217,12 +1217,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 a120424f2b801f25df29d49c047f6b5fa2fb8291
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sun Jan 12 00:35:18 2014 -0800
enable MSP creation and bump version number for 1st PTF
Change-Id: I69268d78c13299ddba6867dc599295ef9dcd3fe3
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 25672e0..18f1728 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -30,10 +30,10 @@ Globals
REGISTRYLAYERNAME Layers
SERVICEPACK 1
UPDATE_DATABASE 1
- CREATE_MSP_INSTALLSET 0
+ CREATE_MSP_INSTALLSET 1
UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
PACKAGEMAP package_names.txt,package_names_ext.txt
- WINDOWSPATCHLEVEL 20
+ WINDOWSPATCHLEVEL 21
OOOVENDOR The Document Foundation
OOODOWNLOADNAME 1
BUILDIDCWS {buildidcws}
@@ -50,13 +50,13 @@ LibreOffice
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
- PRODUCTEXTENSION -20
+ PRODUCTEXTENSION -21
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION 4.0
- ABOUTBOXPRODUCTVERSIONSUFFIX :build-320
+ ABOUTBOXPRODUCTVERSIONSUFFIX :build-321
BASEPRODUCTVERSION 4.0
PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
@@ -100,14 +100,14 @@ LibreOffice_Dev
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
- PRODUCTEXTENSION -20
+ PRODUCTEXTENSION -21
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION 4.0
- ABOUTBOXPRODUCTVERSIONSUFFIX :build-320
+ ABOUTBOXPRODUCTVERSIONSUFFIX :build-321
BASEPRODUCTVERSION 4.0
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
@@ -161,7 +161,7 @@ URE
PRODUCTVERSION 4.0
PACKAGEVERSION 4.0
PACKAGEREVISION 1
- PRODUCTEXTENSION -20
+ PRODUCTEXTENSION -21
BRANDPACKAGEVERSION 4.0
LICENSENAME LGPL
NOVERSIONINDIRNAME 1
@@ -192,7 +192,7 @@ LibreOffice_SDK
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
- PRODUCTEXTENSION -20
+ PRODUCTEXTENSION -21
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4.0
@@ -231,7 +231,7 @@ LibreOffice_Dev_SDK
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
- PRODUCTEXTENSION -20
+ PRODUCTEXTENSION -21
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
@@ -276,7 +276,7 @@ LibreOffice_Test
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
- PRODUCTEXTENSION -20
+ PRODUCTEXTENSION -21
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 4.0
@@ -315,7 +315,7 @@ LibreOffice_Dev_Test
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
- PRODUCTEXTENSION -20
+ PRODUCTEXTENSION -21
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
@@ -359,13 +359,13 @@ OxygenOffice
{
PRODUCTNAME OxygenOffice
PRODUCTVERSION 4.0
- PRODUCTEXTENSION -20
+ PRODUCTEXTENSION -21
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION 4.0
- ABOUTBOXPRODUCTVERSIONSUFFIX :build-320
+ ABOUTBOXPRODUCTVERSIONSUFFIX :build-321
BASEPRODUCTVERSION 4.0
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
diff --git a/setup_native/source/packinfo/finals_instsetoo.txt
b/setup_native/source/packinfo/finals_instsetoo.txt
index 6e5597b..fd4e6e2 100644
--- a/setup_native/source/packinfo/finals_instsetoo.txt
+++ b/setup_native/source/packinfo/finals_instsetoo.txt
@@ -30,4 +30,4 @@
# 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
-# LibreOffice pro
en-US,af,ar,bn,ca,cs,da,de,el,en-GB,en-ZA,es,fi,fr,gu,he,hi,hu,it,ja,ko,mr,nb,nl,nn,pl,pt,pt-BR,ru,sk,sl,sv,ta,tr,xh,zh-CN,zh-TW,zu
c:\lo\src\suse-4.0-5\LibreOffice_4.0-5.msi
+LibreOffice pro
en-US,af,ar,bn,ca,cs,da,de,el,en-GB,en-ZA,es,fi,fr,gu,he,hi,hu,it,ja,ko,mr,nb,nl,nn,pl,pt,pt-BR,ru,sk,sl,sv,ta,tr,xh,zh-CN,zh-TW,zu
c:\lo\src\cp-4.0-20\LibreOffice_4.0-20_Win_x86.msi
diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
index 8cf519d..5687b43 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -230,7 +230,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/inc/minor.mk b/solenv/inc/minor.mk
index 9073bee..2d69399 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
RSCVERSION=400
-RSCREVISION=400m1(Build:320)
-BUILD=320
+RSCREVISION=400m1(Build:321)
+BUILD=321
LAST_MINOR=m0
SOURCEVERSION=OOO400
@@ -8,4 +8,4 @@ VERSIONMAJOR=4
VERSIONMINOR=0
VERSIONMICRO=10
-COPYRIGHTYEARRANGE=2000-2013
+COPYRIGHTYEARRANGE=2000-2014
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
