Merge branch 'v5.0-release' into v5_zero_length_sql_in_trace

Author: Noremos

.github/workflows/main.yml

@@ -156,14 +156,13 @@ jobs:
     if: github.ref_type != 'tag'
     runs-on: ${{ matrix.os }}
     env:
-      VS_VERSION: ${{ (matrix.os == 'windows-2019' && '2019' || (matrix.os == 'windows-2022' && '2022' || '')) }}
+      VS_VERSION: 2022
 
     strategy:
       fail-fast: false
       matrix:
         os:
-          - windows-2022
-          - windows-2019
+          - windows-2025
         platform: [x64, x86]
 
     steps:
@@ -186,7 +185,7 @@ jobs:
         shell: cmd
         env:
           PLATFORM: ${{ matrix.platform }}
-          VS_SCRIPT: ${{ matrix.os == 'windows-2022' && 'C:\Program Files\Microsoft Visual Studio\%VS_VERSION%\Enterprise\Common7\Tools\VsDevCmd.bat' || 'C:\Program Files (x86)\Microsoft Visual Studio\%VS_VERSION%\Enterprise\Common7\Tools\VsDevCmd.bat' }}
+          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
@@ -290,8 +289,6 @@ jobs:
   build-macos:
     name: build-macos-${{ matrix.arch }}
     runs-on: ${{ (matrix.arch == 'arm64' && 'macos-14') || 'macos-13' }}
-    env:
-      VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
 
     strategy:
       fail-fast: false
@@ -312,14 +309,16 @@ jobs:
 
       - name: Prepare - Install tools
         run: |
-          brew install automake autoconf-archive cmake libtool ninja python-setuptools
+          brew install --quiet automake autoconf-archive libtool ninja python-setuptools
 
-      - name: Export GitHub Actions cache environment variables
-        uses: actions/github-script@v7
+      - name: Restore vcpkg cache
+        uses: actions/cache/restore@v4
+        id: restore-vcpkg-cache
         with:
-          script: |
-            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+          path: ~/.cache/vcpkg/archives
+          key: vcpkg-cache-${{ runner.os }}-${{ matrix.arch }}-${{ hashFiles('vcpkg-custom/**', 'vcpkg.json', 'vcpkg-configuration.json') }}
+          restore-keys: |
+            vcpkg-cache-${{ runner.os }}-${{ matrix.arch }}-
 
       - name: Build
         run: |
