[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/bin
solenv/bin/modules/installer/windows/property.pm |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6e83ae5b4cb52845231489d2f0d9bc380f0522be
Author: Andras Timar ati...@suse.com
Date: Wed Apr 11 16:01:06 2012 +0200
set correct value of FINDPRODUCT property
(cherry picked from commit ee7084c4f720c932df67c8ff033dab4d8d556179)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/solenv/bin/modules/installer/windows/property.pm
b/solenv/bin/modules/installer/windows/property.pm
index 1e6e921..7113a01 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -256,9 +256,9 @@ sub set_important_properties
push(@{$propertyfile}, $onepropertyline);
}
-if (( $allvariables-{'PRODUCTNAME'} ) (
$allvariables-{'PRODUCTVERSION'} ) ( $allvariables-{'MANUFACTURER'} ) (
$allvariables-{'PRODUCTCODE'} ))
+if (( $allvariables-{'PRODUCTNAME'} ) (
$allvariables-{'PRODUCTVERSION'} ) ( $allvariables-{'REGISTRYLAYERNAME'} ))
{
-my $onepropertyline = FINDPRODUCT . \t . Software\\ .
$allvariables-{'MANUFACTURER'} . \\ . $allvariables-{'PRODUCTNAME'} .
$allvariables-{'PRODUCTADDON'} . \\ . $allvariables-{'PRODUCTVERSION'} .
\\ . $allvariables-{'PRODUCTCODE'} . \n;
+my $onepropertyline = FINDPRODUCT . \t . Software\\LibreOffice .
\\ . $allvariables-{'REGISTRYLAYERNAME'} . \\ .
$allvariables-{'PRODUCTNAME'} . \\ . $allvariables-{'PRODUCTVERSION'} .
\n;
push(@{$propertyfile}, $onepropertyline);
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/bin
solenv/bin/modules/installer/scriptitems.pm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9abb0b6bbe2de65988065f78354ccf5ebde4a7ae
Author: Miklos Vajna vmik...@frugalware.org
Date: Thu Jan 26 17:27:03 2012 +0100
solenv: handle error code from ./g
This avoids Cannot find the git binary! Is git installed and is in
PATH? strings in the about dialog when building from a tarball.
(cherry picked from commit 439e5279c5d334f849a6ab7b51bad1bb12f13aae)
Conflicts:
solenv/bin/modules/installer/scriptitems.pm
diff --git a/solenv/bin/modules/installer/scriptitems.pm
b/solenv/bin/modules/installer/scriptitems.pm
index bb8fe55..fb5c9c4 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -816,7 +816,7 @@ sub replace_setup_variables
if ( $localbuild =~ /^\s*(\w+?)(\d+)\s*$/ ) { $localbuild = $2; } #
using 680 instead of src680
my $buildidstring = `$ENV{'SRC_ROOT'}/g -s log -n 1 --pretty=format:%h-`;
-if (!$buildidstring) {
+if ($? || !$buildidstring) {
$buildidstring = $localbuild . $localminor . (Build: .
$installer::globals::buildid . );
}
else {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/bin
solenv/bin/modules/installer/windows/msiglobal.pm | 14 +-
1 file changed, 5 insertions(+), 9 deletions(-)
New commits:
commit ccc8753d7fc573db29159ab21492b8939f0ddab8
Author: Andras Timar ati...@suse.com
Date: Thu Jan 19 23:22:38 2012 +0100
fdo#44915 MSI installer l10n bug
Unfortunately msiinfo.exe has a limitation, it truncates Language
property in Summary Information at char position 254.
The replacement, WiLangId.vbs does not have this limitation.
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 43e6ee3..a743b45 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -982,14 +982,11 @@ sub create_transforms
my $msitran = msitran.exe;# Has to be in the path
my $msidb = msidb.exe;# Has to be in the path
-my $msiinfo = msiinfo.exe;# Has to be in the path
+my $wilangid = $ENV{WINDOWS_SDK_HOME} .
/Samples/SysMgmt/Msi/scripts/WiLangId.vbs;
my $from = cwd();
-my $architecture = Intel;
-if (( $allvariableshashref-{'64BITPRODUCT'} ) (
$allvariableshashref-{'64BITPRODUCT'} == 1 )) { $architecture = x64; }
-
-my $templatevalue = \ . $architecture . ;1033;
+my $templatevalue = 1033;
$installdir = installer::converter::make_path_conform($installdir);
@@ -1124,8 +1121,7 @@ sub create_transforms
}
}
-$templatevalue = $templatevalue . \; # adding
ending ''
-$systemcall = $msiinfo . . $basedbname . -p . $templatevalue;
+$systemcall = cscript.exe . $wilangid . . $basedbname . Package
. $templatevalue;
$returnvalue = system($systemcall);
@@ -1134,12 +1130,12 @@ sub create_transforms
if ($returnvalue)
{
-$infoline = ERROR: Could not execute $msiinfo!\n;
+$infoline = ERROR: Could not execute WiLangId.vbs!\n;
push( @installer::globals::logfileinfo, $infoline);
}
else
{
-$infoline = Success: Executed $msiinfo successfully!\n;
+$infoline = Success: Executed WiLangId.vbs successfully!\n;
push( @installer::globals::logfileinfo, $infoline);
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/bin
solenv/bin/modules/installer/windows/msiglobal.pm |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit a4bd804fd95a4a79ec4ebb64555aade5bea63a14
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Jan 20 16:12:13 2012 +0100
Fix WiLangId.vbs operation
The script needs %TEMP% to be set in order to work properly.
Cygwin unsets TEMP which causes WiLangId.vbs to fail. Set the
TEMP variable to $TMPDIR before we call the cscript.exe.
Signed-off-by: Michael Meeks mme...@suse.com
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index a743b45..96c9606 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -980,8 +980,10 @@ sub create_transforms
installer::logger::include_header_into_logfile(Creating Transforms);
+my $cscript = cscript.exe;# Has to be in the path
my $msitran = msitran.exe;# Has to be in the path
my $msidb = msidb.exe;# Has to be in the path
+my $tmpdir = $ENV{TMPDIR};# Variable %TEMP% will be set to it for
WiLangId.vbs to work
my $wilangid = $ENV{WINDOWS_SDK_HOME} .
/Samples/SysMgmt/Msi/scripts/WiLangId.vbs;
my $from = cwd();
@@ -1121,7 +1123,7 @@ sub create_transforms
}
}
-$systemcall = cscript.exe . $wilangid . . $basedbname . Package
. $templatevalue;
+$systemcall = TEMP= . $tmpdir . . $cscript . . $wilangid . .
$basedbname . Package . $templatevalue;
$returnvalue = system($systemcall);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/bin
solenv/bin/modules/installer/download.pm |1 -
1 file changed, 1 deletion(-)
New commits:
commit 3b5aa17f83643d09dc7300f06dd191f4bb26f23e
Author: Petr Mladek pmla...@suse.cz
Date: Wed Dec 21 16:36:09 2011 +0100
do not use ABOUTBOXPRODUCTVERSIONSUFFIX in download name
I did not read the code carfully enough when added this line few days ago.
diff --git a/solenv/bin/modules/installer/download.pm
b/solenv/bin/modules/installer/download.pm
index bc6ac27..5f186b7 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -425,7 +425,6 @@ sub get_download_version
$version = $allvariables-{'PRODUCTVERSION'};
if (( $allvariables-{'ABOUTBOXPRODUCTVERSION'} ) (
$allvariables-{'ABOUTBOXPRODUCTVERSION'} ne )) { $version =
$allvariables-{'ABOUTBOXPRODUCTVERSION'}; }
-if (( $allvariables-{'ABOUTBOXPRODUCTVERSIONSUFFIX'} ) (
$allvariables-{'ABOUTBOXPRODUCTVERSIONSUFFIX'} ne )) { $version =
$allvariables-{'ABOUTBOXPRODUCTVERSIONSUFFIX'}; }
if (( $allvariables-{'SHORT_PRODUCTEXTENSION'} ) (
$allvariables-{'SHORT_PRODUCTEXTENSION'} ne )) { $version = $version .
$allvariables-{'SHORT_PRODUCTEXTENSION'}; }
return $version;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/bin
solenv/bin/modules/installer/windows/msiglobal.pm | 20 ++--
1 file changed, 2 insertions(+), 18 deletions(-)
New commits:
commit fb8c93b5aa90501bf33dffe075390cc7f1e71c22
Author: Andras Timar ati...@suse.com
Date: Sat Dec 10 22:10:35 2011 +0100
use PACKAGEVERSION as the base of MSI ProductVersion
Formerly PRODUCTVERSION was used but that did not contain
the microversion digit. It is better to have it in MSI
ProductVersion, because a higher build number of a lower
microversion looked newer from the MSI point of view, and
update failed.
MSI ProductVersion is now major.minor.micro.build, e.g.
3.6.1.1206 (build number is taken from minor.mk)
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index a90698a..43e6ee3 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1805,27 +1805,11 @@ sub set_msiproductversion
{
my ( $allvariables ) = @_;
-my $productversion = $allvariables-{'PRODUCTVERSION'};
-
-if (( $productversion =~ /^\s*\d+\s*$/ ) ( $productversion 255 )) {
$productversion = $productversion%256; }
+my $productversion = $allvariables-{'PACKAGEVERSION'};
if ( $productversion =~ /^\s*(\d+)\.(\d+)\.(\d+)\s*$/ )
{
-$productversion = $1 . \. . $2 . $3 . \. .
$installer::globals::buildid;
-}
-elsif ( $productversion =~ /^\s*(\d+)\.(\d+)\s*$/ )
-{
-$productversion = $1 . \. . $2 . \. . $installer::globals::buildid;
-}
-else
-{
-my $productminor = 00;
-if (( $allvariables-{'PACKAGEVERSION'} ) (
$allvariables-{'PACKAGEVERSION'} ne ))
-{
-if ( $allvariables-{'PACKAGEVERSION'} =~
/^\s*(\d+)\.(\d+)\.(\d+)\s*$/ ) { $productminor = $2; }
-}
-
-$productversion = $productversion . \. . $productminor . \. .
$installer::globals::buildid;
+$productversion = $1 . \. . $2 . \. . $3 . \. .
$installer::globals::buildid;
}
$installer::globals::msiproductversion = $productversion;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
