use if_bits and fix directory naming

Author: Harishmcw

tools/build_steps_win_arm64.bat

@@ -1,9 +1,11 @@
 :: Build script for scipy_openblas wheel on Windows on ARM64
 
-:: Usage: build_steps_win_arm64.bat [build_bits]
-:: e.g build_steps_win_arm64.bat 64
+:: Usage: build_steps_win_arm64.bat [build_bits] [if_bits]
+:: e.g build_steps_win_arm64.bat 64 64
 
-:: BUILD_BITS  (default binary architecture, 32 or 64, unspec -> 64).
+:: build_bits  (default binary architecture, 32 or 64, unspec -> 64).
+:: if_bits (default interface size, 32 or 64, unspec -> 32)
+:: If INTERFACE64 environment variable is 1, then if_bits defaults to 64
 :: Expects these binaries on the PATH:
 :: clang-cl, flang-new, cmake, perl
 
@@ -16,19 +18,42 @@ set first_woa_buildable_commit="de2380e5a6149706a633322a16a0f66faa5591fc"
 setlocal enabledelayedexpansion
 
 if "%1"=="" (
-    set BUILD_BITS=64
+    set build_bits=64
 ) else (
-    set BUILD_BITS=%1
+    set build_bits=%1
 )
-echo Building for %BUILD_BITS%-bit configuration...
+if "%INTERFACE64%"=="1" (
+    set "if_default=64"
+) else (
+    set "if_default=32"
+)
+if "%2"=="" (
+    set "if_bits=%if_default%"
+) else (
+    set "if_bits=%2"
+)
+echo Building for %build_bits%-bit configuration...
 
 :: Define destination directory
 pushd "%~dp0\.."
 set "ob_out_root=%CD%\local\scipy_openblas"
 set "ob_64=%ob_out_root%64"
 set "ob_32=%ob_out_root%32"
-if exist "%ob_64%" xcopy "%ob_64%" "%ob_32%" /I /Y
-set "DEST_DIR=%ob_32%"
+set "local_dir=%CD%\local"
+for /d %%D in ("%local_dir%\*") do (
+    if /I not "%%~nxD"=="scipy_openblas64" (
+        rmdir /S /Q "%%D"
+    )
+)
+if "%if_bits%"=="64" (
+    set "DEST_DIR=%ob_64%"
+) else (
+    if exist "%ob_64%" (
+    xcopy /Y /H "%ob_64%\*.py" "%CD%\ob64_backup\"
+    move "%ob_64%" "%ob_32%"
+    set "DEST_DIR=%ob_32%"
+    )
+)
 
 :: Clone OpenBLAS
 echo Cloning OpenBLAS repository with submodules...
@@ -43,6 +68,13 @@ if errorlevel 1 (
     git checkout %first_woa_buildable_commit%
 )
 
+:: Set suffixed-ILP64 flags
+if "%if_bits%"=="64" (
+    set "interface_flags=-DINTERFACE64=1 -DSYMBOLSUFFIX=64_"
+) else (
+    set "interface_flags="
+)
+
 :: Create build directory and navigate to it
 if exist build (rmdir /S /Q build || exit /b 1)
 mkdir build || exit /b 1 & cd build || exit /b 1
