diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-06-18 13:58:49 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-06-18 13:58:49 +0200 |
| commit | 08337321e655a3b4991c895de98d96858e60d863 (patch) | |
| tree | 10115b317e6277414e3777530d9c652483dd31f4 /solenv | |
| parent | 4a0247603e94412c1a77af8e8c7bd17f729b9eba (diff) | |
Let WINDOWS_SDK_WILANGID override the location of WiLangId.vbs
...see new TODO comment in configure.ac
Change-Id: Id3ffd45357a3f539f3d3f068528019334d929654
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/windows/msiglobal.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm index 15c084c6f207..7a7a121b8de0 100644 --- a/solenv/bin/modules/installer/windows/msiglobal.pm +++ b/solenv/bin/modules/installer/windows/msiglobal.pm @@ -675,7 +675,7 @@ sub create_transforms $infoline = "ERROR: We cannot create transformations yet (we cannot use cscript.exe when cross-compiling)\n"; push( @installer::globals::logfileinfo, $infoline); } - my $wilangid = $ENV{WINDOWS_SDK_HOME} . "/Samples/SysMgmt/Msi/scripts/WiLangId.vbs"; + my $wilangid = $ENV{WINDOWS_SDK_WILANGID}; my $from = cwd(); @@ -827,7 +827,7 @@ sub create_transforms } } - $systemcall = "TEMP=$ENV{'TMPDIR'} $cscript $wilangid $basedbname Package $templatevalue"; + $systemcall = "TEMP=$ENV{'TMPDIR'} $cscript \"$wilangid\" $basedbname Package $templatevalue"; $returnvalue = system($systemcall); @@ -836,7 +836,7 @@ sub create_transforms if ($returnvalue) { - $infoline = "ERROR: Could not execute WiLangId.vbs!\n"; + $infoline = "ERROR: $returnvalue from $systemcall\n"; push( @installer::globals::logfileinfo, $infoline); } else |