From 7d69efd06dd1a1fee28c117e5ab79e557056f82c Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Fri, 22 Jan 2016 16:57:17 +0100 Subject: 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 Tested-by: Thorsten Behrens --- odk/config/setsdkenv_windows.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'odk') diff --git a/odk/config/setsdkenv_windows.bat b/odk/config/setsdkenv_windows.bat index a7b007926953..e6d1335ad77b 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 ) -- cgit