update setup.bat

Author: Biswajee

examples/MCP/setup.bat

@@ -2,6 +2,7 @@
 @REM  SPDX-License-Identifier: BSD-3-Clause
 
 @echo off
+setlocal enabledelayedexpansion
 
 set SCRIPT_DIR=%~dp0
 pushd "%SCRIPT_DIR%\..\.."
@@ -10,70 +11,59 @@ popd
 
 set ARCH=%1
 if "%ARCH%"=="" (
-    if "%PROCESSOR_ARCHITECTURE%"=="ARM64" (
-        set ARCH=ARM64
-    ) else (
-        set ARCH=x64
-    )
+    if "%PROCESSOR_ARCHITECTURE%"=="ARM64" (set ARCH=ARM64) else (set ARCH=x64)
 )
 
-@REM On ARM64, the cryptography package (required by fastmcp) must be compiled
-@REM from source. This requires OpenSSL development headers. Check early.
 if /i "%ARCH%"=="ARM64" (
     if "%OPENSSL_DIR%"=="" set OPENSSL_DIR=C:\Program Files\OpenSSL-Win64-ARM
+)
 
-    if not exist "%OPENSSL_DIR%\include" (
-        echo OpenSSL not found. Downloading and installing...
-        set OPENSSL_MSI=%TEMP%\Win64ARMOpenSSL-4_0_1.msi
-        curl -L -o "%OPENSSL_MSI%" https://slproweb.com/download/Win64ARMOpenSSL-4_0_1.msi
-        if errorlevel 1 (
-            echo.
-            echo ERROR: Failed to download OpenSSL installer.
-            echo        Check your internet connection and try again, or download manually:
-            echo          https://slproweb.com/download/Win64ARMOpenSSL-4_0_1.msi
-            echo        Install it, then re-run setup.bat
-            echo.
-            exit /b 1
-        )
-        msiexec /i "%OPENSSL_MSI%" /quiet /norestart INSTALLDIR="%OPENSSL_DIR%"
-        if errorlevel 1 (
-            echo.
-            echo ERROR: OpenSSL installation failed.
-            echo        Try installing manually from:
-            echo          https://slproweb.com/download/Win64ARMOpenSSL-4_0_1.msi
-            echo        Then re-run setup.bat
-            echo.
-            exit /b 1
-        )
-        echo OpenSSL installed to %OPENSSL_DIR%
+if /i "%ARCH%"=="ARM64" if not exist "!OPENSSL_DIR!\include" (
+    echo OpenSSL not found. Downloading and installing...
+    curl -L -o "%TEMP%\Win64ARMOpenSSL.msi" https://slproweb.com/download/Win64ARMOpenSSL-4_0_1.msi
+    if errorlevel 1 (
+        echo.
+        echo ERROR: Download failed. Install manually from:
+        echo          https://slproweb.com/download/Win64ARMOpenSSL-4_0_1.msi
+        echo        Then re-run setup.bat
+        echo.
+        exit /b 1
+    )
+    msiexec /i "%TEMP%\Win64ARMOpenSSL.msi" /quiet /norestart INSTALLDIR="!OPENSSL_DIR!"
+    if errorlevel 1 (
+        echo.
+        echo ERROR: OpenSSL installation failed. Install manually from:
+        echo          https://slproweb.com/download/Win64ARMOpenSSL-4_0_1.msi
+        echo        Then re-run setup.bat
+        echo.
+        exit /b 1
     )
+    echo OpenSSL installed to !OPENSSL_DIR!
+)
 
-    if not exist "%OPENSSL_DIR%\include" (
+if /i "%ARCH%"=="ARM64" (
+    if not exist "!OPENSSL_DIR!\include" (
         echo.
-        echo ERROR: OpenSSL headers still not found at %OPENSSL_DIR%\include
-        echo        Installation may have used a different path.
-        echo        Set OPENSSL_DIR manually and re-run:
+        echo ERROR: OpenSSL headers not found at !OPENSSL_DIR!\include
+        echo        Set OPENSSL_DIR to the full installer path and re-run:
         echo          setx OPENSSL_DIR "C:\Program Files\OpenSSL-Win64-ARM"
         echo.
         exit /b 1
     )
-
-    set OPENSSL_LIB_DIR=%OPENSSL_DIR%\lib\VC\arm64\MD
-    if not exist "%OPENSSL_LIB_DIR%" (
+    if not exist "!OPENSSL_DIR!\lib\VC\arm64\MD" (
         echo.
-        echo ERROR: OpenSSL lib directory not found at %OPENSSL_LIB_DIR%
-        echo        Expected layout from the full ARM64 installer. Try reinstalling from:
+        echo ERROR: OpenSSL libs not found at !OPENSSL_DIR!\lib\VC\arm64\MD
+        echo        Reinstall using the full installer ^(not Light^):
         echo          https://slproweb.com/download/Win64ARMOpenSSL-4_0_1.msi
         echo.
         exit /b 1
     )
-
-    echo OpenSSL              : %OPENSSL_DIR% [OK]
-    echo OpenSSL libs         : %OPENSSL_LIB_DIR% [OK]
+    set OPENSSL_LIB_DIR=!OPENSSL_DIR!\lib\VC\arm64\MD
+    echo OpenSSL              : !OPENSSL_DIR! [OK]
+    echo OpenSSL libs         : !OPENSSL_LIB_DIR! [OK]
 )
 
 set BUILD_DIR=%REPO_ROOT%\__Builds
-
 if not exist "%BUILD_DIR%" (
     echo [1/3] Build not found. Running root build...
     call "%REPO_ROOT%\build.bat" %ARCH%