configure.ac | 4 ++--
instsetoo_native/util/openoffice.lst.in | 2 +-
setup_native/source/packinfo/finals_instsetoo.txt | 1 +
solenv/bin/modules/installer.pm | 2 +-
solenv/bin/modules/installer/globals.pm | 2 +-
solenv/bin/modules/installer/windows/msp.pm | 4 +++-
6 files changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 843cc47f8b983baebb94fb4627763fbeb4be4173
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sun Jan 12 13:43:56 2014 -0800
Bump version to 4.1-4
Change-Id: I538e6006794ef69c8009845e3206212e160c7a6f
diff --git a/configure.ac b/configure.ac
index a2f03da..4432d37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice],[4.1.10.3],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.1.10.4],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
save_CC=$CC
commit 4944ecae46d7a6ac071d323ab706033d7dbea8af
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sun Jan 12 13:01:18 2014 -0800
change PYTHON_VERSION back to old value
because MSP patch cannot rename directories, and MSP installed over
the older base would result in immediate crash if Python cannot find
its libs. Version number is hard coded in PYTHONPATH.
Change-Id: Ib90ba3ab6f19a89f1ab2ae6fbc0aad9365d3645d
diff --git a/configure.ac b/configure.ac
index 0788024..a2f03da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7572,7 +7572,7 @@ internal)
SYSTEM_PYTHON=NO
PYTHON_VERSION_MAJOR=3
PYTHON_VERSION_MINOR=3
- PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.3
+ PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.0
BUILD_TYPE="$BUILD_TYPE PYTHON"
# Embedded Python dies without Home set
if test "$HOME" = ""; then
commit 4ff025fc8455e7d74224954facc05dbe2cbf2571
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 614df9a..8a06414 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -1670,7 +1670,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 7c7fcb9..bdb3367 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -1208,12 +1208,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 f80fadd7cac3ba4db5a126b52caa3e7dcbef47da
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sun Jan 12 13:41:18 2014 -0800
enable MSP creation
Change-Id: I3d28cae66d8658505e2339d22304c1b3852fbb43
diff --git a/instsetoo_native/util/openoffice.lst.in
b/instsetoo_native/util/openoffice.lst.in
index 8083d56..58ea4fc 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -26,7 +26,7 @@ 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 @LIBO_VERSION_PATCH@
diff --git a/setup_native/source/packinfo/finals_instsetoo.txt
b/setup_native/source/packinfo/finals_instsetoo.txt
index d5a68d36..78260c6 100644
--- a/setup_native/source/packinfo/finals_instsetoo.txt
+++ b/setup_native/source/packinfo/finals_instsetoo.txt
@@ -30,3 +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,ar,as,ast,bg,bn-IN,br,ca,ca-XV,cy,cs,da,de,el,en-GB,es,et,eu,fi,fr,ga,gd,gl,gu,he,hi,hr,hu,id,is,it,ja,km,kn,ko,lt,lv,ml,mr,nb,nl,nn,oc,or,pa-IN,pl,pt,pt-BR,ro,ru,sh,sk,sl,sr,sv,ta,te,tr,uk,vi,zh-CN,zh-TW
c:\lo\src\cp-4.1-3\LibreOffice_4.1-3_Win_x86.msi
diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
index b3088c8..94e6912 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 = 1;
+ $include_cab_in_msi = 0;
$msidatabasename = "";
$prepare_winpatch = 0;
$previous_idt_dir = "";
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
