Kaydet (Commit) 5d2f2783 authored tarafından Andras Timar's avatar Andras Timar

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.
üst 1df43525
...@@ -982,14 +982,11 @@ sub create_transforms ...@@ -982,14 +982,11 @@ sub create_transforms
my $msitran = "msitran.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 $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 $from = cwd();
my $architecture = "Intel"; my $templatevalue = "1033";
if (( $allvariableshashref->{'64BITPRODUCT'} ) && ( $allvariableshashref->{'64BITPRODUCT'} == 1 )) { $architecture = "x64"; }
my $templatevalue = "\"" . $architecture . ";1033";
$installdir = installer::converter::make_path_conform($installdir); $installdir = installer::converter::make_path_conform($installdir);
...@@ -1124,8 +1121,7 @@ sub create_transforms ...@@ -1124,8 +1121,7 @@ sub create_transforms
} }
} }
$templatevalue = $templatevalue . "\""; # adding ending '"' $systemcall = "cscript.exe " . $wilangid . " " . $basedbname . " Package " . $templatevalue;
$systemcall = $msiinfo . " " . $basedbname . " -p " . $templatevalue;
$returnvalue = system($systemcall); $returnvalue = system($systemcall);
...@@ -1134,12 +1130,12 @@ sub create_transforms ...@@ -1134,12 +1130,12 @@ sub create_transforms
if ($returnvalue) if ($returnvalue)
{ {
$infoline = "ERROR: Could not execute $msiinfo!\n"; $infoline = "ERROR: Could not execute WiLangId.vbs!\n";
push( @installer::globals::logfileinfo, $infoline); push( @installer::globals::logfileinfo, $infoline);
} }
else else
{ {
$infoline = "Success: Executed $msiinfo successfully!\n"; $infoline = "Success: Executed WiLangId.vbs successfully!\n";
push( @installer::globals::logfileinfo, $infoline); push( @installer::globals::logfileinfo, $infoline);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment