Release v2.2

commschamp · Mar 14, 2023 · cc22254 · cc22254
2 parents 8e650de + 9bd8d07
commit cc22254
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 78 deletions.
diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml
@@ -8,8 +8,8 @@ env:
   CC_TOOLS_QT_BRANCH: master
 
 jobs:
-  build_gcc_limited_ubuntu_18_04:
-    runs-on: ubuntu-18.04
+  build_gcc_old_ubuntu_20_04:
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
@@ -20,62 +20,10 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Prepare Install
-      run: sudo apt-get update --fix-missing    
-
-    - name: Install Packages
-      run: sudo apt install libqt5gui5 qtbase5-dev libboost-all-dev libxml2-dev gcc-${{matrix.cc_ver}} g++-${{matrix.cc_ver}} gcc-8 g++-8
-
-    - 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}}
-        CC_COMMSDSL: gcc-8
-        CXX_COMMSDSL: g++-8
-        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_BRANCH}}
-        COMMSDSL_TAG: ${{env.COMMSDSL_BRANCH}}
-        CC_TOOLS_QT_SKIP: 1
-
-    - name: Configure CMake
-      shell: bash
-      working-directory: ${{runner.workspace}}/build
+    - name: Add repositories
       run: |
-        cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
-        -DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=gold -DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install \
-        -DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DUBLOX_GEN_PROTOCOL=ON -DUBLOX_GEN_TEST=ON \
-        -DUBLOX_SCHEMA_FILES_LIST_FILE=$GITHUB_WORKSPACE/basic_msgs.txt
-      env:
-        CC: gcc-${{matrix.cc_ver}}
-        CXX: g++-${{matrix.cc_ver}}
-
-    - name: Build Target 
-      working-directory: ${{runner.workspace}}/build
-      shell: bash
-      run: cmake --build . --config ${{matrix.type}} --target install
-      env:
-        VERBOSE: 1 
-
-  build_gcc_ubuntu_18_04:
-    runs-on: ubuntu-18.04
-    strategy:
-      fail-fast: false
-      matrix:
-        type: [Debug, Release, MinSizeRel]
-        cc_ver: [5, 6, 7]
-        cpp: [11, 14]
-
-    steps:
-    - uses: actions/checkout@v2
+        sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ bionic main'; \
+        sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ bionic universe'     
 
     - name: Prepare Install
       run: sudo apt-get update --fix-missing    
@@ -101,7 +49,7 @@ jobs:
         COMMON_CXX_STANDARD: ${{matrix.cpp}}
         COMMS_TAG: ${{env.COMMS_BRANCH}}
         COMMSDSL_TAG: ${{env.COMMSDSL_BRANCH}}
-        CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_BRANCH}}
+        CC_TOOLS_QT_SKIP: 1
 
     - name: Configure CMake
       shell: bash
@@ -110,7 +58,6 @@ jobs:
         cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
         -DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=gold -DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install \
         -DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DUBLOX_GEN_PROTOCOL=ON -DUBLOX_GEN_TEST=ON \
-        -DUBLOX_GEN_TOOLS=ON -DUBLOX_BUILD_EXAMPLES=ON \
         -DUBLOX_SCHEMA_FILES_LIST_FILE=$GITHUB_WORKSPACE/basic_msgs.txt
       env:
         CC: gcc-${{matrix.cc_ver}}
@@ -129,17 +76,28 @@ jobs:
       fail-fast: false
       matrix:
         type: [Debug, Release, MinSizeRel]
-        cc_ver: [8]
+        cc_ver: [5, 6, 7, 8]
         cpp: [11, 14, 17]
-
+        exclude:
+          - cc_ver: 5
+            cpp: 17        
+          - cc_ver: 6
+            cpp: 17
+          - cc_ver: 7
+            cpp: 17            
     steps:
     - uses: actions/checkout@v2
 
+    - name: Add repositories
+      run: |
+        sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ bionic main'; \
+        sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ bionic universe'      
+
     - name: Prepare Install
       run: sudo apt-get update --fix-missing    
 
     - name: Install Packages
-      run: sudo apt install libqt5gui5 qtbase5-dev libboost-all-dev libxml2-dev gcc-${{matrix.cc_ver}} g++-${{matrix.cc_ver}}
+      run: sudo apt install libqt5gui5 qtbase5-dev libboost-all-dev libxml2-dev gcc-${{matrix.cc_ver}} g++-${{matrix.cc_ver}} gcc-8 g++-8
 
     - name: Create Build Environment
       run: cmake -E make_directory ${{runner.workspace}}/build      
@@ -151,6 +109,8 @@ jobs:
         BUILD_DIR: ${{runner.workspace}}/build
         CC: gcc-${{matrix.cc_ver}}
         CXX: g++-${{matrix.cc_ver}}
+        CC_COMMSDSL: gcc-8
+        CXX_COMMSDSL: g++-8        
         EXTERNALS_DIR: ${{runner.workspace}}/externals
         COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
         COMMON_BUILD_TYPE: ${{matrix.type}}
@@ -236,8 +196,8 @@ jobs:
       env:
         VERBOSE: 1 
 
-  build_clang_ubuntu_18_04:
-    runs-on: ubuntu-18.04
+  build_clang_old_ubuntu_20_04:
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
@@ -252,6 +212,11 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
+    - name: Add repositories
+      run: |
+        sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ bionic main'; \
+        sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ bionic universe'      
+
     - name: Prepare Install
       run: sudo apt-get update --fix-missing    
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -30,7 +30,7 @@ option (UBLOX_BUILD_EXAMPLES "Build examples." OFF)
 # COMMSDSL2SWIG_EXTRA_ARGS - Extra arguments to pass to "commsdsl2swig"
 # COMMSDSL2EMSCRIPTEN_EXTRA_ARGS - Extra arguments to pass to "commsdsl2emscripten"
 
