From f23a45bc20116d2f718b4da4bacdb764ae134dc1 Mon Sep 17 00:00:00 2001 From: Andrii Kurdiumov Date: Sat, 24 Aug 2019 19:32:50 +0600 Subject: [PATCH] Make build work inside CI when by using delayed variable expansion This was created in response to my struggle to close #898 --- GPL/nativeBuildProperties.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/GPL/nativeBuildProperties.gradle b/GPL/nativeBuildProperties.gradle index 1b70a513ee..2a4db4e6d8 100644 --- a/GPL/nativeBuildProperties.gradle +++ b/GPL/nativeBuildProperties.gradle @@ -76,10 +76,10 @@ task CheckToolChain { project.ext.WINVER = "0x0601" // Rely on vcvars script to supply SDK versions - def COMMAND = "cmd /c ${VISUAL_STUDIO_VCVARS_CMD} > nul && cmd /c echo" - project.ext.MSVC_SDK_VERSION = "${COMMAND} %WINDOWSSDKVERSION%".execute().text.trim().replace('\\', '') + def COMMAND = "cmd /v:ON /c ${VISUAL_STUDIO_VCVARS_CMD} > nul && cmd /c echo" + project.ext.MSVC_SDK_VERSION = "${COMMAND} !WINDOWSSDKVERSION!".execute().text.trim().replace('\\', '') println "Visual Studio SDK Version: ${MSVC_SDK_VERSION}" - project.ext.MSVC_TOOLS_VERSION = "${COMMAND} %VCTOOLSVERSION%".execute().text.trim().replace('\\', '') + project.ext.MSVC_TOOLS_VERSION = "${COMMAND} !VCTOOLSVERSION!".execute().text.trim().replace('\\', '') println "Visual Studio VCTools Version: ${MSVC_TOOLS_VERSION}" }