[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/bin

[Stephan Bergmann]

 config_host.mk.in                                 |    1 +
 configure.ac                                      |   12 ++++++++++++
 solenv/bin/modules/installer/windows/msiglobal.pm |    6 +++---
 3 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit 08337321e655a3b4991c895de98d96858e60d863
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jun 18 13:58:49 2013 +0200

    Let WINDOWS_SDK_WILANGID override the location of WiLangId.vbs
    
    ...see new TODO comment in configure.ac
    
    Change-Id: Id3ffd45357a3f539f3d3f068528019334d929654

diff --git a/config_host.mk.in b/config_host.mk.in
index 3a10c3b..9363263 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -542,6 +542,7 @@ export WGET=@WGET@
 export WINDOWS_BUILD_SIGNING=@WINDOWS_BUILD_SIGNING@
 export WINDOWS_SDK_HOME=@WINDOWS_SDK_HOME@
 export WINDOWS_SDK_VERSION=@WINDOWS_SDK_VERSION@
+export WINDOWS_SDK_WILANGID=@WINDOWS_SDK_WILANGID@
 export WINDRES=@WINDRES@
 export WINEGCC=@WINEGCC@
 export WITHOUT_AFMS=@WITHOUT_AFMS@
diff --git a/configure.ac b/configure.ac
index 4efc4f9..0596eb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9066,9 +9066,21 @@ the  Windows SDK are installed.])
             SOLARINC="$SOLARINC -I$WINDOWS_SDK_HOME/include/um -I$WINDOWS_SDK_HOME/include/shared"
         fi
     fi
+
+    dnl TODO: solenv/bin/modules/installer/windows/msiglobal.pm wants to use a
+    dnl WiLangId.vbs that is included only in some SDKs (e.g., included in v7.1
+    dnl but not in v8.0), so allow this to be overriden with a
+    dnl WINDOWS_SDK_WILANGID for now; a full-blown --with-windows-sdk-wilangid
+    dnl and configuration error if no WiLangId.vbs is found would arguably be
+    dnl better, but I do not know under which conditions exactly it is needed by
+    dnl msiglobal.pm:
+    if test -z "$WINDOWS_SDK_WILANGID" -a -n "$WINDOWS_SDK_HOME"; then
+        WINDOWS_SDK_WILANGID=$WINDOWS_SDK_HOME/Samples/sysmgmt/msi/scripts/WiLangId.vbs
+    fi
 fi
 AC_SUBST(WINDOWS_SDK_HOME)
 AC_SUBST(WINDOWS_SDK_VERSION)
+AC_SUBST(WINDOWS_SDK_WILANGID)
 
 dnl =========================================
 dnl Check for uuidgen
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index 15c084c..7a7a121 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