@@ -54,24 +86,25 @@ for /f "usebackq tokens=*" %%i in (`"C:\Program Files (x86)\Microsoft Visual Stu
 
 :: Run CMake and Ninja build
 cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DTARGET=ARMV8 -DBUILD_SHARED_LIBS=ON -DARCH=arm64 ^
--DBINARY=%BUILD_BITS% -DCMAKE_SYSTEM_PROCESSOR=ARM64 -DCMAKE_C_COMPILER=clang-cl ^
--DCMAKE_Fortran_COMPILER=flang-new -DSYMBOLPREFIX="scipy_" -DLIBNAMEPREFIX="scipy_"
+-DBINARY=%build_bits% -DCMAKE_SYSTEM_PROCESSOR=ARM64 -DCMAKE_C_COMPILER=clang-cl ^
+-DCMAKE_Fortran_COMPILER=flang-new -DSYMBOLPREFIX="scipy_" -DLIBNAMEPREFIX="scipy_" %interface_flags%
 if errorlevel 1 exit /b 1
- 
+
 ninja
 if errorlevel 1 exit /b 1
 
 echo Build complete. Returning to Batch.
 
-:: Rewrite the name of the project to scipy-openblas32
-echo Rewrite to scipy_openblas32
-cd ../..
-set out_pyproject=pyproject_64_32.toml
-powershell -Command "(Get-Content 'pyproject.toml') -replace 'openblas64', 'openblas32' | Set-Content %out_pyproject%
-powershell -Command "(Get-Content 'local\scipy_openblas32\__main__.py') -replace 'openblas64', 'openblas32' | Out-File 'local\scipy_openblas32\__main__.py' -Encoding utf8"
-powershell -Command "(Get-Content 'local\scipy_openblas32\__init__.py') -replace 'openblas64', 'openblas32' | Out-File 'local\scipy_openblas32\__init__.py' -Encoding utf8"
-powershell -Command "(Get-Content 'local\scipy_openblas32\__init__.py') -replace 'openblas_get_config64_', 'openblas_get_config' | Out-File 'local\scipy_openblas32\__init__.py' -Encoding utf8"
-powershell -Command "(Get-Content 'local\scipy_openblas32\__init__.py') -replace 'cflags =.*', 'cflags = \"-DBLAS_SYMBOL_PREFIX=scipy_\"' | Out-File 'local\scipy_openblas32\__init__.py' -Encoding utf8"
+if "%if_bits%"=="32" (
+    echo Rewrite to scipy_openblas32
+    cd ../..
+    set out_pyproject=pyproject_64_32.toml
+    powershell -Command "(Get-Content 'pyproject.toml') -replace 'openblas64', 'openblas32' | Set-Content !out_pyproject!"
+    powershell -Command "(Get-Content 'local\scipy_openblas32\__main__.py') -replace 'openblas64', 'openblas32' | Out-File 'local\scipy_openblas32\__main__.py' -Encoding utf8"
+    powershell -Command "(Get-Content 'local\scipy_openblas32\__init__.py') -replace 'openblas64', 'openblas32' | Out-File 'local\scipy_openblas32\__init__.py' -Encoding utf8"
+    powershell -Command "(Get-Content 'local\scipy_openblas32\__init__.py') -replace 'openblas_get_config64_', 'openblas_get_config' | Out-File 'local\scipy_openblas32\__init__.py' -Encoding utf8"
+    powershell -Command "(Get-Content 'local\scipy_openblas32\__init__.py') -replace 'cflags =.*', 'cflags = \"-DBLAS_SYMBOL_PREFIX=scipy_\"' | Out-File 'local\scipy_openblas32\__init__.py' -Encoding utf8"
+)
 
 :: Prepare destination directory
 cd OpenBLAS/build
@@ -84,7 +117,11 @@ echo Moving library files...
 if exist lib\release (
     move /Y lib\release\*.dll "%DEST_DIR%\lib\"
     if errorlevel 1 exit /b 1
-    move /Y lib\release\*.dll.a "%DEST_DIR%\lib\scipy_openblas.lib"
+    for %%f in (lib\release\*.dll.a) do (
+        set "orig_name=%%~nxf"
+        call set "base_name=%%orig_name:.dll.a=%%"
+        move /Y "%%f" "%DEST_DIR%\lib\!base_name!.lib"
+    )
     if errorlevel 1 exit /b 1
 ) else (
     echo Error: lib/release directory not found!
@@ -114,15 +151,31 @@ cd ../..
 :: Build the Wheel & Install It
 echo Running 'python -m build' to build the wheel...
 python -c "import build" 2>NUL || pip install build
-move /Y  pyproject.toml pyproject.toml.bak
-move /Y  %out_pyproject% pyproject.toml
-python -m build
-if errorlevel 1 exit /b 1
-move /Y pyproject.toml.bak pyproject.toml
+if "%if_bits%"=="64" (
+    python -m build
+    if errorlevel 1 exit /b 1
+) else (
+    move /Y pyproject.toml pyproject.toml.bak
+    move /Y %out_pyproject% pyproject.toml
+    python -m build
+    if errorlevel 1 exit /b 1
+    move /Y pyproject.toml.bak pyproject.toml
+)
+if "%if_bits%"=="32" (
+    move /Y "%CD%\ob64_backup" "%ob_64%"
+)
+
+:: Rename the wheel
+for %%f in (dist\*any.whl) do (
+    set WHEEL_FILE=dist\%%f
+    set "filename=%%~nxf"
+    set "newname=!filename:any.whl=win_arm64.whl!"
+    ren "dist\!filename!" "!newname!"
+)
 
 :: Locate the built wheel
 for /f %%f in ('dir /b dist\scipy_openblas*.whl 2^>nul') do set WHEEL_FILE=dist\%%f
- 
+
 if not defined WHEEL_FILE (
     echo Error: No wheel file found in dist folder.
     exit /b 1