Merge branch 'master' into alter_constraint

Author: aafemt

.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 python@3.12
-          [ -e /Library/Frameworks/Python.framework ] && \
-            sudo mv /Library/Frameworks/Python.framework /Library/Frameworks/Python.framework.dont-look-at-this
-          brew install python@3.11
-          ln -s "$(brew --prefix python@3.11)/bin/python3" "$(brew --prefix python@3.11)/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 python@3.11)/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

@@ -397,12 +397,10 @@ for %%v in (IPLicense.txt IDPLicense.txt ) 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 :ERROR Copying ib_util.h 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
 @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