@@ -348,6 +347,14 @@ jobs:
           mkdir gen/artifacts
           mv gen/Release/*.pkg gen/artifacts
 
+      - name: Save vcpkg cache
+        uses: actions/cache/save@v4
+        # Saves if the key changed (hashes on vcpkg/**, vcpkg.json, vcpkg-configuration.json)
+        if: steps.restore-vcpkg-cache.outputs.cache-hit != 'true'
+        with:
+          path: ~/.cache/vcpkg/archives
+          key: ${{ steps.restore-vcpkg-cache.outputs.cache-primary-key }}
+
       - name: Upload installer
         uses: actions/upload-artifact@v4
         with:

CHANGELOG.md

@@ -85,7 +85,7 @@ getInitScriptLocation() {
 #  stop super server if it is running
 
 stopSuperServerIfRunning() {
-    checkString=`ps -eaf | egrep "\b(fbserver|fbguard)\b" |grep -v grep`
+    checkString=`ps -eaf | grep -E "\b(fbserver|fbguard)\b" |grep -v grep`
 
     if [ ! -z "$checkString" ]
     then

builds/install/arch-specific/aix/misc/aixLibrary.sh.in

@@ -107,7 +107,7 @@ getInitScriptLocation() {
 #  stop super server if it is running
 
 stopSuperServerIfRunning() {
-    checkString=`ps -af | egrep "\b(fbserver|fbguard|fb_smp_server)\b" |grep -v grep`
+    checkString=`ps -af | grep -E "\b(fbserver|fbguard|fb_smp_server)\b" |grep -v grep`
 
     if [ ! -z "$checkString" ]
     then
@@ -120,7 +120,7 @@ stopSuperServerIfRunning() {
 			do
        	    	$init_d stop
 				sleep 1
-				checkString=`ps -eaf | egrep "\b(fbserver|fbguard|fb_smp_server)\b" |grep -v grep`
+				checkString=`ps -eaf | grep -E "\b(fbserver|fbguard|fb_smp_server)\b" |grep -v grep`
 				if [ -z "$checkString" ]
 				then
 					return
@@ -211,7 +211,7 @@ startService() {
     then
 		"$InitFile" start
 
-		checkString=`ps -af | egrep "\b(fbserver|fb_smp_server)\b" |grep -v grep`
+		checkString=`ps -af | grep -E "\b(fbserver|fb_smp_server)\b" |grep -v grep`
 		if [ -z "$checkString" ]
 		then
 			# server didn't start - possible reason bad shell /bin/false for user "firebird"

builds/install/arch-specific/freebsd/freebsdLibrary.sh.in

@@ -79,7 +79,7 @@ getInitScriptLocation() {
 #  stop super server if it is running
 
 stopSuperServerIfRunning() {
-    checkString=`ps -eaf | egrep "\b(fbserver|fbguard)\b" |grep -v grep`
+    checkString=`ps -eaf | grep -E "\b(fbserver|fbguard)\b" |grep -v grep`
 
     if [ ! -z "$checkString" ]
     then

builds/install/arch-specific/hpux/misc/hpuxLibrary.sh.in

@@ -21,7 +21,7 @@
 
 	stopServerIfRunning() {
 
-	    checkString=`ps -ef | egrep "(fbserver|fbguard)" |grep -v grep`
+	    checkString=`ps -ef | grep -E "(fbserver|fbguard)" |grep -v grep`
 
 	    if [ ! -z "$checkString" ] 
 	      then
@@ -42,7 +42,7 @@
 	    stopServerIfRunning
 
 
-	    checkString=`ps -ef | egrep "(fbserver|fbguard)" |grep -v grep`
+	    checkString=`ps -ef | grep -E "(fbserver|fbguard)" |grep -v grep`
 
 	    if [ ! -z "$checkString" ] 
 	      then
@@ -54,7 +54,7 @@
 
 
 
-	    checkString=`ps -ef | egrep "(fb_inet_server|fb_smp_server)" |grep -v grep`
+	    checkString=`ps -ef | grep -E "(fb_inet_server|fb_smp_server)" |grep -v grep`
 
 	    if [ ! -z "$checkString" ] 
 	      then
@@ -67,7 +67,7 @@
 
 # Stop lock manager if it is the only thing running.
 
-	    for i in `ps -ef | egrep "fb_lock_mgr" | awk '{print $2}' `
+	    for i in `ps -ef | grep -E "fb_lock_mgr" | awk '{print $2}' `
 	     do
 		kill $i
 	     done

builds/install/arch-specific/hpux/super/preInstall.sh.in

@@ -5,7 +5,7 @@
 
 
 stopServerIfRunning() {
-    checkString=`ps -ef | egrep "(fbserver|fbguard)" |grep -v grep`
+    checkString=`ps -ef | grep -E "(fbserver|fbguard)" |grep -v grep`
 
     if [ ! -z "$checkString" ] 
       then
@@ -16,7 +16,7 @@ stopServerIfRunning() {
       fi
     fi
 
-    checkString=`ps -ef | egrep "(fbserver|fbguard)" |grep -v grep`
+    checkString=`ps -ef | grep -E "(fbserver|fbguard)" |grep -v grep`
     if [ ! -z "$checkString" ] 
       then
 	  # careful shutdown of server failed :)

builds/install/arch-specific/hpux/super/preUninstall.sh.in

@@ -61,7 +61,7 @@ addLibs() {
 	[ "$LIB" ] && echo "export LIBTOMMATH=$LIB" >>$libTarget
 	LIB=`$OBJDUMP -p $libSdir/firebird|grep NEEDED|grep tomcrypt|awk '{print $2;}'`
 	[ "$LIB" ] && echo "export LIBTOMCRYPT=$LIB" >>$libTarget
-	LIB=$(echo `$OBJDUMP -p $libSdir/isql|grep NEEDED|egrep "(curses|termcap|tinfo)"|awk '{print $2;}'`)
+	LIB=$(echo `$OBJDUMP -p $libSdir/isql|grep NEEDED|grep -E "(curses|termcap|tinfo)"|awk '{print $2;}'`)
 	[ "$LIB" ] && echo "export LIBCURSES='$LIB'" >>$libTarget
 	echo >>$libTarget
 

builds/install/arch-specific/linux/makeInstallImage.sh.in

@@ -163,7 +163,7 @@ if "%FB2_SNAPSHOT%"=="1" (
 )
 
 :: Set up our final destination
-set FBBUILD_INSTALL_IMAGES=%FB_ROOT_PATH%\builds\install_images
+@set FBBUILD_INSTALL_IMAGES=%FB_ROOT_PATH%\builds\install_images
 @if not exist "%FBBUILD_INSTALL_IMAGES%" ( mkdir "%FBBUILD_INSTALL_IMAGES%" )
 
 :: Determine Product Status
@@ -173,10 +173,6 @@ set FBBUILD_INSTALL_IMAGES=%FB_ROOT_PATH%\builds\install_images
   set FBBUILD_PROD_STATUS=DEV
 )
 
-:: if we do not have any external documentation we should not mark the build as production
-if not defined FB_EXTERNAL_DOCS set FBBUILD_PROD_STATUS=DEV
-
-
 @if "%FB_TARGET_PLATFORM%"=="x64" (
   set FBBUILD_FILE_ID=%PRODUCT_VER_STRING%-%FBBUILD_PACKAGE_NUMBER%%FBBUILD_FILENAME_SUFFIX%-windows-x64
 ) else (
@@ -232,14 +228,18 @@ if not defined FB_EXTERNAL_DOCS set FBBUILD_PROD_STATUS=DEV
 :: these version numbers. %MSVC_RUNTIME_FILE_VERSION% should represent 140.
 :: %MSVC_RUNTIME_LIBRARY_VERSION% is based on the Visual Studio version used.
 :: These variables are set in setenvvar.bat.
-@for %%f in ( msvcp%MSVC_RUNTIME_FILE_VERSION%.dll vcruntime%MSVC_RUNTIME_FILE_VERSION%.dll  ) do (
+:: Note 2: 32-bit vcruntime140_1.dll does not exist, hence the test for file existence
+@for %%f in ( msvcp%MSVC_RUNTIME_FILE_VERSION%.dll msvcp%MSVC_RUNTIME_FILE_VERSION%_1.dll vcruntime%MSVC_RUNTIME_FILE_VERSION%.dll vcruntime%MSVC_RUNTIME_FILE_VERSION%_1.dll ) do (
+  if exist "%VCToolsRedistDir%\%VSCMD_ARG_TGT_ARCH%\Microsoft.VC%MSVC_RUNTIME_LIBRARY_VERSION%.CRT\%%f" (
     echo   Copying "%VCToolsRedistDir%\%VSCMD_ARG_TGT_ARCH%\Microsoft.VC%MSVC_RUNTIME_LIBRARY_VERSION%.CRT\%%f"
     copy  "%VCToolsRedistDir%\%VSCMD_ARG_TGT_ARCH%\Microsoft.VC%MSVC_RUNTIME_LIBRARY_VERSION%.CRT\%%f" %FB_OUTPUT_DIR%\ >nul
     if ERRORLEVEL 1 (
-    call :ERROR Copying "%VCToolsRedistDir%\%VSCMD_ARG_TGT_ARCH%\Microsoft.VC%MSVC_RUNTIME_LIBRARY_VERSION%.CRT\%%f" failed with error %ERRLEV%  & goto :EOF
+      call :ERROR Copying "%VCToolsRedistDir%\%VSCMD_ARG_TGT_ARCH%\Microsoft.VC%MSVC_RUNTIME_LIBRARY_VERSION%.CRT\%%f" failed with error %ERRLEV%  & goto :EOF
     )
+  )
 )
 
+
 @if "%VSCMD_ARG_TGT_ARCH%"=="x86" (
   echo     Generating fbclient_bor.lib
   where /Q implib.exe
@@ -250,19 +250,31 @@ if not defined FB_EXTERNAL_DOCS set FBBUILD_PROD_STATUS=DEV
   )
 )
 
+
 @if "%FBBUILD_SHIP_PDB%"=="ship_pdb" (
   echo   Copying pdb files...
+  copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\chacha\chacha.pdb %FB_OUTPUT_DIR%\plugins\ > nul
+  copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\default_profiler\default_profiler.pdb %FB_OUTPUT_DIR%\plugins\ > nul
+  copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\engine\engine*.pdb %FB_OUTPUT_DIR%\plugins\ > nul
+  copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\fb_lock_print\fb_lock_print.pdb %FB_OUTPUT_DIR%\ > nul
   copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\fbserver\firebird.pdb %FB_OUTPUT_DIR%\ > nul
-  copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\burp\burp.pdb %FB_OUTPUT_DIR%\gbak.pdb > nul
+  copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\fbsvcmgr\fbsvcmgr.pdb %FB_OUTPUT_DIR%\ > nul
+  copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\fbtrace\fbtrace.pdb %FB_OUTPUT_DIR%\plugins\ > nul
+  copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\fbtracemgr\fbtracemgr.pdb %FB_OUTPUT_DIR%\ > nul
+  copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\gbak\gbak.pdb %FB_OUTPUT_DIR%\ > nul
   copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\gfix\gfix.pdb %FB_OUTPUT_DIR%\ > nul
+  copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\gstat\gstat.pdb %FB_OUTPUT_DIR%\ > nul
+  copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\ib_util\ib_util.pdb %FB_OUTPUT_DIR%\ > nul
+  copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\intl\fbintl.pdb %FB_OUTPUT_DIR%\intl\ > nul
   copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\isql\isql.pdb %FB_OUTPUT_DIR%\ > nul
-  copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\yvalve\fbclient.pdb %FB_OUTPUT_DIR%\ > nul
-  copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\engine\engine*.pdb %FB_OUTPUT_DIR%\plugins\ > nul
-  copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\fbtrace\fbtrace.pdb %FB_OUTPUT_DIR%\plugins\ > nul
   copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\legacy_auth\legacy_auth.pdb %FB_OUTPUT_DIR%\plugins\ > nul
   copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\legacy_usermanager\legacy_usermanager.pdb %FB_OUTPUT_DIR%\plugins\ > nul
+  copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\nbackup\nbackup.pdb %FB_OUTPUT_DIR%\ > nul
   copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\srp\srp.pdb %FB_OUTPUT_DIR%\plugins\ > nul
+  copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\udf_compat\udf_compat.pdb %FB_OUTPUT_DIR%\plugins\udr\ > nul
+  copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\udrcpp_example\udrcpp_example.pdb %FB_OUTPUT_DIR%\plugins\udr\ > nul
   copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\udr_engine\udr_engine.pdb %FB_OUTPUT_DIR%\plugins\ > nul
+  copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\yvalve\fbclient.pdb %FB_OUTPUT_DIR%\ > nul
 )
 
 @echo   Started copying docs...
@@ -387,8 +399,9 @@ for %%v in (IPLicense.txt IDPLicense.txt ) do (
         call :ERROR Could not generate MSVCC Runtime MSI %MSVC_RUNTIME_LIBRARY_VERSION% & goto :EOF
       )
     )
-) else (
-  echo   Using an existing build of %FB_OUTPUT_DIR%\system32\vccrt%MSVC_RUNTIME_LIBRARY_VERSION%_%FB_TARGET_PLATFORM%.msi
+  ) else (
+    echo   Using an existing build of %FB_OUTPUT_DIR%\system32\vccrt%MSVC_RUNTIME_LIBRARY_VERSION%_%FB_TARGET_PLATFORM%.msi
+  )
 )
 
 ::End of BUILD_CRT_MSI

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

@@ -544,12 +544,12 @@ Source: {#WOW64Dir}\zlib1.dll; DestDir: {app}\WOW64; Components: ClientComponent
 ;We just install the runtimes into the install dir.
 
 #if Int(msvc_runtime_major_version,14) >= 14
-Source: {#FilesDir}\{#msvcr_filename}{#msvc_runtime_file_version}.dll; DestDir: {app}; Components: ClientComponent; Flags: sharedfile;
-Source: {#FilesDir}\msvcp{#msvc_runtime_file_version}.dll; DestDir: {app}; Components: ClientComponent; Flags: sharedfile;
+Source: {#FilesDir}\{#msvcr_filename}{#msvc_runtime_file_version}*.dll; DestDir: {app}; Components: ClientComponent; Flags: sharedfile;
+Source: {#FilesDir}\msvcp{#msvc_runtime_file_version}*.dll; DestDir: {app}; Components: ClientComponent; Flags: sharedfile;
 #if PlatformTarget == "x64"
 ;If we are installing on x64 we need some 32-bit libraries for compatibility with 32-bit applications
-Source: {#WOW64Dir}\{#msvcr_filename}{#msvc_runtime_file_version}.dll; DestDir: {app}\WOW64; Components: ClientComponent; Flags: sharedfile;
-Source: {#WOW64Dir}\msvcp{#msvc_runtime_file_version}.dll; DestDir: {app}\WOW64; Components: ClientComponent; Flags: sharedfile;
+Source: {#WOW64Dir}\{#msvcr_filename}{#msvc_runtime_file_version}*.dll; DestDir: {app}\WOW64; Components: ClientComponent; Flags: sharedfile;
+Source: {#WOW64Dir}\msvcp{#msvc_runtime_file_version}*.dll; DestDir: {app}\WOW64; Components: ClientComponent; Flags: sharedfile;
 #endif
 #endif  /* #if Int(msvc_runtime_major_version,14) >= 10 */
 
