From 8e3d43905befb581bb21427e40d1a2973163b32d Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 13 Jul 2017 11:15:38 +0200 Subject: [PATCH] Support also preview releases But for now - only as a fallback if no other VS install could be found. --- bin/phpsdk_setshell.bat | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/bin/phpsdk_setshell.bat b/bin/phpsdk_setshell.bat index 50c4534..775de8d 100644 --- a/bin/phpsdk_setshell.bat +++ b/bin/phpsdk_setshell.bat @@ -80,11 +80,15 @@ if 15 gtr %PHP_SDK_VC_NUM% ( rem vc15 support only for now, could parse out and pass on later for /f "tokens=1* delims=: " %%a in ('%~dp0\vswhere -nologo -version %PHP_SDK_VC_NUM% -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -format text') do set PHP_SDK_VC_DIR=%%b\VC if not exist "!PHP_SDK_VC_DIR!" ( - for /f "tokens=1* delims=: " %%a in ('%~dp0\vswhere -nologo -version %PHP_SDK_VC_NUM% -products Microsoft.VisualStudio.Product.BuildTools -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -format text') do set PHP_SDK_VC_DIR=%%b\VC - if not exist "!PHP_SDK_VC_DIR!" ( - echo Could not determine '%PHP_SDK_VC%' directory - goto out_error; - ) + for /f "tokens=1* delims=: " %%a in ('%~dp0\vswhere -nologo -version %PHP_SDK_VC_NUM% -products Microsoft.VisualStudio.Product.BuildTools -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -format text') do set PHP_SDK_VC_DIR=%%b\VC + if not exist "!PHP_SDK_VC_DIR!" ( + rem check for a preview release + for /f "tokens=1* delims=: " %%a in ('%~dp0\vswhere -nologo -version %PHP_SDK_VC_NUM% -prerelease -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -format text') do set PHP_SDK_VC_DIR=%%b\VC + if not exist "!PHP_SDK_VC_DIR!" ( + echo Could not determine '%PHP_SDK_VC%' directory + goto out_error; + ) + ) ) set VSCMD_ARG_no_logo=nologo )