Release v2.9

commschamp · Sep 28, 2024 · e39b529 · e39b529
2 parents a8c6692 + 6a661e6
commit e39b529
Show file tree

Hide file tree

Showing 4 changed files with 178 additions and 20 deletions.
diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml
@@ -3,9 +3,9 @@ name: Github Actions Build
 on: [push]
 
 env:
-  COMMS_TAG: v5.2.5
-  COMMSDSL_TAG: v6.3.3
-  CC_TOOLS_QT_TAG: v5.3.1
+  COMMS_TAG: v5.2.7
+  COMMSDSL_TAG: v6.3.4
+  CC_TOOLS_QT_TAG: v5.3.3
 
 jobs:
   build_gcc_old_ubuntu_20_04:
@@ -197,6 +197,70 @@ jobs:
       run: cmake --build . --config ${{matrix.type}} --target install
       env:
         VERBOSE: 1 
+
+  build_gcc_ubuntu_24_04:
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        type: [Debug, Release, MinSizeRel]
+        cc_ver: [13, 14]
+        cpp: [11, 14, 17, 20, 23]
+        qt_ver: [5, 6]    
+        exclude:
+          - cc_ver: 13
+            cpp: 23  
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Prepare Install
+      run: sudo apt-get update --fix-missing    
+
+    - name: Install Packages
+      run: |
+        sudo apt install libqt${{matrix.qt_ver}}gui${{matrix.qt_ver}} qtbase5-dev qt6-base-dev libboost-all-dev libxml2-dev gcc-${{matrix.cc_ver}} g++-${{matrix.cc_ver}} \
+        python3 libpython3-dev swig default-jdk default-jre emscripten doxygen
+
+    - name: Create Build Environment
+      run: cmake -E make_directory ${{runner.workspace}}/build      
+
+    - name: Prepare externals
+      shell: bash
+      run: $GITHUB_WORKSPACE/script/prepare_externals.sh
+      env:
+        BUILD_DIR: ${{runner.workspace}}/build
+        CC: gcc-${{matrix.cc_ver}}
+        CXX: g++-${{matrix.cc_ver}}
+        EXTERNALS_DIR: ${{runner.workspace}}/externals
+        COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
+        COMMON_BUILD_TYPE: ${{matrix.type}}
+        COMMON_CXX_STANDARD: ${{matrix.cpp}}
+        COMMS_TAG: ${{env.COMMS_TAG}}
+        COMMSDSL_TAG: ${{env.COMMSDSL_TAG}}
+        CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_TAG}}
+        CC_TOOLS_QT_MAJOR_QT_VERSION: ${{matrix.qt_ver}}
+
+    - name: Configure CMake
+      shell: bash
+      working-directory: ${{runner.workspace}}/build
+      run: |
+        cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
+        -DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCMAKE_CXX_STANDARD=${{matrix.cpp}} \
+        -DDEMO3_TOOLS_QT_VER=${{matrix.qt_ver}} \
+        -DDEMO3_GEN_PROTOCOL=ON -DDEMO3_GEN_TEST=ON -DDEMO3_GEN_TOOLS=ON -DDEMO3_BUILD_TOOLS=${{env.BUILD_TOOLS}} \
+        -DDEMO3_GEN_SWIG=ON -DDEMO3_GEN_EMSCRIPTEN=ON -DDEMO3_BUILD_PROT_DOC=ON
+      env:
+        CC: gcc-${{matrix.cc_ver}}
+        CXX: g++-${{matrix.cc_ver}}
+        BUILD_TOOLS: "${{ matrix.cpp >= 17 && 'ON' || 'OFF' }}"
+
+    - name: Build Target 
+      working-directory: ${{runner.workspace}}/build
+      shell: bash
+      run: cmake --build . --config ${{matrix.type}} --target install
+      env:
+        VERBOSE: 1         
 
   build_clang_old_ubuntu_20_04:
     runs-on: ubuntu-20.04
@@ -389,6 +453,75 @@ jobs:
       env:
         VERBOSE: 1 
 