-set (VERSION "2.1")
+set (VERSION "2.2")
 
 set (EXTERNALS_DIR "${PROJECT_SOURCE_DIR}/externals")
 
@@ -298,10 +298,10 @@ if (UBLOX_GEN_PROTOCOL)
             SOURCE_DIR ${UBLOX_PROT_OUTPUT_DIR}
             BINARY_DIR ${prot_build_dir}
             INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
-            CMAKE_GENERATOR ${CMAKE_GENERATOR}
             CMAKE_ARGS
                 -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-                -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+                -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
                 -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
@@ -365,11 +365,11 @@ if (UBLOX_GEN_TEST)
             DEPENDS "prot_tgt" "test_output_tgt"
             SOURCE_DIR ${UBLOX_TEST_OUTPUT_DIR}
             BINARY_DIR ${test_build_dir}
-            CMAKE_GENERATOR ${CMAKE_GENERATOR}
             LIST_SEPARATOR |
             CMAKE_ARGS
                 -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-                -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+                -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_PREFIX_PATH=${combined_prefix_path_str}
@@ -398,7 +398,7 @@ if (UBLOX_GEN_TOOLS)
         COMMAND ${CMAKE_COMMAND}
             -DGENERATED="${tools_tmp_dir}" -DOUTPUT="${UBLOX_TOOLS_OUTPUT_DIR}"
             -P "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake"        
-        DEPENDS ${tools_tmp_dir} ${readme_file} "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_files})
+        DEPENDS ${tools_tmp_dir} "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_files})
 
     if (UBLOX_BUILD_TOOLS)
         if ((NOT UBLOX_GEN_PROTOCOL) OR (NOT UBLOX_BUILD_PROTOCOL))
@@ -420,11 +420,11 @@ if (UBLOX_GEN_TOOLS)
             DEPENDS "prot_tgt" "tools_output_tgt"
             SOURCE_DIR ${UBLOX_TOOLS_OUTPUT_DIR}
             BINARY_DIR ${tools_build_dir}
-            CMAKE_GENERATOR ${CMAKE_GENERATOR}
             LIST_SEPARATOR |
             CMAKE_ARGS
                 -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-                -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+                -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_PREFIX_PATH=${combined_prefix_path_str}
@@ -453,7 +453,7 @@ if (UBLOX_GEN_SWIG)
         COMMAND ${CMAKE_COMMAND}
             -DGENERATED="${swig_tmp_dir}" -DOUTPUT="${UBLOX_SWIG_OUTPUT_DIR}"
             -P "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake"        
-        DEPENDS ${swig_tmp_dir} ${readme_file} "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_files})
+        DEPENDS ${swig_tmp_dir} "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_files})
 
     if (UBLOX_BUILD_SWIG)
         if ((NOT UBLOX_GEN_PROTOCOL) OR (NOT UBLOX_BUILD_PROTOCOL))
@@ -475,11 +475,11 @@ if (UBLOX_GEN_SWIG)
             DEPENDS "prot_tgt" "swig_output_tgt"
             SOURCE_DIR ${UBLOX_SWIG_OUTPUT_DIR}
             BINARY_DIR ${swig_build_dir}
-            CMAKE_GENERATOR ${CMAKE_GENERATOR}
             LIST_SEPARATOR |
             CMAKE_ARGS
                 -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-                -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+                -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_PREFIX_PATH=${combined_prefix_path_str}
@@ -511,7 +511,7 @@ if (UBLOX_GEN_EMSCRIPTEN)
         COMMAND ${CMAKE_COMMAND}
             -DGENERATED="${emscripten_tmp_dir}" -DOUTPUT="${UBLOX_EMSCRIPTEN_OUTPUT_DIR}"
             -P "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake"        
-        DEPENDS ${emscripten_tmp_dir} ${readme_file} "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_files})
+        DEPENDS ${emscripten_tmp_dir} "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_files})
 
     if (UBLOX_BUILD_EMSCRIPTEN)
         if ((NOT UBLOX_GEN_PROTOCOL) OR (NOT UBLOX_BUILD_PROTOCOL))
@@ -541,9 +541,9 @@ if (UBLOX_GEN_EMSCRIPTEN)
             SOURCE_DIR ${UBLOX_EMSCRIPTEN_OUTPUT_DIR}
             BINARY_DIR ${emscripten_build_dir}
             CMAKE_COMMAND ${EMCMAKE_EXECUTABLE} ${CMAKE_COMMAND}
-            CMAKE_GENERATOR ${CMAKE_GENERATOR}
             LIST_SEPARATOR |
             CMAKE_ARGS
+                -DCMAKE_GENERATOR=${CMAKE_GENERATOR} -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
                 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} 
                 -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
                 -DOPT_MODULARIZE=ON

diff --git a/dsl/main.xml b/dsl/main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema name="cc_ublox" endian="little" nonUniqueMsgIdAllowed="true" dslVersion="5" >
+<schema name="cc_ublox" endian="little" nonUniqueMsgIdAllowed="true" dslVersion="6" >
     <platform name="ublox5" />
     <platform name="ublox6" />
     <platform name="ublox7" />