Merge branch 'firebird_master' into port2firebird_tablespaces2

Author: Alexander Zhdanov

.github/workflows/main.yml

@@ -289,7 +289,9 @@ jobs:
 
   build-macos:
     name: build-macos-${{ matrix.arch }}
-    runs-on: ${{ (matrix.arch == 'arm64' && 'macos-14') || 'macos-12' }}
+    runs-on: ${{ (matrix.arch == 'arm64' && 'macos-14') || 'macos-13' }}
+    env:
+      VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
 
     strategy:
       fail-fast: false
@@ -312,27 +314,17 @@ jobs:
         run: |
           brew install automake autoconf-archive cmake libtool ninja
 
-      # libcxx build is not working with python >= 3.12
-      - name: Do not use preinstalled python >= 3.12
-        run: |
-          brew uninstall --ignore-dependencies [email protected]
-          [ -e /Library/Frameworks/Python.framework ] && \
-            sudo mv /Library/Frameworks/Python.framework /Library/Frameworks/Python.framework.dont-look-at-this
-          brew install [email protected]
-          ln -s "$(brew --prefix [email protected])/bin/python3" "$(brew --prefix [email protected])/bin/python"
-
-      - name: Cache - vcpkg
-        uses: actions/cache@v4
+      - name: Export GitHub Actions cache environment variables
+        uses: actions/github-script@v7
         with:
-          key: ${{ runner.os }}-vcpkg-0
-          path: |
-            $HOME/.cache/vcpkg/archives
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
 
       - name: Build
         run: |
           export LIBTOOLIZE=glibtoolize
           export LIBTOOL=glibtool
-          export PATH="$(brew --prefix [email protected])/bin:$PATH"
 
           ./autogen.sh --with-builtin-tommath --with-builtin-tomcrypt
           make -j4

.github/workflows/tzdata-update.yml

@@ -18,7 +18,7 @@ jobs:
           - v4.0-release
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ matrix.branch }}
 

.vscode/c_cpp_properties.json

