Merge pull request #7251 from FirebirdSQL/work/windows-build-ang-gh

Windows build (installer, dev experience, speed, GH actions) and GH refactor

Author: asfernandes

.github/workflows/main.yml

@@ -1,7 +1,7 @@
 temp/
 /gen/
-output_Win32/
-output_x64/
+output_Win32_*/
+output_x64_*/
 examples/prebuilt/
 .vs/
 m4/

.gitignore

@@ -44,7 +44,7 @@ RUN `
     refreshenv && `
     setx PATH "%PATH%;C:\Program Files\Git\usr\bin"
 
-ENV SEVENZIP='"C:\Program Files\7-Zip"'
-ENV INNO6_SETUP_PATH='"C:\Program Files (x86)\Inno Setup 6"'
+ENV SEVENZIP='C:\Program Files\7-Zip'
+ENV INNO6_SETUP_PATH='C:\Program Files (x86)\Inno Setup 6'
 
 COPY scripts\* C:\fbscripts\

builds/docker/windows/Dockerfile

@@ -1,2 +1,2 @@
 @echo off
-docker run --rm -v %cd%\..\..\..:C:\firebird -v %cd%\..\..\..\output:C:\firebird-out asfernandes/firebird-builder:5 %1
+docker run --rm -v %cd%\..\..\..:C:\firebird asfernandes/firebird-builder:5 %1

builds/docker/windows/run.bat

@@ -1,4 +1,4 @@
-REM FIXME @echo off
+@echo off
 
 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsDevCmd.bat" -arch=amd64
 
@@ -8,9 +8,8 @@ set FB_OUTPUT_SUFFIX=x64
 xcopy /h /e /i /q C:\firebird C:\firebird-build
 cd /d C:\firebird-build\builds\win32
 
-REM call run_all.bat
-call run_all.bat JUSTBUILD
+call run_all.bat
 
 call run_tests.bat
 
-xcopy /h /e /i /q C:\firebird-build\output_%FB_OUTPUT_SUFFIX%\* C:\firebird-out
+copy C:\firebird-build\builds\install_images\* C:\firebird\builds\install_images

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

@@ -8,9 +8,8 @@ set FB_OUTPUT_SUFFIX=win32
 xcopy /h /e /i /q C:\firebird C:\firebird-build
 cd /d C:\firebird-build\builds\win32
 
-REM call run_all.bat
-call run_all.bat JUSTBUILD
+call run_all.bat
 
 call run_tests.bat
 
-xcopy /h /e /i /q C:\firebird-build\output_%FB_OUTPUT_SUFFIX%\* C:\firebird-out
+copy C:\firebird-build\builds\install_images\* C:\firebird\builds\install_images

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