+
+  build_clang_ubuntu_24_04:
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        type: [Debug, Release, MinSizeRel]
+        cc_ver: [16, 17, 18]
+        cpp: [11, 14, 17, 20, 23]
+        qt_ver: [5, 6]
+        exclude:
+          - cc_ver: 16
+            cpp: 23
+          - cc_ver: 17
+            cpp: 23  
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Prepare Install
+      run: sudo apt-get update --fix-missing    
+
+    - name: Install Packages
+      run: |
+        sudo apt install libqt${{matrix.qt_ver}}gui${{matrix.qt_ver}} qtbase5-dev qt6-base-dev libboost-all-dev libxml2-dev clang-${{matrix.cc_ver}} \
+        python3 libpython3-dev swig  default-jdk default-jre emscripten
+
+    - name: Create Build Environment
+      run: cmake -E make_directory ${{runner.workspace}}/build      
+
+    - name: Prepare externals
+      shell: bash
+      run: $GITHUB_WORKSPACE/script/prepare_externals.sh
+      env:
+        BUILD_DIR: ${{runner.workspace}}/build
+        CC: clang-${{matrix.cc_ver}}
+        CXX: clang++-${{matrix.cc_ver}}
+        EXTERNALS_DIR: ${{runner.workspace}}/externals
+        COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
+        COMMON_BUILD_TYPE: ${{matrix.type}}
+        COMMON_CXX_STANDARD: ${{matrix.cpp}}
+        COMMS_TAG: ${{env.COMMS_TAG}}
+        COMMSDSL_TAG: ${{env.COMMSDSL_TAG}}
+        CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_TAG}} 
+        CC_TOOLS_QT_MAJOR_QT_VERSION: ${{matrix.qt_ver}}
+        CC_TOOLS_QT_SKIP: "${{ (matrix.cpp < 17) && '1' || '0' }}"
+
+    - name: Configure CMake
+      shell: bash
+      working-directory: ${{runner.workspace}}/build
+      run: |
+        cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
+        -DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCMAKE_CXX_STANDARD=${{matrix.cpp}} \
+        -DDEMO3_TOOLS_QT_VER=${{matrix.qt_ver}} \
+        -DDEMO3_GEN_PROTOCOL=ON -DDEMO3_GEN_TEST=ON -DDEMO3_GEN_TOOLS=ON -DDEMO3_BUILD_TOOLS=${{env.BUILD_TOOLS}} \
+        -DDEMO3_GEN_SWIG=ON -DDEMO3_GEN_EMSCRIPTEN=ON
+      env:
+        CC: clang-${{matrix.cc_ver}}
+        CXX: clang++-${{matrix.cc_ver}}
+        BUILD_TOOLS: "${{ (matrix.cpp < 17) && 'OFF' || 'ON' }}"
+
+    - name: Build Target 
+      working-directory: ${{runner.workspace}}/build
+      shell: bash
+      run: cmake --build . --config ${{matrix.type}} --target install
+      env:
+        VERBOSE: 1 
+
+
   build_msvc_2019:
     runs-on: windows-2019
     strategy:
@@ -421,9 +554,10 @@ jobs:
         QT_VER: ${{matrix.qt_ver == '5' && '5.15.3' || '6.2.2'}}     
 
     - name: Install Boost
+      if: matrix.arch == 'x64'
       shell: cmd
       run: |
-        choco install boost-msvc-14.2           
+        choco install boost-msvc-14.2 --version=1.85.0          
 
     - name: Prepare externals
       shell: cmd
@@ -448,16 +582,19 @@ jobs:
       working-directory: ${{runner.workspace}}/build
       run: |
         cmake %GITHUB_WORKSPACE% -A ${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install ^
-          -DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{env.QTDIR}}" -DBoost_USE_STATIC_LIBS=ON ^
+          -DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{env.QTDIR}}" ^
+          -DCMAKE_POLICY_DEFAULT_CMP0167=OLD -DBoost_USE_STATIC_LIBS=ON ^
           -DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DDEMO3_TOOLS_QT_VER=${{matrix.qt_ver}} ^
-          -DDEMO3_GEN_PROTOCOL=ON -DDEMO3_GEN_TEST=ON -DDEMO3_GEN_TOOLS=ON -DDEMO3_BUILD_TOOLS=${{env.BUILD_TOOLS}}
+          -DDEMO3_GEN_PROTOCOL=ON -DDEMO3_GEN_TEST=ON -DDEMO3_GEN_TOOLS=ON -DDEMO3_BUILD_TOOLS=${{env.BUILD_TOOLS}} ^
+          -DDEMO3_BUILD_EXAMPLES=${{env.HAS_BOOST}}
       env:
         BUILD_TOOLS: "${{ matrix.cpp >= 17 && matrix.arch == 'x64'  && 'ON' || 'OFF' }}"
+        HAS_BOOST: "${{ matrix.arch == 'x64' && 'ON' || 'OFF' }}"          
 
     - name: Build Target 
       working-directory: ${{runner.workspace}}/build
       shell: cmd
-      run: cmake --build . --config ${{matrix.type}} --target install
+      run: cmake --build . --config ${{matrix.type}}
       env:
         VERBOSE: 1 
 
@@ -480,7 +617,7 @@ jobs:
       if: matrix.arch == 'x64'
       shell: cmd
       run: |
-        choco install boost-msvc-14.3
+        choco install boost-msvc-14.3 --version=1.85.0
 
     - name: Prepare externals
       shell: cmd
