Merge pull request #281 from fdcastel/new-build-system

[2/3] Add CMake build system; remove obsolete build configurations

Author: irodushka

.github/workflows/linux.yml

@@ -2,6 +2,8 @@ name: Linux
 
 on:
   push:
+    branches: [ "master", "new-build-system", "new-build-system-no-pr" ]
+  pull_request:
     branches: [ "master" ]
 
 permissions:
@@ -18,16 +20,17 @@ jobs:
     - name: Install UnixODBC package
       run: sudo apt-get install -y unixodbc unixodbc-dev
 
-    - name: Go to build folder & make
-      working-directory: ${{env.GITHUB_WORKSPACE}}
-      run: |
-        cd Builds/Gcc.lin
-        cp makefile.linux makefile
-        make
-    
+    - name: Configure CMake
+      run: cmake -B build -DCMAKE_BUILD_TYPE=Release
+
+    - name: Build
+      run: cmake --build build --config Release
+
+    - name: Run tests (no database — all tests skip)
+      run: ctest --test-dir build --output-on-failure
+
     - uses: actions/upload-artifact@v4
       with:
-          name: linux_libs
+          name: linux_x64_libs
           path: |
-            ./Builds/Gcc.lin/Release_*
-            !./Builds/Gcc.lin/Release_*/obj
+            ./build/libOdbcFb.so

.github/workflows/msbuild.yml

@@ -7,6 +7,8 @@ name: MSBuild
 
 on:
   push:
+    branches: [ "master", "new-build-system", "new-build-system-no-pr" ]
+  pull_request:
     branches: [ "master" ]
 
 env:
@@ -43,6 +45,10 @@ jobs:
       working-directory: ${{env.GITHUB_WORKSPACE}}
       run: nuget restore ${{env.SOLUTION_FILE_PATH}}
 
+    - name: Fetch Firebird headers (required by .vcxproj include paths)
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      run: cmake -B build -DBUILD_TESTING=OFF
+
     - name: Stub
       working-directory: ${{env.GITHUB_WORKSPACE}}
       run: |

.github/workflows/rpi_arm64.yml

@@ -2,6 +2,8 @@ name: RaspberryPI
 
 on:
   push:
+    branches: [ "master", "new-build-system", "new-build-system-no-pr" ]
+  pull_request:
     branches: [ "master" ]
 
 permissions:
@@ -19,17 +21,17 @@ jobs:
         base_image: raspios_lite_arm64:latest
         copy_repository_path: /opt/fb_odbc
         copy_artifact_path: |
-                    Builds/Gcc.lin/Release_*
+                    build/libOdbcFb.so
         commands: |
-            sudo apt-get install -y unixodbc unixodbc-dev
-            cd /opt/fb_odbc/Builds/Gcc.lin
-            cp makefile.linux makefile
-            make
+            sudo apt-get update
+            sudo apt-get install -y cmake unixodbc unixodbc-dev
+            cd /opt/fb_odbc
+            cmake -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF
+            cmake --build build --config Release
     
     - uses: actions/upload-artifact@v4
       with:
           name: linux_arm64_libs
           path: |
-              Release_*
-              !Release_*/obj
+              libOdbcFb.so
 

.gitignore

@@ -11,3 +11,33 @@ Install/Win32/install_image/
 build_*.log
 OdbcJdbcSetup_*.iss
 .vs/*
+
+# CMake
+build/
+build-*/
+Build/
+out/
+cmake-build-*/
+CMakeCache.txt
+CMakeFiles/
+cmake_install.cmake
+CTestTestfile.cmake
+_deps/
+install_manifest.txt
+Testing/
+tests/Testing/
+
+# Build artifacts
+*.o
+*.obj
+*.dll
+*.lib
+*.exe
+*.pdb
+*.ilk
+*.exp
+
+# IDE
+.idea/
+.vscode/
+CMakeUserPresets.json