@@ -65,10 +65,10 @@ if "%FB2_SNAPSHOT%"=="1" (
 :: let's bail out now.
 
 @echo     o Checking for sed...
-(cmd /c "sed.exe --version 2>&1 | findstr version > nul ") || ( call :ERROR Could not locate sed && @goto :EOF )
+(cmd /c "sed.exe --version 2>&1 > nul ") || ( call :ERROR Could not locate sed && @goto :EOF )
 
 @echo     o Checking for unix2dos...
-(cmd /c "unix2dos.exe --version 2>&1 | findstr version > nul" ) || ( call :ERROR Could not locate unix2dos && @goto :EOF )
+(cmd /c "unix2dos.exe --version 2>&1 > nul" ) || ( call :ERROR Could not locate unix2dos && @goto :EOF )
 
 @for /f "usebackq tokens=*" %%c in (`where /f touch 2^>nul`) do set TOUCH_COMMAND=%%c
 if defined TOUCH_COMMAND (
@@ -93,7 +93,7 @@ if %FBBUILD_ZIP_PACK% EQU 1 (
 if %FBBUILD_ISX_PACK% NEQ 1 goto :SKIP_INNO
 
 if defined INNO6_SETUP_PATH (
-  set ISCC_COMMAND=%INNO6_SETUP_PATH%\iscc.exe
+  set ISCC_COMMAND="%INNO6_SETUP_PATH%\iscc.exe"
 )
 :: If the environment variable is not set let's search in PATH
 if not defined ISCC_COMMAND (
@@ -445,7 +445,7 @@ copy %FB_ROOT_PATH%\builds\install\misc\databases.conf %FB_OUTPUT_DIR%\databases
 :: that and they all have windows EOL
 ::===============================================
 for /R %FB_OUTPUT_DIR% %%W in ( *.txt *.conf *.sql *.c *.cpp *.hpp *.h *.bat *.pas *.e *.def *.rc *.md *.html ) do (
-  unix2dos -q --safe %%W || exit /b 1
+  unix2dos --safe %%W || exit /b 1
 )
 
 ::End of SET_CRLF
@@ -458,7 +458,7 @@ for /R %FB_OUTPUT_DIR% %%W in ( *.txt *.conf *.sql *.c *.cpp *.hpp *.h *.bat *.p
 :: Forcefully disable delayed expansion because of exclamation marks in 7z switches
 setlocal DisableDelayedExpansion
 
-set SKIP_FILES=-x!installation_readme.txt
+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
@@ -476,7 +476,7 @@ if exist %FBBUILD_ZIPFILE% (
   @del %FBBUILD_ZIPFILE%
 )
 
-%SEVENZIP%\7z.exe a -r -tzip -mx9 %SKIP_FILES% %FBBUILD_ZIPFILE% %FB_OUTPUT_DIR%\*
+"%SEVENZIP%\7z.exe" a -r -tzip -mx9 %SKIP_FILES% %FBBUILD_ZIPFILE% %FB_OUTPUT_DIR%\*
 
 endlocal
 
@@ -652,7 +652,7 @@ for %%v in ( %1 %2 %3 %4 %5 %6 %7 %8 %9 )  do (
 
 pushd ..\..\..\win32
 ::This must be called from the directory it resides in.
-@call setenvvar.bat
+@call setenvvar.bat %*
 popd
 @if errorlevel 1 (goto :END)
 

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

@@ -117,8 +117,9 @@
 ;We speed up compilation (and hence testing) by not compressing contents.
 #undef compression
 
-;Default to x64 for testing
+;Default to x64_release for testing
 #define PlatformTarget "x64"
+#define ConfigurationTarget "release"
 #endif
 ;-------#ifdef iss_debug
 
@@ -216,6 +217,15 @@
 #endif
 #endif
 
+;---- If we haven't already set ConfigurationTarget then pick it up from the environment.
+#ifndef ConfigurationTarget
+#define ConfigurationTarget GetEnv("FBBUILD_BUILDTYPE")
+#endif
+#if ConfigurationTarget == ""
+;Assume release
+#define ConfigurationTarget "release"
+#endif
+
 #if FB_BUILD_TYPE == "T"
 ;If we are still under development we can ignore some missing files.
 #define SkipFileIfDevStatus " skipifsourcedoesntexist "
@@ -224,7 +234,7 @@
 #endif
 
 ;This location is relative to SourceDir (declared below)
-#define FilesDir="output_" + PlatformTarget
+#define FilesDir="output_" + PlatformTarget + "_" + ConfigurationTarget
 #if PlatformTarget == "x64"
 #define WOW64Dir="output_win32"
 #endif
@@ -397,7 +407,7 @@ Filename: {app}\instreg.exe; Parameters: "install "; StatusMsg: {cm:instreg}; Mi
 Filename: {app}\instclient.exe; Parameters: "install fbclient"; StatusMsg: {cm:instclientCopyFbClient}; MinVersion: {#MinVer}; Components: ClientComponent; Flags: runminimized; Check: CopyFBClientLib;
 Filename: {app}\instclient.exe; Parameters: "install gds32"; StatusMsg: {cm:instclientGenGds32}; MinVersion: {#MinVer}; Components: ClientComponent; Flags: runminimized; Check: CopyGds32
 #if PlatformTarget == "x64"
-Filename: {app}\WOW64\instclient.exe; Parameters: "install fbclient"; StatusMsg: {cm:instclientCopyFbClient}; MinVersion: {#MinVer}; Components: ClientComponent; Flags: runminimized 32bit; Check: CopyFBClientLib;
+Filename: {app}\WOW64\instclient.exe; Parameters: "install fbclient"; StatusMsg: {cm:instclientCopyFbClient}; MinVersion: {#MinVer}; Components: ClientComponent; Flags: runminimized 32bit; Check: CopyFBClientLib
 Filename: {app}\WOW64\instclient.exe; Parameters: "install gds32"; StatusMsg: {cm:instclientGenGds32}; MinVersion: {#MinVer}; Components: ClientComponent; Flags: runminimized 32bit; Check: CopyGds32
 #endif
 
@@ -500,10 +510,10 @@ Source: {#FilesDir}\icuin??.dll; DestDir: {app}; Components: ClientComponent; Fl
 Source: {#FilesDir}\icudt??.dll; DestDir: {app}; Components: ClientComponent; Flags: sharedfile ignoreversion
 Source: {#FilesDir}\icudt*.dat;  DestDir: {app}; Components: ClientComponent; Flags: sharedfile ignoreversion
 #if PlatformTarget == "x64"
-Source: {#WOW64Dir}\icuuc??.dll; DestDir: {app}\WOW64; Components: ClientComponent; Flags: sharedfile ignoreversion
-Source: {#WOW64Dir}\icuin??.dll; DestDir: {app}\WOW64; Components: ClientComponent; Flags: sharedfile ignoreversion
-Source: {#WOW64Dir}\icudt??.dll; DestDir: {app}\WOW64; Components: ClientComponent; Flags: sharedfile ignoreversion
-Source: {#WOW64Dir}\icudt*.dat;  DestDir: {app}\WOW64; Components: ClientComponent; Flags: sharedfile ignoreversion
+Source: {#WOW64Dir}\icuuc??.dll; DestDir: {app}\WOW64; Components: ClientComponent; Flags: sharedfile ignoreversion {#SkipFileIfDevStatus}
+Source: {#WOW64Dir}\icuin??.dll; DestDir: {app}\WOW64; Components: ClientComponent; Flags: sharedfile ignoreversion {#SkipFileIfDevStatus}
+Source: {#WOW64Dir}\icudt??.dll; DestDir: {app}\WOW64; Components: ClientComponent; Flags: sharedfile ignoreversion {#SkipFileIfDevStatus}
+Source: {#WOW64Dir}\icudt*.dat;  DestDir: {app}\WOW64; Components: ClientComponent; Flags: sharedfile ignoreversion {#SkipFileIfDevStatus}
 #endif
 
 #if PlatformTarget =="Win32"
@@ -512,7 +522,7 @@ Source: {#FilesDir}\fbrmclib.dll; DestDir: {app}; Components: ServerComponent; F
 
 Source: {#FilesDir}\zlib1.dll; DestDir: {app}; Components: ClientComponent; Flags: sharedfile ignoreversion
 #if PlatformTarget == "x64"
-Source: {#WOW64Dir}\zlib1.dll; DestDir: {app}\WOW64; Components: ClientComponent; Flags: sharedfile ignoreversion
+Source: {#WOW64Dir}\zlib1.dll; DestDir: {app}\WOW64; Components: ClientComponent; Flags: sharedfile ignoreversion {#SkipFileIfDevStatus}
 #endif
 
 ;Rules for installation of MS runtimes are simplified with MSVC10
@@ -549,7 +559,7 @@ Source: {#FilesDir}\doc\sql.extensions\*.*; DestDir: {app}\doc\sql.extensions; C
 Source: {#FilesDir}\include\*.*; DestDir: {app}\include; Components: DevAdminComponent; Flags: ignoreversion recursesubdirs createallsubdirs;
 Source: {#FilesDir}\intl\fbintl.dll; DestDir: {app}\intl; Components: ServerComponent; Flags: sharedfile ignoreversion;
 Source: {#FilesDir}\intl\fbintl.conf; DestDir: {app}\intl; Components: ServerComponent; Flags: onlyifdoesntexist
-Source: {#FilesDir}\lib\*.*; DestDir: {app}\lib; Components: DevAdminComponent; Flags: ignoreversion;
+Source: {#FilesDir}\lib\*.lib; DestDir: {app}\lib; Components: DevAdminComponent; Flags: ignoreversion;
 #if PlatformTarget == "x64"
 Source: {#WOW64Dir}\lib\*.lib; DestDir: {app}\WOW64\lib; Components: DevAdminComponent; Flags: ignoreversion {#SkipFileIfDevStatus}
 #endif
@@ -566,7 +576,7 @@ Source: {#FilesDir}\plugins\chacha.dll; DestDir: {app}\plugins; Components: Clie
 Source: {#FilesDir}\plugins\*.conf; DestDir: {app}\plugins; Components: ServerComponent; Flags: ignoreversion;
 Source: {#FilesDir}\plugins\udr\*.*; DestDir: {app}\plugins\udr; Components: ServerComponent; Flags: ignoreversion;
 #if PlatformTarget == "x64"
-Source: {#WOW64Dir}\plugins\chacha*.dll; DestDir: {app}\WOW64\plugins; Components: ClientComponent; Flags: ignoreversion;
+Source: {#WOW64Dir}\plugins\chacha*.dll; DestDir: {app}\WOW64\plugins; Components: ClientComponent; Flags: ignoreversion {#SkipFileIfDevStatus};
 #endif
 
 Source: {#FilesDir}\misc\*.*; DestDir: {app}\misc; Components: ServerComponent; Flags: ignoreversion createallsubdirs recursesubdirs ;
@@ -588,7 +598,7 @@ Source: {#FilesDir}\gfix.pdb; DestDir: {app}; Components: DevAdminComponent;
 Source: {#FilesDir}\isql.pdb; DestDir: {app}; Components: ClientComponent;
 Source: {#FilesDir}\plugins\*.pdb; DestDir: {app}\plugins; Components: ServerComponent;
 #if PlatformTarget == "x64"
-Source: {#WOW64Dir}\fbclient.pdb; DestDir: {app}\WOW64; Components: ClientComponent;
+Source: {#WOW64Dir}\fbclient.pdb; DestDir: {app}\WOW64; Components: ClientComponent; Flags: {#SkipFileIfDevStatus};
 #endif
 #endif
 

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

@@ -1,6 +1,6 @@
 @echo off
 
-@call setenvvar.bat
+@call setenvvar.bat %*
 @if errorlevel 1 (goto :END)
 
 set FB_CLEAN_SHARED=

builds/win32/clean_all.bat

@@ -1,15 +1,14 @@
 @echo off
 
-@call setenvvar.bat
+@call setenvvar.bat %*
 @if errorlevel 1 (goto :END)
-@if not defined FB_BIN_DIR (@call set_build_target.bat %*)
 
 @echo Building build_msg (%FB_OBJ_DIR%)...
 @call compile.bat builds\win32\%VS_VER%\FirebirdBoot build_msg_%FB_TARGET_PLATFORM%.log build_msg
 @if errorlevel 1 (goto :END)
 
 @echo Building message file...
-@%FB_BIN_DIR%\build_msg -f %FB_GEN_DB_DIR%\firebird.msg -c %FB_OUTPUT_DIR%\include\firebird\impl\iberror_c.h
+@%FB_BOOT_BIN_DIR%\build_msg -f %FB_GEN_DB_DIR%\firebird.msg -c %FB_OUTPUT_DIR%\include\firebird\impl\iberror_c.h
 @copy %FB_GEN_DIR%\firebird.msg %FB_BIN_DIR% > nul
 
 :END