Use switch style arch check

Author: dixyes

bin/phpsdk_setshell.bat

@@ -44,34 +44,52 @@ if 14 gtr %TMP_CHK% (
 set PHP_SDK_VS_NUM=%TMP_CHK%
 set TMP_CHK=
 
-if /i not "%2"=="x64" (
-	if /i not "%2"=="x86" (
-		if /i not "%2"=="arm64" (
-			echo Unsupported arch "%2"
-			goto out_error
-		)
-	)
+rem check target arch
+if "%2"=="x86" set PHP_SDK_ARCH=%2
+if "%2"=="x64" set PHP_SDK_ARCH=%2
+if "%2"=="x86_64" set PHP_SDK_ARCH=x64
+if "%2"=="amd64" set PHP_SDK_ARCH=x64
+if "%2"=="arm64" set PHP_SDK_ARCH=%2
+if "%PHP_SDK_ARCH%"=="" (
+	echo Unsupported target arch %2 >&2
+	goto out_error
 )
 
-set PHP_SDK_ARCH=%2
-
 rem check OS arch
-rem Architecture=9 meaning x86_64
-wmic cpu get Architecture /value | findstr "Architecture=9\>" >nul 2>nul
-if not errorlevel 1 (
-	set PHP_SDK_OS_ARCH=x64
+rem todo: allow user choose host sdk arch (i.e. x64 target can be compiled at x64(native) or x86(cross))
+for /f "usebackq tokens=1*" %%i in (`wmic cpu get Architecture /value /format:table ^| findstr /r "[1234567890][1234567890]*"`) do (
+	set PHP_SDK_OS_ARCH_NUM=%%i
 )
-rem Architecture=12 meaning arm64
-wmic cpu get Architecture /value | findstr "Architecture=12\>" >nul 2>nul
-if not errorlevel 1 (
-	set PHP_SDK_OS_ARCH=arm64
-)
-rem Architecture=0 meaning x86
-wmic cpu get Architecture /value | findstr "Architecture=0\>" >nul 2>nul
-if not errorlevel 1 (
-	set PHP_SDK_OS_ARCH=x86
+
+goto os_arch_cases
+:os_arch_error
+echo Unsupported OS arch %PHP_SDK_OS_ARCH% >&2
+goto out_error
+
+:os_arch_cases
+if "%PHP_SDK_OS_ARCH_NUM%"=="0" set PHP_SDK_OS_ARCH=x86
+if "%PHP_SDK_OS_ARCH_NUM%"=="1" (set PHP_SDK_OS_ARCH=mips && goto os_arch_error)
+if "%PHP_SDK_OS_ARCH_NUM%"=="2" (set PHP_SDK_OS_ARCH=alpha && goto os_arch_error)
+if "%PHP_SDK_OS_ARCH_NUM%"=="3" (set PHP_SDK_OS_ARCH=ppc && goto os_arch_error)
+if "%PHP_SDK_OS_ARCH_NUM%"=="4" (set PHP_SDK_OS_ARCH=shx && goto os_arch_error)
+if "%PHP_SDK_OS_ARCH_NUM%"=="5" (set PHP_SDK_OS_ARCH=arm32 && goto os_arch_error)
+if "%PHP_SDK_OS_ARCH_NUM%"=="6" (set PHP_SDK_OS_ARCH=ia64 && goto os_arch_error)
+if "%PHP_SDK_OS_ARCH_NUM%"=="7" (set PHP_SDK_OS_ARCH=alpha64 && goto os_arch_error)
+if "%PHP_SDK_OS_ARCH_NUM%"=="8" (set PHP_SDK_OS_ARCH=msil && goto os_arch_error)
+if "%PHP_SDK_OS_ARCH_NUM%"=="9" set PHP_SDK_OS_ARCH=x64
+rem wow64
+if "%PHP_SDK_OS_ARCH_NUM%"=="10" set PHP_SDK_OS_ARCH=x86
+if "%PHP_SDK_OS_ARCH_NUM%"=="11" (set PHP_SDK_OS_ARCH=neutral && goto os_arch_error)
+if "%PHP_SDK_OS_ARCH_NUM%"=="12" set PHP_SDK_OS_ARCH=arm64
+if "%PHP_SDK_OS_ARCH_NUM%"=="13" (set PHP_SDK_OS_ARCH=arm32 && goto os_arch_error)
+rem woa64
+if "%PHP_SDK_OS_ARCH_NUM%"=="14" set PHP_SDK_OS_ARCH=x86
+if "%PHP_SDK_OS_ARCH%"=="" (
+	goto os_arch_error
 )
 
+set PHP_SDK_OS_ARCH_NUM=
+
 rem cross compile is ok, so we donot need this
 rem if not /i "%PHP_SDK_ARCH%"=="PHP_SDK_OS_ARCH" (
 rem 	echo 32-bit OS detected, native 64-bit toolchain is unavailable.
@@ -183,6 +201,7 @@ if 15 gtr %PHP_SDK_VS_NUM% (
 ) else (
 	set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\Auxiliary\Build\vcvarsall.bat" !VCVARSALL_ARCH_NAME!
 )
+set VCVARSALL_ARCH_NAME=
 
 rem echo Visual Studio VC path %PHP_SDK_VC_DIR%
 rem echo Windows SDK path %PHP_SDK_WIN_SDK_DIR%