merge to release (#60)

.github/workflows/cmake-multi-platform.yml

@@ -0,0 +1,126 @@
+# run CMake build on Windows and Linux
+name: CMake Build Multi-Platform
+
+on:
+  push:
+    branches: [ "development", "main" ]
+  pull_request:
+    branches: [ "development" ]
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+env:
+  VCPKG_ROOT: ${{ github.workspace }}/vcpkg
+  VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite'
+  # support for GH dependency graph vcpkg integration
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  VCPKG_FEATURE_FLAGS: dependencygraph
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      # Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable.
+      fail-fast: false
+
+      matrix:
+        include:
+          # Windows x64 Release
+          - os: windows-2022
+            preset: x64-release
+          # Linux x64 Release          
+          - os: ubuntu-22.04
+            preset: linux-release
+          # MacOS x64 Release
+          - os: macos-12
+            preset: macos-release
+          # Linux mingw x64 Release
+          # - os: ubuntu-22.04
+          #   preset: linux-mingw-w64-release
+          # # Linux Python Release
+          # - os: ubuntu-22.04
+          #   preset: python-linux-release
+
+    steps:   
+
+    - uses: actions/checkout@v3            
+
+    #
+    #   os != windows-2022 (i.e. Linux, MacOS)
+    #
+    - name: Install vcpkg
+      run: |               
+        git clone --depth 1 https://github.com/Microsoft/vcpkg.git ${{env.VCPKG_ROOT}}
+        "${{env.VCPKG_ROOT}}/bootstrap-vcpkg.sh"
+      # (Windows comes w/ vcpkg installed as part of VS)   
+      if: matrix.os != 'windows-2022'
+
+    - name: Install Ninja    
+      uses: seanmiddleditch/gha-setup-ninja@master
+      if: matrix.os != 'windows-2022'
+
+    # Export vcpkg Cache Variables
+    - name : Export vcpkg Cache Variables
+      uses: actions/github-script@v6
+      with:
+        script: |
+          core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+          core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+
+    # #
+    # #   preset == linux-mingw-w64-release
+    # #   
+    # - name: Install mingw-w64
+    #   run: |
+    #     sudo apt-get update
+    #     sudo apt-get install -y --no-install-recommends mingw-w64        
+    #   if: matrix.preset == 'linux-mingw-w64-release'
+
+    #
+    #   os == windows-2022
+    #
+    - name: Setup VC Tools
+      uses: ilammy/msvc-dev-cmd@v1
+      if: matrix.os == 'windows-2022'
+
+    - name: Patch vcpkg
+      run: scripts/patch-vcpkg-install.ps1
+      if: matrix.os == 'windows-2022'
+
+    # #
+    # #  preset == python-x64-release
+    # #
+    # - name: Generate SWIG Bindings
+    #   run: | 
+    #     sudo apt-get update
+    #     sudo apt-get install -y --no-install-recommends swig
+    #     chmod +x ./scripts/generate-python-module.sh
+    #     ./scripts/generate-python-module.sh
+    #   if: matrix.preset == 'python-linux-release'
+
+    - name: Manual vcpkg Install (Non-Windows)
+      run: "\"${{env.VCPKG_ROOT}}/vcpkg\" install"
+      if: matrix.preset != 'linux-mingw-w64-release' && matrix.os != 'windows-2022'
+
+    - name: Manual vcpkg Install (Windows)
+      run: "& \"${{env.VCPKG_ROOT}}/vcpkg\" install --triplet x64-windows"
+      if: matrix.os == 'windows-2022'
+
+    # - name: Manual vcpkg Install (mingw-w64)
+    #   run: "\"${{env.VCPKG_ROOT}}/vcpkg\" install --triplet x64-mingw-static"
+    #   if: matrix.preset == 'linux-mingw-w64-release'
+
+    #
+    #   All platforms
+    #   
+    - name: CMake Configure      
+      run: cmake --preset ${{matrix.preset}}    
+
+    - name: CMake Build          
+      run: cmake --build --preset ${{matrix.preset}} 
+
+    - name: CMake Test
+      run: ctest --preset ${{matrix.preset}} -V

.github/workflows/codeql.yml

@@ -17,6 +17,10 @@ on:
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ "development" ]
+
+env:
+  VCPKG_ROOT: ${{ github.workspace }}/vcpkg
+  VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite'
 
 jobs:
   analyze:
@@ -31,10 +35,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'cpp', 'python' ]
+        language: [ 'cpp' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ]
-        # Use only 'java' to analyze code written in Java, Kotlin or both
-        # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
 
     steps:
@@ -53,21 +55,30 @@ jobs:
         # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
         # queries: security-extended,security-and-quality
 
