Change Windows release filenames.

.github/workflows/main.yml

@@ -229,31 +229,24 @@ jobs:
           set INNO6_SETUP_PATH=C:\Program Files (x86)\Inno Setup 6
           if "%PLATFORM%" == "x64" set FB_VS_ARCH=amd64
           if "%PLATFORM%" == "x64" set FB_PROCESSOR_ARCHITECTURE=AMD64
-          if "%PLATFORM%" == "x64" set FB_OUTPUT_SUFFIX=x64
           if "%PLATFORM%" == "x86" set FB_VS_ARCH=x86
           if "%PLATFORM%" == "x86" set FB_PROCESSOR_ARCHITECTURE=x86
-          if "%PLATFORM%" == "x86" set FB_OUTPUT_SUFFIX=win32
           call "%VS_SCRIPT%" -arch=%FB_VS_ARCH%
           cd builds\win32
           call run_all.bat
           call run_tests.bat
 
-      - name: Extract zip
-        shell: cmd
-        run: |
-          7z x builds\install_images\*.zip -ooutput
-
       - name: Upload zip
         uses: actions/upload-artifact@main
         with:
           name: firebird-windows-vs-${{ env.VS_VERSION }}-${{ matrix.platform }}-zip
-          path: output
+          path: builds/install_images/Firebird-*-windows-${{ matrix.platform }}.zip
 
       - name: Upload installer
         uses: actions/upload-artifact@main
         with:
           name: firebird-windows-vs-${{ env.VS_VERSION }}-${{ matrix.platform }}-installer
