Merge branch 'master' into work/listagg

Author: ChudaykinAlex

.github/actions/adjust-snapshot-buildno/action.yml

@@ -13,7 +13,7 @@ runs:
           )
         ) ||
         false
-      shell: bash
+      shell: sh
       run: |
         sed -i'' -e "s/SuffixKind=\(.*\)/SuffixKind=\"$(echo ${{ github.sha }} | cut -c 1-7)\"/" src/misc/writeBuildNum.sh
         mkdir gen

.github/workflows/main.yml

@@ -6,7 +6,7 @@ jobs:
 
   build-linux-ubuntu-x64-clang:
     if: github.ref_type != 'tag'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout
@@ -39,7 +39,7 @@ jobs:
 
   build-linux-docker:
     name: build-linux-docker-${{ matrix.arch }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       FB_DOCKER_PATH: ${{ (startsWith(matrix.arch, 'arm') && 'arm32-arm64') || 'x86-x64' }}
 
@@ -94,7 +94,7 @@ jobs:
 
   build-src-bundle-docker:
     name: build-src-bundle-docker
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout
@@ -122,8 +122,8 @@ jobs:
 
   build-alpine-x64:
     if: github.ref_type != 'tag'
-    runs-on: ubuntu-22.04
-    container: alpine:3.14
+    runs-on: ubuntu-24.04
+    container: alpine:3.22.1
 
     steps:
       - name: Checkout
@@ -441,7 +441,7 @@ jobs:
 
   build-android-initial:
     name: build-android-${{ matrix.arch }}-initial
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       NDK: /home/runner/Android/Ndk
       ARCH: ${{ matrix.arch }}
@@ -473,9 +473,9 @@ jobs:
         run: |
           mkdir downloads
           pushd downloads
-          curl -OL https://dl.google.com/android/repository/android-ndk-r25b-linux.zip
+          curl -OL https://dl.google.com/android/repository/android-ndk-r28c-linux.zip
           mkdir -p $NDK
-          unzip android-ndk-r25b-linux.zip -d $NDK && f=("$NDK"/*) && mv "$NDK"/*/* "$NDK" && rmdir "${f[@]}"
+          unzip android-ndk-r28c-linux.zip -d $NDK && f=("$NDK"/*) && mv "$NDK"/*/* "$NDK" && rmdir "${f[@]}"
 
       - name: Build
         run: |
@@ -546,7 +546,7 @@ jobs:
           arch: x86_64
           api-level: 30
           target: google_apis
-          ndk: 25.1.8937393
+          ndk: 28.2.13676358
           emulator-options: -no-window -noaudio -no-boot-anim -camera-back none -port 5554
           emulator-boot-timeout: 900
           script: |
@@ -559,13 +559,13 @@ jobs:
           arch: x86_64
           api-level: 30
           target: google_apis
-          ndk: 25.1.8937393
+          ndk: 28.2.13676358
           emulator-options: -no-snapshot-save -no-window -noaudio -no-boot-anim -camera-back none -port 5554
           emulator-boot-timeout: 900
           script: |
             adb wait-for-device
             adb root
-            NDK=/usr/local/lib/android/sdk/ndk/25.1.8937393 builds/install/arch-specific/android/BuildFinalPackage.sh $ARCH
+            NDK=/usr/local/lib/android/sdk/ndk/28.2.13676358 builds/install/arch-specific/android/BuildFinalPackage.sh $ARCH
 
       - name: Upload installer
         uses: actions/upload-artifact@v4
@@ -593,7 +593,7 @@ jobs:
 
   build-android-aar:
     needs: build-android-final
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout

builds/posix/make.android.arm64

@@ -6,13 +6,13 @@ endif
 
 NDK_TOOLCHAIN ?= $(NDK)/toolchains/llvm/prebuilt/linux-x86_64
 
-CROSS_PREFIX24:=$(NDK_TOOLCHAIN)/bin/aarch64-linux-android24-
+CROSS_PREFIX29:=$(NDK_TOOLCHAIN)/bin/aarch64-linux-android29-
 CROSS_PREFIX:=$(NDK_TOOLCHAIN)/bin/llvm-
 
 CROSS_FLAGS:=-I$(ROOT)/gen/cross
 
-CXX:=$(CROSS_PREFIX24)clang++
-CC:=$(CROSS_PREFIX24)clang
+CXX:=$(CROSS_PREFIX29)clang++
+CC:=$(CROSS_PREFIX29)clang
 AR:=$(CROSS_PREFIX)ar
 AS:=$(CROSS_PREFIX)as
 LD:=$(CROSS_PREFIX)ld
@@ -33,6 +33,9 @@ LIB_PLATFORM_RPATH=-Wl,-rpath,\$$ORIGIN
 LibraryFullName=$(LibraryBaseName)
 LibrarySoName=$(LibraryBaseName)
 
+# Global c++ flags: firebird needs no RTTI, choose build standard and c++ specific warnings level
+PLUSPLUS_FLAGS:= -fno-rtti -std=c++20 -Werror=delete-incomplete -Werror=return-type
+
 COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DANDROID -DARM64 -pipe -MMD -fPIC -fmessage-length=0 \
 			 -I$(ROOT)/extern/libtommath -I$(ROOT)/extern/libtomcrypt/src/headers \
 			 $(CROSS_FLAGS) -fsigned-char \
@@ -46,7 +49,7 @@ DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS)
 
 CROSS_CONFIG=android.arm64
 
-LDFLAGS += -static-libstdc++
+LDFLAGS += -static-libstdc++ -Wl,-z,max-page-size=16384
 DroidLibs := -lm -ldl -llog $(DECLIB) $(I128LIB)
 UDR_SUPPORT_LIBS :=
 

builds/posix/make.android.arme

@@ -6,13 +6,13 @@ endif
 
 NDK_TOOLCHAIN ?= $(NDK)/toolchains/llvm/prebuilt/linux-x86_64
 
-CROSS_PREFIX24:=$(NDK_TOOLCHAIN)/bin/armv7a-linux-androideabi24-
+CROSS_PREFIX29:=$(NDK_TOOLCHAIN)/bin/armv7a-linux-androideabi29-
 CROSS_PREFIX:=$(NDK_TOOLCHAIN)/bin/llvm-
 
 CROSS_FLAGS:=-I$(ROOT)/gen/cross
 
-CXX:=$(CROSS_PREFIX24)clang++
-CC:=$(CROSS_PREFIX24)clang
+CXX:=$(CROSS_PREFIX29)clang++
+CC:=$(CROSS_PREFIX29)clang
 AR:=$(CROSS_PREFIX)ar
 AS:=$(CROSS_PREFIX)as
 LD:=$(CROSS_PREFIX)ld
@@ -33,6 +33,9 @@ LIB_PLATFORM_RPATH=-Wl,-rpath,\$$ORIGIN
 LibraryFullName=$(LibraryBaseName)
 LibrarySoName=$(LibraryBaseName)
 
+# Global c++ flags: firebird needs no RTTI, choose build standard and c++ specific warnings level
+PLUSPLUS_FLAGS:= -fno-rtti -std=c++20 -Werror=delete-incomplete -Werror=return-type
+
 COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DANDROID -DARM -pipe -MMD -fPIC -fmessage-length=0 \
 			 -I$(ROOT)/extern/libtommath -I$(ROOT)/extern/libtomcrypt/src/headers \
 			 $(CROSS_FLAGS) -fsigned-char \
@@ -46,7 +49,7 @@ DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS)
 
 CROSS_CONFIG=android.arme
 
-LDFLAGS += -static-libstdc++
+LDFLAGS += -static-libstdc++ -Wl,-z,max-page-size=16384
 DroidLibs := -lm -ldl -llog $(DECLIB) $(I128LIB)
 UDR_SUPPORT_LIBS :=
 

builds/posix/make.android.x86

@@ -6,13 +6,13 @@ endif
 
 NDK_TOOLCHAIN ?= $(NDK)/toolchains/llvm/prebuilt/linux-x86_64
 
-CROSS_PREFIX24:=$(NDK_TOOLCHAIN)/bin/i686-linux-android24-
+CROSS_PREFIX29:=$(NDK_TOOLCHAIN)/bin/i686-linux-android29-
 CROSS_PREFIX:=$(NDK_TOOLCHAIN)/bin/llvm-
 
 CROSS_FLAGS:=-I$(ROOT)/gen/cross
 
-CXX:=$(CROSS_PREFIX24)clang++
-CC:=$(CROSS_PREFIX24)clang
+CXX:=$(CROSS_PREFIX29)clang++
+CC:=$(CROSS_PREFIX29)clang
 AR:=$(CROSS_PREFIX)ar
 AS:=$(CROSS_PREFIX)as
 LD:=$(CROSS_PREFIX)ld
@@ -33,6 +33,9 @@ LIB_PLATFORM_RPATH=-Wl,-rpath,\$$ORIGIN
 LibraryFullName=$(LibraryBaseName)
 LibrarySoName=$(LibraryBaseName)
 
+# Global c++ flags: firebird needs no RTTI, choose build standard and c++ specific warnings level
+PLUSPLUS_FLAGS:= -fno-rtti -std=c++20 -Werror=delete-incomplete -Werror=return-type
+
 COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DANDROID -pipe -MMD -fPIC -fmessage-length=0 \
 			 -I$(ROOT)/extern/libtommath -I$(ROOT)/extern/libtomcrypt/src/headers \
 			 $(CROSS_FLAGS) \
@@ -46,7 +49,7 @@ DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS)
 
 CROSS_CONFIG=android.x86
 