+    - name: Install vcpkg
+      run: |               
+        git clone --depth 1 https://github.com/Microsoft/vcpkg.git ${{env.VCPKG_ROOT}}
+        "${{env.VCPKG_ROOT}}/bootstrap-vcpkg.sh"            
+      
+    - name: Install Ninja    
+      uses: seanmiddleditch/gha-setup-ninja@master
+
+    # Export vcpkg Cache Variables
+    - name : Export vcpkg Cache Variables
+      uses: actions/github-script@v6
+      with:
+        script: |
+          core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+          core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+  
+    - name: Manual vcpkg Install (Non-Windows)
+      run: "\"${{env.VCPKG_ROOT}}/vcpkg\" install"
+
+    - name: CMake Configure      
+      run: cmake --preset linux-release
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-
-    #   If the Autobuild fails above, remove it and uncomment the following three lines.
-    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
-
-    # - run: |
-    #     echo "Run, Build Application using script"
-    #     ./location_of_script_within_repo/buildscript.sh
+    - name: CMake Build          
+      run: cmake --build --preset linux-release
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2

.github/workflows/msvc.yml

@@ -0,0 +1,87 @@
+# 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.
+#
+# Find more information at:
+# https://github.com/microsoft/msvc-code-analysis-action
+
+name: Microsoft C++ Code Analysis
+
+on:
+  push:
+    branches: [ "development", "main", "release" ]
+  pull_request:
+    branches: [ "development" ]
+  schedule:
+    - cron: '23 4 * * 6'
+
+env:
+  # Path to the CMake build directory.
+  build: '${{ github.workspace }}/build'  
+  VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite'
+
+permissions:
+  contents: read
+
+jobs:
+  analyze:
+    permissions:
+      contents: read # for actions/checkout to fetch code
+      security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
+      actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
+    name: Analyze
+    runs-on: windows-2022
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+       # Export vcpkg Cache Variables
+      - name : Export vcpkg Cache Variables
+        uses: actions/github-script@v6
+        with:
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+      
+      - name: Setup VC Tools
+        uses: ilammy/msvc-dev-cmd@v1
+
+      - name: Patch vcpkg
+        run: scripts/patch-vcpkg-install.ps1
+
+      - name: Manual vcpkg Install (Windows)
+        run: "& \"${{env.VCPKG_ROOT}}/vcpkg\" install --triplet x64-windows"
+
+      - name: CMake Configure      
+        run: cmake --preset x64-release -B ${{ env.build }}
+
+      # - name: Configure CMake
+      #   run: cmake -B ${{ env.build }}
+
+      # Build is not required unless generated source files are used
+      # - name: Build CMake
+      #   run: cmake --build ${{ env.build }}
+
+      - name: Initialize MSVC Code Analysis
+        uses: microsoft/msvc-code-analysis-action@04825f6d9e00f87422d6bf04e1a38b1f3ed60d99
+        # Provide a unique ID to access the sarif output path
+        id: run-analysis
+        with:
+          cmakeBuildDirectory: ${{ env.build }}
+          # Ruleset file that will determine what checks will be run
+          ruleset: NativeRecommendedRules.ruleset
+
+      # Upload SARIF file to GitHub Code Scanning Alerts
+      - name: Upload SARIF to GitHub
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: ${{ steps.run-analysis.outputs.sarif }}
+
+      # Upload SARIF file as an Artifact to download and view
+      - name: Upload SARIF as an Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: sarif-file
+          path: ${{ steps.run-analysis.outputs.sarif }}

.gitignore

@@ -23,4 +23,5 @@ build/
 /OdbDesignServer/designs/
 /cmake-build-debug-visual-studio
 /.idea/workspace.xml
-/.vs - Copy
+ssl/
+Testing/Temporary/

CMakeLists.txt

@@ -12,7 +12,7 @@ set(CMAKE_CXX_STANDARD ${MY_CXX_STANDARD})
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 
 # required for SWIG python wrapper
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+#set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 # GoogleTest support
 include(FetchContent)
@@ -66,13 +66,3 @@ add_subdirectory("OdbDesignLib")
 add_subdirectory("OdbDesignServer")
 add_subdirectory("Utils")
 add_subdirectory("OdbDesignTests")
-
-# link to OdbDesign library in both executable targets (linking inside the targets now)
-#target_link_libraries(OdbDesignApp PUBLIC OdbDesign)
-#target_link_libraries(OdbDesignServer PUBLIC OdbDesign)
-#target_link_libraries(OdbDesignTests PUBLIC OdbDesign)
-
-# link to Utils lib in all targets (linking inside OdbDesignLib target only now)
-#target_link_libraries(OdbDesignApp PUBLIC Utils)
-#target_link_libraries(OdbDesignServer PUBLIC Utils)
-#target_link_libraries(OdbDesign PUBLIC Utils)