-          path: builds/install_images/*.exe
+          path: builds/install_images/*-windows-${{ matrix.platform }}.exe
 
   build-windows-docker:
     runs-on: windows-2022
@@ -276,30 +269,35 @@ jobs:
         env:
           PLATFORM: ${{ matrix.platform }}
         run: |
-          if "%PLATFORM%" == "x64" set FB_OUTPUT_SUFFIX=x64
-          if "%PLATFORM%" == "x86" set FB_OUTPUT_SUFFIX=Win32
-          echo ::set-output name=arch_suffix::%FB_OUTPUT_SUFFIX%
+          echo ::set-output name=arch_suffix::%PLATFORM%
           mkdir builds\install_images
           cd builds\docker\windows
           call build.bat
           call run.bat C:\fbscripts\build-%PLATFORM%.bat
 
-      - name: Extract zip
-        shell: cmd
-        run: |
-          7z x builds\install_images\*-${{ steps.build.outputs.arch_suffix }}.zip -ooutput
-
       - name: Upload zip
         uses: actions/upload-artifact@main
         with:
           name: firebird-windows-${{ matrix.platform }}-zip
-          path: output
+          path: builds/install_images/Firebird-*-windows-${{ matrix.platform }}.zip
+
+      - name: Upload zip (withDebugSymbols)
+        uses: actions/upload-artifact@main
+        with:
+          name: firebird-windows-${{ matrix.platform }}-withDebugSymbols-zip
+          path: builds/install_images/Firebird-*-windows-${{ matrix.platform }}-withDebugSymbols.zip
 
       - name: Upload installer
         uses: actions/upload-artifact@main
         with:
           name: firebird-windows-${{ matrix.platform }}-installer
-          path: builds/install_images/*.exe
+          path: builds/install_images/*-windows-${{ matrix.platform }}.exe
+
+      - name: Upload installer (withDebugSymbols)
+        uses: actions/upload-artifact@main
+        with:
+          name: firebird-windows-${{ matrix.platform }}-withDebugSymbols-installer
+          path: builds/install_images/*-windows-${{ matrix.platform }}-withDebugSymbols.exe
 
       - name: Snapshot - prepare
         id: snapshot_prepare
@@ -321,8 +319,8 @@ jobs:
           fail-if-no-release: false
           fail-if-no-assets: false
           assets: |
-            Firebird-*${{ steps.build.outputs.arch_suffix }}*.exe
-            Firebird-*${{ steps.build.outputs.arch_suffix }}*.zip
+            Firebird-*-windows-${{ steps.build.outputs.arch_suffix }}*.exe
+            Firebird-*-windows-${{ steps.build.outputs.arch_suffix }}*.zip
 
       - name: Snapshot - release
         id: snapshot_release_try1
@@ -336,8 +334,8 @@ jobs:
           prerelease: true
           token: ${{ secrets.SNAPSHOT_RELEASE_TOKEN }}
           files: |
-            builds/install_images/Firebird-*.exe
-            builds/install_images/Firebird-*.zip
+            builds/install_images/Firebird-*-windows-*.exe
+            builds/install_images/Firebird-*-windows-*.zip
 
       - name: Snapshot - release (retry)
         uses: softprops/action-gh-release@v1
@@ -351,8 +349,8 @@ jobs:
           prerelease: true
           token: ${{ secrets.SNAPSHOT_RELEASE_TOKEN }}
           files: |
-            builds/install_images/Firebird-*.exe
-            builds/install_images/Firebird-*.zip
+            builds/install_images/Firebird-*windows-*.exe
+            builds/install_images/Firebird-*windows-*.zip
 
   build-macos:
     runs-on: macos-latest

builds/docker/windows/scripts/build-x64.bat

@@ -3,7 +3,6 @@
 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsDevCmd.bat" -arch=amd64
 
 set FB_PROCESSOR_ARCHITECTURE=AMD64
-set FB_OUTPUT_SUFFIX=x64
 
 xcopy /h /e /i /q C:\firebird C:\firebird-build
 cd /d C:\firebird-build\builds\win32

builds/docker/windows/scripts/build-x86.bat

@@ -3,7 +3,6 @@
 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsDevCmd.bat" -arch=x86
 
 set FB_PROCESSOR_ARCHITECTURE=x86
-set FB_OUTPUT_SUFFIX=win32
 
 xcopy /h /e /i /q C:\firebird C:\firebird-build
 cd /d C:\firebird-build\builds\win32

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

@@ -172,7 +172,11 @@ set FBBUILD_PROD_STATUS=PROD
 set FBBUILD_PROD_STATUS=DEV
 )
 
-set FBBUILD_FILE_ID=%PRODUCT_VER_STRING%-%FBBUILD_PACKAGE_NUMBER%-%FB_TARGET_PLATFORM%
+if "%FB_TARGET_PLATFORM%"=="x64" (
+set FBBUILD_FILE_ID=%PRODUCT_VER_STRING%-%FBBUILD_PACKAGE_NUMBER%-windows-x64
+) else (
+set FBBUILD_FILE_ID=%PRODUCT_VER_STRING%-%FBBUILD_PACKAGE_NUMBER%-windows-x86
+)
 
 @setlocal
 @echo.
@@ -463,7 +467,7 @@ setlocal DisableDelayedExpansion
 set SKIP_FILES=-x!*.log -x!*.exp -x!*_test.exe -x!installation_readme.txt
 
 if "%FBBUILD_SHIP_PDB%" == "ship_pdb" (
-    set FBBUILD_ZIPFILE=%FBBUILD_INSTALL_IMAGES%\Firebird-%FBBUILD_FILE_ID%-pdb%FBBUILD_FILENAME_SUFFIX%.zip
+    set FBBUILD_ZIPFILE=%FBBUILD_INSTALL_IMAGES%\Firebird-%FBBUILD_FILE_ID%-withDebugSymbols%FBBUILD_FILENAME_SUFFIX%.zip
 ) else (
     set FBBUILD_ZIPFILE=%FBBUILD_INSTALL_IMAGES%\Firebird-%FBBUILD_FILE_ID%%FBBUILD_FILENAME_SUFFIX%.zip
     set SKIP_FILES=%SKIP_FILES% -x!*.pdb

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

@@ -217,6 +217,12 @@
 #endif
 #endif
 
+#if PlatformTarget == "x64"
+#define ReleasePlatformTarget "x64"
+#else
+#define ReleasePlatformTarget "x86"
+#endif
+
 ;---- If we haven't already set ConfigurationTarget then pick it up from the environment.
 #ifndef ConfigurationTarget
 #define ConfigurationTarget GetEnv("FBBUILD_BUILDTYPE")
@@ -262,12 +268,12 @@
 
 ;Some more strings to distinguish the name of final executable
 #ifdef ship_pdb
-#define pdb_str="-pdb"
+#define pdb_str="-withDebugSymbols"
 #else
 #define pdb_str=""
 #endif
 #if GetEnv("FBBUILD_BUILDTYPE") == "debug"
-#define debug_str="-debug"
+#define debug_str="-withDebugSymbols"
 #else
 #define debug_str=""
 #endif
@@ -291,8 +297,8 @@ AppVersion={#MyAppVerString}
 VersionInfoVersion={#MyAppVerString}
 
 SourceDir={#Root}
-OutputBaseFilename={#MyAppName}-{#MyAppVerString}-{#PackageNumber}-{#PlatformTarget}{#debug_str}{#pdb_str}{#FilenameSuffix}
-;OutputManifestFile={#MyAppName}-{#MyAppVerString}-{#PackageNumber}-{#PlatformTarget}{#debug_str}{#pdb_str}{#FilenameSuffix}-Setup-Manifest.txt
+OutputBaseFilename={#MyAppName}-{#MyAppVerString}-{#PackageNumber}-windows-{#ReleasePlatformTarget}{#debug_str}{#pdb_str}{#FilenameSuffix}
+;OutputManifestFile={#MyAppName}-{#MyAppVerString}-{#PackageNumber}-windows-{#ReleasePlatformTarget}{#debug_str}{#pdb_str}{#FilenameSuffix}-Setup-Manifest.txt
 OutputDir=builds\install_images
 ;!!! These directories are as seen from SourceDir !!!
 #define ScriptsDir "builds\install\arch-specific\win32"