-LDFLAGS += -static-libstdc++
+LDFLAGS += -static-libstdc++ -Wl,-z,max-page-size=16384
 DroidLibs := -lm -ldl -llog $(DECLIB) $(I128LIB)
 UDR_SUPPORT_LIBS :=
 

builds/posix/make.android.x86_64

@@ -6,13 +6,13 @@ endif
 
 NDK_TOOLCHAIN ?= $(NDK)/toolchains/llvm/prebuilt/linux-x86_64
 
-CROSS_PREFIX24:=$(NDK_TOOLCHAIN)/bin/x86_64-linux-android24-
+CROSS_PREFIX29:=$(NDK_TOOLCHAIN)/bin/x86_64-linux-android29-
 CROSS_PREFIX:=$(NDK_TOOLCHAIN)/bin/llvm-
 
 CROSS_FLAGS:=-I$(ROOT)/gen/cross
 
-CXX:=$(CROSS_PREFIX24)clang++
-CC:=$(CROSS_PREFIX24)clang
+CXX:=$(CROSS_PREFIX29)clang++
+CC:=$(CROSS_PREFIX29)clang
 AR:=$(CROSS_PREFIX)ar
 AS:=$(CROSS_PREFIX)as
 LD:=$(CROSS_PREFIX)ld
@@ -33,6 +33,9 @@ LIB_PLATFORM_RPATH=-Wl,-rpath,\$$ORIGIN
 LibraryFullName=$(LibraryBaseName)
 LibrarySoName=$(LibraryBaseName)
 
