ODBC 3.0

.github/workflows/linux.yml

@@ -0,0 +1,31 @@
+name: Linux
+
+on:
+  push:
+    branches: [ "feature_ooapi" ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - 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
+
+    - uses: actions/upload-artifact@v4
+      with:
+          name: linux_libs
+          path: ./Builds/Gcc.lin/Release_*

.github/workflows/msbuild.yml

@@ -0,0 +1,91 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: MSBuild
+
+on:
+  push:
+    branches: [ "feature_ooapi" ]
+  #pull_request:
+  #  branches: [ "feature_ooapi" ]
+
+env:
+  # Path to the solution file relative to the root of the project.
+  SOLUTION_FILE_PATH: ./Builds/MsVc2022.win/OdbcFb.sln
+
+  # Configuration type to build.
+  # You can convert this to a build matrix if you need coverage of multiple configuration types.
+  # https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+  BUILD_CONFIGURATION: Release
+
+  INNO_SETUP_PATH: 'C:\Program Files (x86)\Inno Setup 6'
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Add MSBuild to PATH
+      uses: microsoft/[email protected]
+
+    - name: Install html-help-workshop, sed, innosetup
+      run: |
+        choco install html-help-workshop
+        choco install sed
+        choco install innosetup
+
+    - name: Restore NuGet packages
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      run: nuget restore ${{env.SOLUTION_FILE_PATH}}
+
+    - name: Stub
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      run: |
+        #cd "C:\Program Files (x86)\"
+        #dir
+        env
+
+    - name: Build win32
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      # Add additional options to the MSBuild command line here (like platform or verbosity level).
+      # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
+      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform=Win32 ${{env.SOLUTION_FILE_PATH}}
+
+    - name: Build x64
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      # Add additional options to the MSBuild command line here (like platform or verbosity level).
+      # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
+      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform=x64 ${{env.SOLUTION_FILE_PATH}}
+
+    - name: Build InnoSetup installers
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      run: |
+        cd Install\Win32
+        dir
+        ./MakePackage.bat
+        ./MakePackage.bat WIN32
+
+    - name: VirusTotal Scan
+      uses: crazy-max/ghaction-virustotal@v4
+      id: virustotal_scan
+      with:
+          #vt_api_key: ${{ secrets.VT_API_KEY }}
+          vt_api_key: effc35cbb3eb35975d5cf74eee8b75a1a1b12b6af0d66ed2a65cba48becaecc0
+          files: |
+            ./Install/Win32/install_image/*_Win32.exe
+            ./Install/Win32/install_image/*_x64.exe
+
+    - name: Upload artefacts
+      run: |
+          echo "${{ steps.virustotal_scan.outputs.analysis }}" > ./Install/Win32/install_image/VirusTotalScan.txt
+    - uses: actions/upload-artifact@v4
+      with:
+          name: win_installers
+          path: ./Install/Win32/install_image/

.gitignore

@@ -1,9 +1,10 @@
 Builds/*/Win32/
 Builds/*/x64/
+Builds/*/.vs/
 Install/Win32/install_image/
 *.suo
 *.ncb
 *.user
 *.chm
 build_*.log
-OdbcJdbcSetup_*.iss
+OdbcJdbcSetup_*.iss

Builds/Gcc.lin/makefile.linux

@@ -30,7 +30,7 @@ GCC		= g++
 
 #Override default variables for this build
 #ARCH = x86
-#FIREBIRD=/usr/lib64/firebird
+FIREBIRD=../../FBClient.Headers
 
 # Get version info
 MAJOR_VERSION = $(shell cat ../../SetupAttributes.h | grep "define MAJOR_VERSION" | cut -f 3)

Builds/Gcc.lin/readme.linux

@@ -1,3 +1,19 @@
+====== ODBC v3.0 driver notes ======================================
+
+Version 3.0 has no significant changes to the build sequence compared to the previous version.
+However, to build from source, you should use C++17.
+
+How to build:
+ * Make sure you have Unix ODBC dev package installed. If not - install it (for example: `sudo apt install unixodbc-dev` for Ubuntu)
+ * Move to Builds/Gcc.lin
+ * Rename makefile.linux -> makefile
+ * Set the DEBUG var if you need a Debug build instead of Release (by default)
+ * Run `make`
+ * Your libraries are in ./Release_<arch> or ./Debug_<arch> folder.
+
+===
+
+
 1)==================================================================
   For connect from unixODBC :
 

Builds/MsVc2022.win/OdbcFb.sln

@@ -0,0 +1,30 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.6.33815.320
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdbcFb", "OdbcFb.vcxproj", "{C6127398-654D-4196-B8C1-5BB32D75D7FD}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Debug|Win32.Build.0 = Debug|Win32
+		{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Debug|x64.ActiveCfg = Debug|x64
+		{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Debug|x64.Build.0 = Debug|x64
+		{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Release|Win32.ActiveCfg = Release|Win32
+		{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Release|Win32.Build.0 = Release|Win32
+		{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Release|x64.ActiveCfg = Release|x64
+		{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A4C550A6-7D81-4A2D-B5B4-ABBCBD76197E}
+	EndGlobalSection
+EndGlobal