@@ -607,9 +607,13 @@ Source: {#FilesDir}\examples\*.*; DestDir: {app}\examples; Components: DevAdminC
 #ifdef ship_pdb
 Source: {#FilesDir}\fbclient.pdb; DestDir: {app}; Components: ClientComponent;
 Source: {#FilesDir}\firebird.pdb; DestDir: {app}; Components: ServerComponent;
+Source: {#FilesDir}\fbtracemgr.pdb; DestDir: {app}; Components: DevAdminComponent;
+Source: {#FilesDir}\intl\fbintl.pdb; DestDir: {app}\intl; Components: DevAdminComponent;
 Source: {#FilesDir}\gbak.pdb; DestDir: {app}; Components: DevAdminComponent;
 Source: {#FilesDir}\gfix.pdb; DestDir: {app}; Components: DevAdminComponent;
+Source: {#FilesDir}\ib_util.pdb; DestDir: {app}; Components: ServerComponent;
 Source: {#FilesDir}\isql.pdb; DestDir: {app}; Components: ClientComponent;
+Source: {#FilesDir}\nbackup.pdb; DestDir: {app}; Components: DevAdminComponent;
 Source: {#FilesDir}\plugins\*.pdb; DestDir: {app}\plugins; Components: ServerComponent;
 #if PlatformTarget == "x64"
 Source: {#WOW64Dir}\fbclient.pdb; DestDir: {app}\WOW64; Components: ClientComponent;
@@ -718,8 +722,8 @@ begin
   if ((pos('HELP',Uppercase(CommandLine)) > 0) or
     (pos('--',Uppercase(CommandLine)) > 0) )
 //	or
-//    (pos('/?',Uppercase(CommandLine)) > 0) or		// InnoSetup displays its own help if these switches are passed.
-//    (pos('/H',Uppercase(CommandLine)) > 0) ) 		// Note also that our help scren only appears after the Choose Language dialogue :-(
+//    (pos('/?',Uppercase(CommandLine)) > 0) or     // InnoSetup displays its own help if these switches are passed.
+//    (pos('/H',Uppercase(CommandLine)) > 0) )      // Note also that our help screen only appears after the Choose Language dialogue :-(
   then begin
     ShowHelpDlg;
     result := False;