Merge pull request #8546 from FirebirdSQL/work/windows-arm-build

Windows ARM64 support

Author: asfernandes

.github/workflows/main.yml

@@ -211,6 +211,72 @@ jobs:
           name: firebird-windows-vs-${{ env.VS_VERSION }}-${{ matrix.platform }}-installer
           path: builds/install_images/*-windows-${{ matrix.platform }}.exe
 
+  # Windows ARM container is not yet available, so official build is done directly in Windows 11 runner
+  build-windows-arm64:
+    #if: github.ref_type != 'tag'
+    runs-on: windows-11-arm
+    env:
+      VS_VERSION: 2022
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 10
+
+      - name: Adjust snapshot build number
+        uses: ./.github/actions/adjust-snapshot-buildno
+
+      - name: Prepare
+        shell: cmd
+        run: |
+          for /r %%i in (*.bat) do unix2dos "%%i"
+          REM choco uninstall --no-progress --yes innosetup
+          choco install --no-progress --yes innosetup --version=6.4.0
+
+      - name: Build
+        shell: cmd
+        env:
+          VS_SCRIPT: C:\Program Files\Microsoft Visual Studio\%VS_VERSION%\Enterprise\Common7\Tools\VsDevCmd.bat
+        run: |
+          set SEVENZIP=C:\Program Files\7-Zip
+          set INNO6_SETUP_PATH=C:\Program Files (x86)\Inno Setup 6
+          set FB_VS_ARCH=arm64
+          set FB_PROCESSOR_ARCHITECTURE=ARM64
+          call "%VS_SCRIPT%" -arch=%FB_VS_ARCH%
+          cd builds\win32
+          call run_all.bat PDB
+          call run_tests.bat
+
+      - name: Upload zip
+        uses: actions/upload-artifact@v4
+        with:
+          name: firebird-windows-vs-${{ env.VS_VERSION }}-arm64-zip
+          path: builds/install_images/Firebird-*-windows-arm64.zip
+
+      - name: Upload installer
+        uses: actions/upload-artifact@v4
+        with:
+          name: firebird-windows-vs-${{ env.VS_VERSION }}-arm64-installer
+          path: builds/install_images/*-windows-arm64.exe
+
+      - name: Upload installer (withDebugSymbols)
+        uses: actions/upload-artifact@v4
+        with:
+          name: firebird-windows-arm64-withDebugSymbols-installer
+          path: builds/install_images/*-windows-arm64-withDebugSymbols.exe
+
+      - name: Create release
+        uses: ./.github/actions/create-release
+        with:
+          token: ${{ secrets.SNAPSHOT_RELEASE_TOKEN }}
+          deletePatterns:  |
+            Firebird-*-windows-arm64*.exe
+            Firebird-*-windows-arm64*.zip
+          uploadFiles: |
+            builds/install_images/Firebird-*-windows-arm64*.exe
+            builds/install_images/Firebird-*-windows-arm64*.zip
+
   build-windows-docker:
     runs-on: windows-2022
 

builds/install/arch-specific/win32/BuildExecutableInstall.bat

@@ -176,7 +176,11 @@ set FBBUILD_INSTALL_IMAGES=%FB_ROOT_PATH%\builds\install_images
 @if "%FB_TARGET_PLATFORM%"=="x64" (
   set FBBUILD_FILE_ID=%PRODUCT_VER_STRING%-%FBBUILD_PACKAGE_NUMBER%%FBBUILD_FILENAME_SUFFIX%-windows-x64
 ) else (
-  set FBBUILD_FILE_ID=%PRODUCT_VER_STRING%-%FBBUILD_PACKAGE_NUMBER%%FBBUILD_FILENAME_SUFFIX%-windows-x86
+  @if "%FB_TARGET_PLATFORM%"=="arm64" (
+    set FBBUILD_FILE_ID=%PRODUCT_VER_STRING%-%FBBUILD_PACKAGE_NUMBER%%FBBUILD_FILENAME_SUFFIX%-windows-arm64
+  ) else (
+    set FBBUILD_FILE_ID=%PRODUCT_VER_STRING%-%FBBUILD_PACKAGE_NUMBER%%FBBUILD_FILENAME_SUFFIX%-windows-x86
+  )
 )
 
 @setlocal
@@ -489,7 +493,11 @@ for %%v in (IPLicense.txt IDPLicense.txt ) do (
 ::
 ::=================================================
 @echo.
-@call %ISCC_COMMAND% %FB_ROOT_PATH%\builds\install\arch-specific\win32\FirebirdInstall.iss
+if "%FB_TARGET_PLATFORM%"=="arm64" (
+  @call %ISCC_COMMAND% /DPlatformTarget=arm64 %FB_ROOT_PATH%\builds\install\arch-specific\win32\FirebirdInstall.iss
+) else (
+  @call %ISCC_COMMAND% %FB_ROOT_PATH%\builds\install\arch-specific\win32\FirebirdInstall.iss
+)
 @echo.
 
 ::End of ISX_PACK

builds/install/arch-specific/win32/FirebirdInstall.iss

@@ -212,13 +212,18 @@
 ;Assume native platform
 #if IsWin64
 #define PlatformTarget "x64"
+;---- IsArm64 is not available in preprocessor, so /DPlatformTarget=arm64 should be passed in the command line
+;#elif IsArm64
+;#define PlatformTarget "arm64"
 #else
 #define PlatformTarget "win32"
 #endif
 #endif
 
 #if PlatformTarget == "x64"
 #define ReleasePlatformTarget "x64"
+#elif PlatformTarget == "arm64"
+#define ReleasePlatformTarget "arm64"
 #else
 #define ReleasePlatformTarget "x86"
 #endif
@@ -327,6 +332,8 @@ SetupMutex={#MyAppName}
 #if PlatformTarget == "x64"
 ArchitecturesAllowed=x64
 ArchitecturesInstallIn64BitMode=x64
+#elif PlatformTarget == "arm64"
+ArchitecturesAllowed=arm64
 #endif
 
 ;This feature is incomplete, as more thought is required.
@@ -398,9 +405,12 @@ Name: CopyFbClientAsGds32Task; Description: {cm:CopyFbClientAsGds32Task}; Compon
 [Run]
 ; due to the changes required to support MSVC15 support for earlier versions is now broken.
 #if Int(msvc_runtime_major_version,14) >= 14
+#if PlatformTarget != "arm64"
 Filename: msiexec.exe; Parameters: "/qn /norestart /i ""{tmp}\vccrt{#msvc_runtime_library_version}_Win32.msi"" /L*v ""{tmp}\vccrt{#msvc_runtime_library_version}_Win32.log"" "; StatusMsg: "Installing MSVC 32-bit runtime libraries to system directory"; Check: HasWI30; Components: ClientComponent;
-#if PlatformTarget == "x64"
+#elif PlatformTarget == "x64"
 Filename: msiexec.exe; Parameters: "/qn /norestart /i ""{tmp}\vccrt{#msvc_runtime_library_version}_x64.msi"" /L*v ""{tmp}\vccrt{#msvc_runtime_library_version}_x64.log"" ";  StatusMsg: "Installing MSVC 64-bit runtime libraries to system directory"; Check: HasWI30; Components: ClientComponent;
+#elif PlatformTarget == "arm64"
+; Filename: msiexec.exe; Parameters: "/qn /norestart /i ""{tmp}\vccrt{#msvc_runtime_library_version}_arm64.msi"" /L*v ""{tmp}\vccrt{#msvc_runtime_library_version}_arm64.log"" ";  StatusMsg: "Installing MSVC ARM64 runtime libraries to system directory"; Check: HasWI30; Components: ClientComponent;
 #endif
 #endif
 
@@ -547,8 +557,10 @@ Source: {#WOW64Dir}\msvcp{#msvc_runtime_file_version}.dll; DestDir: {app}\WOW64;
 ;In addition, O/S must have Windows Installer 3.0.
 Source: {#FilesDir}\system32\vccrt{#msvc_runtime_library_version}_x64.msi; DestDir: {tmp};  Check: HasWI30; MinVersion: {#MinVer}; Components: ClientComponent;
 Source: {#WOW64Dir}\system32\vccrt{#msvc_runtime_library_version}_Win32.msi; DestDir: {tmp}; Check: HasWI30; MinVersion: {#MinVer}; Components: ClientComponent;
-#else
+#elif PlatformTarget == "Win32"
 Source: {#FilesDir}\system32\vccrt{#msvc_runtime_library_version}_Win32.msi; DestDir: {tmp}; Check: HasWI30; MinVersion: {#MinVer}; Components: ClientComponent;
+#elif PlatformTarget == "arm64"
+; Source: {#FilesDir}\system32\vccrt{#msvc_runtime_library_version}_arm64.msi; DestDir: {tmp}; Check: HasWI30; MinVersion: {#MinVer}; Components: ClientComponent;
 #endif
 #endif
 

builds/win32/clean_all.bat

@@ -22,16 +22,16 @@ for %%v in ( %* )  do (
 @echo Cleaning icu...
 @rmdir /S /Q "%FB_ROOT_PATH%\extern\icu\%FB_TARGET_PLATFORM%\%FBBUILD_BUILDTYPE%" 2>nul
 
-@echo Cleaning cds...
-@for /D %%d in ("%FB_ROOT_PATH%\extern\libcds\obj\*") do (
-  rmdir /S /Q "%%d\%FB_TARGET_PLATFORM%\cds\%FB_CONFIG%-static" 2>nul
+if not "%FB_TARGET_PLATFORM%"=="arm64" (
+  @echo Cleaning cds...
+  @for /D %%d in ("%FB_ROOT_PATH%\extern\libcds\obj\*") do (
+    rmdir /S /Q "%%d\%FB_TARGET_PLATFORM%\cds\%FB_CONFIG%-static" 2>nul
+  )
+  @for /D %%d in ("%FB_ROOT_PATH%\extern\libcds\bin\*") do (
+    rmdir /S /Q "%%d\%FB_TARGET_PLATFORM%-%FB_CONFIG%-static" 2>nul
+  )
 )
 
-@for /D %%d in ("%FB_ROOT_PATH%\extern\libcds\bin\*") do (
-  rmdir /S /Q "%%d\%FB_TARGET_PLATFORM%-%FB_CONFIG%-static" 2>nul
-)
-
-
 @echo Cleaning decNumber...
 @rmdir /S /Q "%FB_ROOT_PATH%\extern\decNumber\lib\%FB_TARGET_PLATFORM%" 2>nul
 @rmdir /S /Q "%FB_ROOT_PATH%\extern\decNumber\temp\%FB_TARGET_PLATFORM%" 2>nul

builds/win32/make_boot.bat

@@ -51,8 +51,10 @@ if "!ERRLEV!"=="1" goto :END
 	call :btyacc
 	if "!ERRLEV!"=="1" goto :END
 
-	call :libcds
-	if "!ERRLEV!"=="1" goto :END
+	if not "%FB_TARGET_PLATFORM%"=="arm64" (
+		call :libcds
+		if "!ERRLEV!"=="1" goto :END
+	)
 
 	echo Generating DSQL parser...
 	call parse.bat %*
@@ -176,10 +178,13 @@ goto :EOF
 @echo.
 @echo Building ttmath (%FB_OBJ_DIR%)...
 @mkdir %FB_ROOT_PATH%\extern\ttmath\%FB_CONFIG% 2>nul
-if /I "%FB_CONFIG%"=="debug" (
-  @ml64.exe /c /Zi /Fo %FB_ROOT_PATH%\extern\ttmath\%FB_CONFIG%\ttmathuint_x86_64_msvc.obj %FB_ROOT_PATH%\extern\ttmath\ttmathuint_x86_64_msvc.asm
-) else (
-  @ml64.exe /c /Fo %FB_ROOT_PATH%\extern\ttmath\%FB_CONFIG%\ttmathuint_x86_64_msvc.obj %FB_ROOT_PATH%\extern\ttmath\ttmathuint_x86_64_msvc.asm
+
+if not "%FB_TARGET_PLATFORM%"=="arm64" (
+  if /I "%FB_CONFIG%"=="debug" (
+    @ml64.exe /c /Zi /Fo %FB_ROOT_PATH%\extern\ttmath\%FB_CONFIG%\ttmathuint_x86_64_msvc.obj %FB_ROOT_PATH%\extern\ttmath\ttmathuint_x86_64_msvc.asm
+  ) else (
+    @ml64.exe /c /Fo %FB_ROOT_PATH%\extern\ttmath\%FB_CONFIG%\ttmathuint_x86_64_msvc.obj %FB_ROOT_PATH%\extern\ttmath\ttmathuint_x86_64_msvc.asm
+  )
 )
 if errorlevel 1 call :boot2 ttmath_%FB_OBJ_DIR%
 goto :EOF