@@ -503,7 +640,8 @@ jobs:
       working-directory: ${{runner.workspace}}/build
       run: |
         cmake %GITHUB_WORKSPACE% -A ${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install ^
-          -DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install" -DBoost_USE_STATIC_LIBS=ON ^
+          -DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install" ^
+          -DCMAKE_POLICY_DEFAULT_CMP0167=OLD -DBoost_USE_STATIC_LIBS=ON ^
           -DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DDEMO3_TOOLS_QT_VER=${{matrix.qt_ver}} ^
           -DDEMO3_GEN_PROTOCOL=ON -DDEMO3_GEN_TEST=ON -DDEMO3_BUILD_EXAMPLES=${{env.HAS_BOOST}}
       env:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,8 +33,18 @@ option (DEMO3_BUILD_EXAMPLES "Build examples." ON)
 # COMMSDSL2SWIG_EXTRA_ARGS - Extra arguments to pass to "commsdsl2swig"
 # COMMSDSL2EMSCRIPTEN_EXTRA_ARGS - Extra arguments to pass to "commsdsl2emscripten"
 
-set (DEMO3_VERSION "2.8")
-set (DEMO3_MIN_COMMSDSL_VERSION "6.3.3")
+set (DEMO3_VERSION "2.9")
+set (DEMO3_MIN_COMMSDSL_VERSION "6.3.4")
+
+if (("${CMAKE_VERSION}" VERSION_GREATER_EQUAL "3.30") AND
+    (NOT DEFINED CMAKE_POLICY_DEFAULT_CMP0167))
+    # Find boost cmake configuration from the boost installation
+    cmake_policy(SET CMP0167 NEW)
+endif ()
+
+if ("${CMAKE_CXX_STANDARD}" STREQUAL "")
+    set(CMAKE_CXX_STANDARD 17)
+endif ()
 
 set (EXTERNALS_DIR "${PROJECT_SOURCE_DIR}/externals")
 
@@ -129,7 +139,7 @@ if (DEMO3_GEN_PROTOCOL)
                 -DCMAKE_GENERATOR=${CMAKE_GENERATOR} -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
                 -DCMAKE_GENERATOR_TOOLSET=${CMAKE_GENERATOR_TOOLSET} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
                 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}           
-                -DOPT_REQUIRE_COMMS_LIB=OFF
+                -DOPT_REQUIRE_COMMS_LIB=OFF -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
                 -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
         )
 
@@ -201,7 +211,7 @@ if (DEMO3_GEN_TEST)
                 -DCMAKE_GENERATOR=${CMAKE_GENERATOR} -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
                 -DCMAKE_GENERATOR_TOOLSET=${CMAKE_GENERATOR_TOOLSET} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
                 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}           
-                -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
+                -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
                 -DCMAKE_PREFIX_PATH=${combined_prefix_path_str}
                 -DOPT_USE_CCACHE=${DEMO3_USE_CCACHE}
                 -DOPT_CCACHE_EXECUTABLE=${DEMO3_CCACHE_EXECUTABLE}
@@ -263,7 +273,7 @@ if (DEMO3_GEN_TOOLS)
                 -DCMAKE_GENERATOR_TOOLSET=${CMAKE_GENERATOR_TOOLSET} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
                 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}           
                 -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_PREFIX_PATH=${combined_prefix_path_str}
-                -DOPT_QT_MAJOR_VERSION=${DEMO3_TOOLS_QT_VER}
+                -DOPT_QT_MAJOR_VERSION=${DEMO3_TOOLS_QT_VER} -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
                 -DOPT_USE_CCACHE=${DEMO3_USE_CCACHE}
                 -DOPT_CCACHE_EXECUTABLE=${DEMO3_CCACHE_EXECUTABLE}
         )   
@@ -324,7 +334,7 @@ if (DEMO3_GEN_SWIG)
                 -DCMAKE_GENERATOR=${CMAKE_GENERATOR} -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
                 -DCMAKE_GENERATOR_TOOLSET=${CMAKE_GENERATOR_TOOLSET} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
                 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}        
-                -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
+                -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
                 -DCMAKE_PREFIX_PATH=${combined_prefix_path_str}
                 -DOPT_SWIG_LANGUAGES=${combined_languages_str}
                 -DOPT_USE_CCACHE=${DEMO3_USE_CCACHE}
@@ -394,7 +404,7 @@ if (DEMO3_GEN_EMSCRIPTEN)
             CMAKE_ARGS
                 -DCMAKE_GENERATOR=${CMAKE_GENERATOR} -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
                 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} 
-                -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
+                -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
                 -DOPT_MODULARIZE=ON
                 -DOPT_EXTRA_INCLUDE_DIRS=${extra_includes_path_str}
                 -DOPT_USE_CCACHE=${DEMO3_USE_CCACHE}

diff --git a/script/full_debug_build_clang.sh b/script/full_debug_build_clang.sh
@@ -1,7 +1,12 @@
 #!/bin/bash
 
-export CC=clang
-export CXX=clang++
+if [ -z "${CC}" ]; then
+    export CC=clang
+fi
+
+if [ -z "${CXX}" ]; then
+    export CXX=clang++
+fi
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 ${SCRIPT_DIR}/full_debug_build.sh "$@"

diff --git a/script/full_debug_build_gcc.sh b/script/full_debug_build_gcc.sh
@@ -1,7 +1,12 @@
 #!/bin/bash
 
-export CC=gcc
-export CXX=g++
+if [ -z "${CC}" ]; then
+    export CC=gcc
+fi
+
+if [ -z "${CXX}" ]; then
+    export CXX=g++
+fi
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 ${SCRIPT_DIR}/full_debug_build.sh "$@"