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
