mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Win build: Set default script engine for cscript

Browse Source 
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@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
This commit is contained in:
Armin Le Grand
2016-01-22 16:57:17 +01:00
committed by Thorsten Behrens
parent 3fc292f7b3
commit 7d69efd06d
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
external/libxml2/ExternalProject_xml2.mk vendored
View File

@@ -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 \

2
external/libxmlsec/ExternalProject_xmlsec.mk vendored
View File

@@ -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 \

2
external/libxslt/ExternalProject_xslt.mk vendored
View File

@@ -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 \

2
odk/config/setsdkenv_windows.bat
View File

@@ -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
)