+# Global c++ flags: firebird needs no RTTI, choose build standard and c++ specific warnings level
+PLUSPLUS_FLAGS:= -fno-rtti -std=c++20 -Werror=delete-incomplete -Werror=return-type
+
 COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DANDROID -DAMD64 -pipe -MMD -fPIC -fmessage-length=0 \
 			 -I$(ROOT)/extern/libtommath -I$(ROOT)/extern/libtomcrypt/src/headers \
 			 $(CROSS_FLAGS) \
@@ -46,7 +49,7 @@ DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS)
 
 CROSS_CONFIG=android.x86_64
 
-LDFLAGS += -static-libstdc++
+LDFLAGS += -static-libstdc++ -Wl,-z,max-page-size=16384
 DroidLibs := -lm -ldl -llog $(DECLIB) $(I128LIB)
 UDR_SUPPORT_LIBS :=
 

builds/posix/make.shared.variables

@@ -39,7 +39,8 @@ AllObjects += $(Common_Objects)
 # Common test files
 COT1:= $(call dirObjects,common/tests)
 COT2:= $(call dirObjects,common/classes/tests)
-Common_Test_Objects:= $(COT1) $(COT2) $(call makeObjects,yvalve,gds.cpp)
+COT3:= $(call dirObjects,common/ipc/tests)
+Common_Test_Objects:= $(COT1) $(COT2) $(COT3) $(call makeObjects,yvalve,gds.cpp)
 
 AllObjects += $(Common_Test_Objects)
 
@@ -91,7 +92,7 @@ Engine_Objects:= $(call dirObjects,jrd) $(call dirObjects,dsql) $(call dirObject
 				 $(call dirObjects,jrd/sys-packages) $(call dirObjects,jrd/trace) \
 				 $(call makeObjects,lock,lock.cpp)
 
-Engine_Test_Objects:= $(call dirObjects,jrd/tests)
+Engine_Test_Objects:= $(call dirObjects,jrd/tests) $(call dirObjects,lock/tests)
 
 AllObjects += $(Engine_Objects) $(Engine_Test_Objects)
 

builds/posix/prefix.linux_arm64

@@ -23,5 +23,5 @@
 #PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DLINUX -pipe -MMD -fPIC
 #DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch
 
-PROD_FLAGS=-O3 -DLINUX -DARM64 -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0
-DEV_FLAGS=-ggdb -DLINUX -DARM64 -pipe -p -MMD -fPIC -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor
+PROD_FLAGS=-O3 -DLINUX -DARM64 -pipe -MMD -fPIC -fsigned-char -fmessage-length=0
+DEV_FLAGS=-ggdb -DLINUX -DARM64 -pipe -MMD -fPIC -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor

builds/win32/defs/compatibility.manifest

@@ -0,0 +1,19 @@
+<!-- compatibility.manifest -->
+<!-- see https://learn.microsoft.com/en-us/windows/win32/sysinfo/targeting-your-application-at-windows-8-1 -->
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+        <application>
+            <!-- Windows 10 and Windows 11 -->
+            <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+            <!-- Windows 8.1 -->
+            <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+            <!-- Windows 8 -->
+            <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+            <!-- Windows 7 -->
+            <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+            <!-- Windows Vista -->
+            <!-- supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/ --> 
+        </application>
+    </compatibility>
+</assembly>

builds/win32/msvc15/FirebirdCommon.props

@@ -44,5 +44,8 @@
     <ResourceCompile>
       <PreprocessorDefinitions>RC_ARH_$(Platform);RC_TARGET_$(TargetName);RC_TARGET_NAME=$(TargetName);RC_TARGET_FILENAME=$(TargetFileName);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
+    <Manifest>
+      <AdditionalManifestFiles>..\defs\compatibility.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
 </Project>