diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-01-20 16:12:13 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-01-20 16:15:17 +0100 |
| commit | 490301650899abec73128258569e0dffdc52d7c9 (patch) | |
| tree | e7a06f7a126c5ef33658e4db374396f1f809222c /solenv | |
| parent | cleanup: privatise SvStream's LockFile impl. and in-line Redirector bits (diff) | |
| download | core-490301650899abec73128258569e0dffdc52d7c9.tar.gz core-490301650899abec73128258569e0dffdc52d7c9.zip | |
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.
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/windows/msiglobal.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm index a097780ba7da..f7185d3d5cf0 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); |