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
