[Libreoffice-commits] core.git: external/libxml2 external/libxmlsec external/libxslt odk/config

[Armin Le Grand]

 external/libxml2/ExternalProject_xml2.mk     |    2 +-
 external/libxmlsec/ExternalProject_xmlsec.mk |    2 +-
 external/libxslt/ExternalProject_xslt.mk     |    2 +-
 odk/config/setsdkenv_windows.bat             |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 7d69efd06dd1a1fee28c117e5ab79e557056f82c
Author: Armin Le Grand <Armin.Le.Grand at cib.de>
Date:   Fri Jan 22 16:57:17 2016 +0100

    Win build: Set default script engine for cscript
    
    When Windows build is executed, cscript is used to execute JavaScript files.
    This uses cscript from the system to execute *.js files. cscript is not
    only capable of executing JavaScript, but also VBScript. Which engine to
    run is usually determined by the file extension, except when any installed
    program has added a registered association to the used file type. In that
    case, the execution of cscript and thus the build fails. This can be prevented
    by directly defining the script engine when calling cscript, using the
    /e:javascript parameter for *.js targets.
    
    Change-Id: If717b8ae5335acbe4f11c269d3c98a7247a135e6
    Reviewed-on: https://gerrit.libreoffice.org/21717
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/external/libxml2/ExternalProject_xml2.mk b/external/libxml2/ExternalProject_xml2.mk
index f19cb52..dc3ab2f 100644
--- a/external/libxml2/ExternalProject_xml2.mk
+++ b/external/libxml2/ExternalProject_xml2.mk
@@ -32,7 +32,7 @@ $(call gb_ExternalProject_use_external_project,xml2,icu)
 
 $(call gb_ExternalProject_get_state_target,xml2,build):
 	$(call gb_ExternalProject_run,build,\
-		cscript configure.js \
+		cscript /e:javascript configure.js \
 			iconv=no icu=yes sax1=yes $(if $(MSVC_USE_DEBUG_RUNTIME),run_debug=yes cruntime=/MDd) \
 		&& unset MAKEFLAGS \
 		&& LIB="$(ILIB)" nmake \
diff --git a/external/libxmlsec/ExternalProject_xmlsec.mk b/external/libxmlsec/ExternalProject_xmlsec.mk
index 781f22f..a22b426 100644
--- a/external/libxmlsec/ExternalProject_xmlsec.mk
+++ b/external/libxmlsec/ExternalProject_xmlsec.mk
@@ -38,7 +38,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) :
 else
 $(call gb_ExternalProject_get_state_target,xmlsec,build) :
 	$(call gb_ExternalProject_run,build,\
-		cscript configure.js crypto=mscrypto xslt=no iconv=no static=no \
+		cscript /e:javascript configure.js crypto=mscrypto xslt=no iconv=no static=no \
 			lib=$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc \
 			$(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \
 		&& unset MAKEFLAGS \
diff --git a/external/libxslt/ExternalProject_xslt.mk b/external/libxslt/ExternalProject_xslt.mk
index 8da20a1..af19e84 100644
--- a/external/libxslt/ExternalProject_xslt.mk
+++ b/external/libxslt/ExternalProject_xslt.mk
@@ -30,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,xslt,build):
 else # COM=MSC
 $(call gb_ExternalProject_get_state_target,xslt,build):
 	$(call gb_ExternalProject_run,build,\
-		cscript configure.js \
+		cscript /e:javascript configure.js \
 			$(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \
 			vcmanifest=yes \
 			lib=$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc \
diff --git a/odk/config/setsdkenv_windows.bat b/odk/config/setsdkenv_windows.bat
index a7b0079..e6d1335 100755
--- a/odk/config/setsdkenv_windows.bat
+++ b/odk/config/setsdkenv_windows.bat
@@ -57,7 +57,7 @@ if not exist "%OO_USER_SDKENV_SCRIPT%". (
    echo  ******************************************************************
    echo.
 
-   cscript //I //Nologo "%SDK_DIR%\cfgWin.js"
+   cscript //e:javascript //I //Nologo "%SDK_DIR%\cfgWin.js"
    goto setenv
 )