@@ -3,7 +3,10 @@
         {
             "name": "Linux",
             "includePath": [
-                "${workspaceFolder}/**"
+                "${workspaceFolder}/src/include/gen",
+                "${workspaceFolder}/src/include",
+                "${workspaceFolder}/extern/boost",
+                "${workspaceFolder}/extern/libcds"
             ],
             "defines": [
                 "DEV_BUILD"

.vscode/settings.json

@@ -8,11 +8,16 @@
 	"[markdown]": {
 		"files.trimTrailingWhitespace": false
 	},
+	"files.readonlyInclude": {
+		"temp/**": true
+	},
 
 	"files.insertFinalNewline": true,
-
-	"files.exclude": {
-		"temp": true,
-		"gen": true
+	"files.associations": {
+		"*.epp": "cpp"
+	},
+	"search.exclude": {
+		"temp/**": true,
+		"gen/**": true
 	}
 }

builds/install/arch-specific/android/BuildFinalPackage.sh

@@ -43,7 +43,7 @@ $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "rm -rf $AndroidDir
 $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "mkdir $AndroidDir"
 $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName push gen/$InitialDebugTar $AndroidDir/
 $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "(cd $AndroidDir && tar xvf $InitialDebugTar)"
-$ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "(cd $AndroidDir/firebird && ./common_test --log_level=all && ./libEngine13_test --log_level=all)"
+$ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "(cd $AndroidDir/firebird && ./common_test --log_level=all && ./libEngine14_test --log_level=all)"
 $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "(cd $AndroidDir/firebird && ./AfterUntar.sh)"
 $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName pull $AndroidDir/firebird/firebird.msg gen/Release/firebird/
 $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName pull $AndroidDir/firebird/security6.fdb gen/Release/firebird/

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

@@ -248,9 +248,8 @@ copyFiles() {
 
 	#include (.h .pas files)
 	cp $BuiltFBDir/include/*.h ${TargetDir}@FB_INCDIR@
-	cp $BuiltFBDir/include/firebird/impl/iberror_c.h ${TargetDir}@FB_INCDIR@/firebird/impl
-	cp $BuildRootDir/src/include/firebird/*.h ${TargetDir}@FB_INCDIR@/firebird
-	tar -C $BuildRootDir/src/include/firebird -cf - impl | tar -C ${TargetDir}@FB_INCDIR@/firebird -x
+	cp $BuiltFBDir/include/firebird/*.h ${TargetDir}@FB_INCDIR@/firebird
+	tar -C $BuiltFBDir/include/firebird -cf - impl | tar -C ${TargetDir}@FB_INCDIR@/firebird -x
 	if [ "$CLIENT_ONLY_FLG" = "N" ]; then
 		cp $BuildRootDir/src/include/gen/Firebird.pas ${TargetDir}@FB_INCDIR@/firebird
 	fi

builds/install/arch-specific/solaris/CS/prototype.in

@@ -38,7 +38,6 @@ s none /usr/lib/libfbclient.so.2=@prefix@/lib/libfbclient.so.2
 
 d none @prefix@/include 0751 firebird firebird
 f none @prefix@/include/ib_util.h=$SRCDIR/include/ib_util.h 0444 firebird firebird
-f none @prefix@/include/perf.h=$SRCDIR/include/perf.h 0444 firebird firebird
 f none @prefix@/include/iberror.h=$SRCDIR/include/iberror.h 0444 firebird firebird
 f none @prefix@/include/ibase.h=$SRCDIR/include/ibase.h 0444 firebird firebird
 

builds/install/arch-specific/solaris/SS/prototype.in

@@ -38,7 +38,6 @@ s none /usr/lib/libfbclient.so.2=@prefix@/lib/libfbclient.so.2
 
 d none @prefix@/include 0755 firebird firebird
 f none @prefix@/include/ib_util.h=$SRCDIR/include/ib_util.h 0644 firebird firebird
-f none @prefix@/include/perf.h=$SRCDIR/include/perf.h 0644 firebird firebird
 f none @prefix@/include/iberror.h=$SRCDIR/include/iberror.h 0644 firebird firebird
 f none @prefix@/include/ibase.h=$SRCDIR/include/ibase.h 0644 firebird firebird
 

builds/install/arch-specific/solx86gcc/CS/prototype.in

@@ -108,7 +108,6 @@ f none @prefix@/include/blr.h=$SRCDIR/include/blr.h  0644 root root
 f none @prefix@/include/ib_util.h=$SRCDIR/include/ib_util.h  0644 root root
 f none @prefix@/include/ibase.h=$SRCDIR/include/ibase.h  0644 root root
 f none @prefix@/include/iberror.h=$SRCDIR/include/iberror.h  0644 root root
-f none @prefix@/include/perf.h=$SRCDIR/include/perf.h  0644 root root
 
 d none @prefix@/intl  0755 root root
 f none @prefix@/intl/libfbintl.so=$SRCDIR/intl/libfbintl.so  0755 root root

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

@@ -54,7 +54,7 @@ if not defined FB2_SNAPSHOT (set FB2_SNAPSHOT=0)
 
 :: Are we doing a snapshot build? If so we always do less work.
 if "%FB2_SNAPSHOT%"=="1" (
-  (set FBBUILD_ISX_PACK=0)
+  ( set FBBUILD_ISX_PACK=0 )
 )
 
 
@@ -69,14 +69,14 @@ if "%FB2_SNAPSHOT%"=="1" (
 :: let's bail out now.
 
 @echo     o Checking for sed...
-(cmd /c "sed.exe --version 2>&1 > 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 --quiet --version 2>&1 > nul" ) || ( call :ERROR Could not locate unix2dos && @goto :EOF )
+@(cmd /c "unix2dos.exe --quiet --version 2>&1 > nul" ) || ( call :ERROR Could not locate unix2dos & goto :EOF )
 
-@for /f "usebackq tokens=*" %%c in (`where /f md5sum 2^>nul`) do set MD5_COMMAND=%%c
-if defined MD5_COMMAND (
-  @echo     o POSIX md5sum utility found at %MD5_COMMAND%
+@for /f "usebackq tokens=*" %%c in ( `where /f md5sum 2^>nul` ) do set MD5_COMMAND=%%c
+@if defined MD5_COMMAND (
+  echo     o POSIX md5sum utility found at %MD5_COMMAND%
 )
 
 @if %FBBUILD_ZIP_PACK% EQU 1 (
@@ -101,8 +101,8 @@ if defined MD5_COMMAND (
   for /f "usebackq tokens=*" %%c in ( `where /f iscc 2^>nul` ) do set ISCC_COMMAND=%%c
 )
 @if not defined ISCC_COMMAND (
-  @echo  Required Inno Setup compiler not found
-  @exit /b 1
+  echo  Required Inno Setup compiler not found
+  exit /b 1
 )
 @echo     o Inno Setup found as %ISCC_COMMAND%.
 
@@ -114,17 +114,17 @@ if defined MD5_COMMAND (
   echo WiX is needed to build the MSI kits of the CRT runtimes.
   echo.
 ) else (
- echo     o WiX found at "%WIX%".
+  echo     o WiX found at "%WIX%".
 )
 
 @if not defined FB_EXTERNAL_DOCS (
- echo.
- echo The FB_EXTERNAL_DOCS environment var is not defined
- echo It should point to the directory containing the relevant release notes
- echo in adobe pdf format.
- echo.
+  echo.
+  echo The FB_EXTERNAL_DOCS environment var is not defined
+  echo It should point to the directory containing the relevant release notes
+  echo in adobe pdf format.
+  echo.
 ) else (
- echo     o Package will include documentation from "%FB_EXTERNAL_DOCS%".
+  echo     o Package will include documentation from "%FB_EXTERNAL_DOCS%".
 )
 
 
@@ -137,7 +137,7 @@ if defined MD5_COMMAND (
 ::==========
 
 :: Cut off everything that is not #define to let Inno Setup use it
-@findstr /B /L "#define" "%FB_ROOT_PATH%\src\jrd\build_no.h" >"%FB_ROOT_PATH%\gen\jrd\build_no.h"
+@findstr /B /L "#define" "%FB_ROOT_PATH%\src\jrd\build_no.h" > "%FB_ROOT_PATH%\gen\jrd\build_no.h"
 :: Read version parameters from build_no.h
 @for /F "tokens=2*" %%a in ( %FB_ROOT_PATH%\gen\jrd\build_no.h ) do (
   echo   Setting %%a to %%~b
@@ -192,7 +192,7 @@ set FBBUILD_INSTALL_IMAGES=%FB_ROOT_PATH%\builds\install_images
   %SED_COMMAND% %%f > %FB_GEN_DIR%\readmes\%%f
 )
 @for %%d in (ba cz de es fr hu it pl pt ru si ) do (
-  if not exist %FB_GEN_DIR%\readmes\%%d ( @mkdir %FB_GEN_DIR%\readmes\%%d )
+  if not exist %FB_GEN_DIR%\readmes\%%d ( mkdir %FB_GEN_DIR%\readmes\%%d )
   for %%f in ( %%d\*.txt  ) do (
     echo   Processing version strings in %%f
     %SED_COMMAND% %%f > %FB_GEN_DIR%\readmes\%%f
@@ -201,6 +201,9 @@ set FBBUILD_INSTALL_IMAGES=%FB_ROOT_PATH%\builds\install_images
 
 @endlocal
 
+:: Dump env vars to file for later testing.
+@set > %FB_ROOT_PATH%\builds\install\arch-specific\win32\test_installer\fb_build_vars_%PROCESSOR_ARCHITECTURE%.txt
+
 ::End of SET_VERSION
 ::----------------
 @goto :EOF
@@ -232,11 +235,13 @@ set FBBUILD_INSTALL_IMAGES=%FB_ROOT_PATH%\builds\install_images
     )
 )
 
-@where /Q implib.exe
-@if not ERRORLEVEL 1 (
-  if "%VSCMD_ARG_TGT_ARCH%"=="x86" (
-    echo   Generating fbclient_bor.lib
+@if "%VSCMD_ARG_TGT_ARCH%"=="x86" (
+  echo     Generating fbclient_bor.lib
+  where /Q implib.exe
+  if not ERRORLEVEL 1 (
     implib %FB_OUTPUT_DIR%\lib\fbclient_bor.lib %FB_OUTPUT_DIR%\fbclient.dll > nul
+  ) else (
+    call :WARNING implib not found
   )
 )
 
@@ -289,7 +294,7 @@ set FBBUILD_INSTALL_IMAGES=%FB_ROOT_PATH%\builds\install_images
 @mkdir %FB_OUTPUT_DIR%\doc\sql.extensions 2>nul
 @if ERRORLEVEL 2 ( ( call :ERROR MKDIR for doc\sql.extensions dir failed) & ( goto :EOF ) )
 @copy %FB_ROOT_PATH%\doc\sql.extensions\*.* %FB_OUTPUT_DIR%\doc\sql.extensions\ > nul
-@if ERRORLEVEL 1 ( ( call :ERROR Copying doc\sql.extensions failed  ) & ( goto :EOF ) )
+@if ERRORLEVEL 1 ( ( call :ERROR Copying doc\sql.extensions failed ) & ( goto :EOF ) )
 
 :: External docs aren't necessary for a snapshot build, so we don't throw
 :: an error if FB_EXTERNAL_DOCS is not defined. On the other hand,
@@ -300,15 +305,17 @@ set FBBUILD_INSTALL_IMAGES=%FB_ROOT_PATH%\builds\install_images
         echo     ... %FB_EXTERNAL_DOCS%\%%v to %FB_OUTPUT_DIR%\doc\%%v
         copy /Y %FB_EXTERNAL_DOCS%\%%v %FB_OUTPUT_DIR%\doc\%%v > nul
         if ERRORLEVEL 1 (
-            call :ERROR Copying %FB_EXTERNAL_DOCS%\%%v to %FB_OUTPUT_DIR%\doc\%%v FAILED. &  @goto :EOF
+          call :ERROR Copying %FB_EXTERNAL_DOCS%\%%v to %FB_OUTPUT_DIR%\doc\%%v FAILED. & goto :EOF
         )
     )
 
     echo   Copying optional pdf docs...
     for %%v in ( firebird-%FB_MAJOR_VER%-quickstartguide.pdf  ) do (
         echo     ... %%v
         copy /Y %FB_EXTERNAL_DOCS%\%%v %FB_OUTPUT_DIR%\doc\%%v > nul
-        if ERRORLEVEL 1 ( call :WARNING Copying %FB_EXTERNAL_DOCS%\%%v to %FB_OUTPUT_DIR%\doc\%%v FAILED. & @goto :EOF )
+        if ERRORLEVEL 1 (
+            call :WARNING Copying %FB_EXTERNAL_DOCS%\%%v to %FB_OUTPUT_DIR%\doc\%%v FAILED.
+        )
     )
 
   echo   Finished copying pdf docs...
@@ -333,7 +340,7 @@ for %%v in (IPLicense.txt IDPLicense.txt ) do (
 
 ::  Walk through all docs and transform any that are not .txt, .pdf or .html to .txt
 @echo   Setting .txt filetype to ascii docs.
-for /R %FB_OUTPUT_DIR%\doc %%v in ( * ) do (
+@for /R %FB_OUTPUT_DIR%\doc %%v in ( * ) do (
   if /I not "%%~xv" == ".md" (
     if /I not "%%~xv" == ".txt" (
       if /I not "%%~xv" == ".pdf" (
@@ -390,12 +397,10 @@ for /R %FB_OUTPUT_DIR%\doc %%v in ( * ) do (
 :: grab some missing bits'n'pieces from different parts of the source tree
 ::=========================================================================
 @echo   Copying ib_util etc
-@copy %FB_ROOT_PATH%\src\extlib\ib_util.h %FB_OUTPUT_DIR%\include > nul || (call :WARNING Copying ib_util.h failed. && @goto :EOF )
-@copy %FB_ROOT_PATH%\src\misc\pascal\ib_util.pas %FB_OUTPUT_DIR%\include > nul || (call :WARNING Copying ib_util.pas failed. && @goto :EOF )
+@copy %FB_ROOT_PATH%\src\misc\pascal\ib_util.pas %FB_OUTPUT_DIR%\include > nul || (call :ERROR Copying ib_util.pas failed. & goto :EOF )
 
 @echo   Copying other include files required for development...
-set OUTPATH=%FB_OUTPUT_DIR%\include
-@copy %FB_ROOT_PATH%\src\yvalve\perf.h %OUTPATH%\ > nul
+@set OUTPATH=%FB_OUTPUT_DIR%\include
 @copy %FB_ROOT_PATH%\src\include\gen\firebird.pas %OUTPATH%\firebird\ > nul || (@call :ERROR Failure executing copy %FB_ROOT_PATH%\src\include\gen\firebird.pas %OUTPATH%\firebird\  )
 @if ERRORLEVEL 1 goto :END
 
@@ -424,7 +429,7 @@ set OUTPATH=%FB_OUTPUT_DIR%\include
 ::=================================================================
 @if not exist %FB_OUTPUT_DIR%\firebird.msg (
     copy %FB_GEN_DIR%\firebird.msg %FB_OUTPUT_DIR%\firebird.msg > nul
-    if ERRORLEVEL 1 ( call :ERROR Could not copy firebird.msg  &  goto :EOF )
+    if ERRORLEVEL 1 ( call :ERROR Could not copy firebird.msg  & goto :EOF )
 )
 
 ::End of FB_MSG
@@ -437,7 +442,7 @@ set OUTPATH=%FB_OUTPUT_DIR%\include
 :: 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 --quiet --safe %%W || exit /b 1
+  unix2dos --safe %%W > nul 2>&1 || exit /b 1
 )
 
 ::End of SET_CRLF
@@ -627,40 +632,40 @@ popd
 
 @echo.
 @echo   Reading command-line parameters...
-@(@call :SET_PARAMS %* )
-@if ERRORLEVEL 1 (@call :ERROR Calling SET_PARAMS & goto :END)
+@(call :SET_PARAMS %* )
+@if ERRORLEVEL 1 (call :ERROR Calling SET_PARAMS & goto :END)
 
 @echo.
 @echo   Checking that all required components are available...
-@(@call :CHECK_ENVIRONMENT ) || ( @echo Error calling CHECK_ENVIRONMENT && @goto :END )
+@( call :CHECK_ENVIRONMENT ) || ( echo Error calling CHECK_ENVIRONMENT & goto :END )
 @echo.
 
 @echo   Setting version number...
-@(@call :SET_VERSION ) || (@echo Error calling SET_VERSION && @goto :END )
+@( call :SET_VERSION ) || ( echo Error calling SET_VERSION & goto :END )
 @echo.
 
 @echo   Copying additional files needed for installation, documentation etc.
-@( @call :COPY_XTRA )  || ( @echo Error calling COPY_XTRA && @goto :END )
+@( call :COPY_XTRA ) || ( echo Error calling COPY_XTRA & goto :END )
 @echo.
 
 :: WIX is not necessary for a snapshot build, so we don't throw
 :: an error if WIX is not defined. On the other hand,
 :: if it is there anyway, use it.
 @if defined WIX (
   echo   Building MSI runtimes
-  ( call :BUILD_CRT_MSI ) || ( echo Error calling BUILD_CRT_MSI & @goto :END )
+  ( call :BUILD_CRT_MSI ) || ( echo Error calling BUILD_CRT_MSI & goto :END )
   echo.
 )
 
 @echo   Prepare include directory
-@( call :INCLUDE_DIR ) || ( @echo Error calling INCLUDE_DIR & @goto :END )
+@( call :INCLUDE_DIR ) || ( echo Error calling INCLUDE_DIR & goto :END )
 @echo.
 
 @echo   Writing databases conf
-@(call :DB_CONF ) || ( echo Error calling DB_CONF & goto :END )
+@( call :DB_CONF ) || ( echo Error calling DB_CONF & goto :END )
 @echo.
 @echo   Copying firebird.msg
-@(call :FB_MSG ) || ( echo Error calling FB_MSG & goto :END )
+@( call :FB_MSG ) || ( echo Error calling FB_MSG & goto :END )
 @echo.
 
 @echo   Fix up line endings...
@@ -675,7 +680,7 @@ popd
 
 @if %FBBUILD_ISX_PACK% EQU 1 (
   echo   Now let's compile the InnoSetup scripts
-  ( call :ISX_PACK ) || ( echo Error calling ISX_PACK &  goto :END )
+  ( call :ISX_PACK ) || ( echo Error calling ISX_PACK & goto :END )
   echo.
 )
 
@@ -698,4 +703,3 @@ popd
 
 exit /b %ERRLEV%
 
-