From eec4f4cf00fe1de10d1eaf5ad2306ec271997408 Mon Sep 17 00:00:00 2001 From: Alex Robenko Date: Sat, 28 Sep 2024 14:13:50 +1000 Subject: [PATCH 01/10] Updating next release version to be v2.9.1 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b2f9014..229b632 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,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 (UBLOX_VERSION "2.9") +set (UBLOX_VERSION "2.9.1") set (UBLOX_MIN_COMMSDSL_VERSION "6.3.4") if (("${CMAKE_VERSION}" VERSION_GREATER_EQUAL "3.30") AND From 6ae8021693eb841981f146b91395fbb7c3005f28 Mon Sep 17 00:00:00 2001 From: Alex Robenko Date: Mon, 30 Dec 2024 09:58:47 +1000 Subject: [PATCH 02/10] Requiring v7.0 of commsdsl. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 229b632..c8cfa57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,8 +33,8 @@ 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 (UBLOX_VERSION "2.9.1") -set (UBLOX_MIN_COMMSDSL_VERSION "6.3.4") +set (UBLOX_VERSION "3.0") +set (UBLOX_MIN_COMMSDSL_VERSION "7.0") if (("${CMAKE_VERSION}" VERSION_GREATER_EQUAL "3.30") AND (NOT DEFINED CMAKE_POLICY_DEFAULT_CMP0167)) From 8e53c1eafc8531ec657ad35093a6ac22a2500e4d Mon Sep 17 00:00:00 2001 From: Alex Robenko Date: Mon, 30 Dec 2024 09:59:27 +1000 Subject: [PATCH 03/10] Not building tags on github actions. --- .github/workflows/actions_build.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml index cc9e668..5cd9f84 100644 --- a/.github/workflows/actions_build.yml +++ b/.github/workflows/actions_build.yml @@ -1,11 +1,16 @@ name: Github Actions Build -on: [push] +on: + push: + branches: + - '**' + tags-ignore: + - '**' env: - COMMS_TAG: v5.2.7 - COMMSDSL_TAG: v6.3.4 - CC_TOOLS_QT_TAG: v5.3.3 + COMMS_TAG: develop + COMMSDSL_TAG: develop + CC_TOOLS_QT_TAG: develop jobs: build_gcc_old_ubuntu_20_04: From 4e465bfc601a56ad85c67f678581318f3b6256e3 Mon Sep 17 00:00:00 2001 From: Alex Robenko Date: Mon, 30 Dec 2024 10:00:22 +1000 Subject: [PATCH 04/10] Not building MinSizeRel on windows runners in github actions. --- .github/workflows/actions_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml index 5cd9f84..0e61389 100644 --- a/.github/workflows/actions_build.yml +++ b/.github/workflows/actions_build.yml @@ -534,7 +534,7 @@ jobs: strategy: fail-fast: false matrix: - type: [Debug, Release, MinSizeRel] + type: [Debug, Release] arch: [Win32, x64] cpp: [11, 14, 17] qt_ver: [5, 6] @@ -611,7 +611,7 @@ jobs: strategy: fail-fast: false matrix: - type: [Debug, Release, MinSizeRel] + type: [Debug, Release] arch: [Win32, x64] cpp: [11, 14, 17, 20] From 761666d37a0588adab79516d32c1079c51e0e345 Mon Sep 17 00:00:00 2001 From: Alex Robenko Date: Mon, 30 Dec 2024 10:03:11 +1000 Subject: [PATCH 05/10] Not building tools on ubuntu-20.04 runners in github actions. --- .github/workflows/actions_build.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml index 0e61389..b309191 100644 --- a/.github/workflows/actions_build.yml +++ b/.github/workflows/actions_build.yml @@ -122,7 +122,7 @@ jobs: 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_SKIP: 1 - name: Configure CMake shell: bash @@ -130,12 +130,11 @@ jobs: 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}} \ - -DUBLOX_GEN_PROTOCOL=ON -DUBLOX_GEN_TEST=ON -DUBLOX_GEN_TOOLS=ON -DUBLOX_BUILD_TOOLS=${{env.BUILD_TOOLS}} -DUBLOX_BUILD_EXAMPLES=ON \ + -DUBLOX_GEN_PROTOCOL=ON -DUBLOX_GEN_TEST=ON -DUBLOX_BUILD_EXAMPLES=ON \ -DUBLOX_SCHEMA_FILES_LIST_FILE=$GITHUB_WORKSPACE/basic_msgs.txt 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 @@ -315,7 +314,7 @@ jobs: 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_SKIP: 1 - name: Configure CMake shell: bash @@ -324,12 +323,11 @@ 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_TOOLS=${{env.BUILD_TOOLS}} -DUBLOX_BUILD_EXAMPLES=ON \ + -DUBLOX_BUILD_EXAMPLES=ON \ -DUBLOX_SCHEMA_FILES_LIST_FILE=$GITHUB_WORKSPACE/basic_msgs.txt env: CC: clang-${{matrix.cc_ver}} CXX: clang++-${{matrix.cc_ver}} - BUILD_TOOLS: "${{ matrix.cpp >= 17 && 'ON' || 'OFF' }}" - name: Build Target working-directory: ${{runner.workspace}}/build @@ -377,8 +375,7 @@ jobs: 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_SKIP: "${{ matrix.cpp < 17 && '1' || '0' }}" + CC_TOOLS_QT_SKIP: 1 - name: Configure CMake shell: bash @@ -386,12 +383,11 @@ jobs: 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}} \ - -DUBLOX_GEN_PROTOCOL=ON -DUBLOX_GEN_TEST=ON -DUBLOX_GEN_TOOLS=ON -DUBLOX_BUILD_TOOLS=${{env.BUILD_TOOLS}} \ + -DUBLOX_GEN_PROTOCOL=ON -DUBLOX_GEN_TEST=ON \ -DUBLOX_BUILD_EXAMPLES=ON -DUBLOX_SCHEMA_FILES_LIST_FILE=$GITHUB_WORKSPACE/basic_msgs.txt env: CC: clang-${{matrix.cc_ver}} CXX: clang++-${{matrix.cc_ver}} - BUILD_TOOLS: "${{ matrix.cpp == 17 && 'ON' || 'OFF' }}" - name: Build Target working-directory: ${{runner.workspace}}/build From 8d7fcdb568fffd996a70de212946953030e86797 Mon Sep 17 00:00:00 2001 From: Alex Robenko Date: Mon, 30 Dec 2024 10:08:26 +1000 Subject: [PATCH 06/10] Simplifying cmake script. --- CMakeLists.txt | 62 +++++++++----------------------------------------- 1 file changed, 11 insertions(+), 51 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c8cfa57..35c1cba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -272,24 +272,16 @@ if (UBLOX_GEN_PROTOCOL) set (prot_tmp_dir "${CMAKE_BINARY_DIR}/output.tmp") - add_custom_target(rm_prot_tmp_tgt + add_custom_target(${PROT_OUTPUT_TGT} ALL COMMAND ${CMAKE_COMMAND} -E remove_directory ${prot_tmp_dir} - ) - - add_custom_command( - OUTPUT ${prot_tmp_dir} - DEPENDS ${schema_files} ${src_files} rm_prot_tmp_tgt COMMAND ${COMMSDSL2COMMS} ${warn_as_error} -V ${UBLOX_VERSION} -o ${prot_tmp_dir} -c ${PROJECT_SOURCE_DIR}/src/protocol -p ${PROJECT_SOURCE_DIR} -i ${UBLOX_SCHEMA_FILES_LIST_FILE} - ${COMMSDSL2COMMS_EXTRA_ARGS} - ) - - add_custom_target(${PROT_OUTPUT_TGT} ALL + ${COMMSDSL2COMMS_EXTRA_ARGS} COMMAND ${CMAKE_COMMAND} -DGENERATED="${prot_tmp_dir}" -DOUTPUT="${UBLOX_PROT_OUTPUT_DIR}" -P "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" - DEPENDS ${prot_tmp_dir} ${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake ${schema_files}) + DEPENDS ${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake ${schema_files}) if (UBLOX_BUILD_PROTOCOL) execute_process( @@ -342,23 +334,15 @@ if (UBLOX_GEN_TEST) set (test_tmp_dir "${CMAKE_BINARY_DIR}/output_test.tmp") - add_custom_target(rm_test_tmp_tgt + add_custom_target("test_output_tgt" ALL COMMAND ${CMAKE_COMMAND} -E remove_directory ${test_tmp_dir} - ) - - add_custom_command( - OUTPUT ${test_tmp_dir} - DEPENDS ${schema_files} ${src_files} rm_test_tmp_tgt COMMAND ${COMMSDSL2TEST} ${warn_as_error} ${COMMSDSL2TEST_EXTRA_ARGS} -o ${test_tmp_dir} -c ${PROJECT_SOURCE_DIR}/src/test -p ${PROJECT_SOURCE_DIR} -i ${UBLOX_SCHEMA_FILES_LIST_FILE} - ) - - add_custom_target("test_output_tgt" ALL COMMAND ${CMAKE_COMMAND} -DGENERATED="${test_tmp_dir}" -DOUTPUT="${UBLOX_TEST_OUTPUT_DIR}" -P "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" - DEPENDS ${test_tmp_dir} "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_files}) + DEPENDS "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_files}) if (UBLOX_BUILD_TEST) if ((NOT UBLOX_GEN_PROTOCOL) OR (NOT UBLOX_BUILD_PROTOCOL)) @@ -405,24 +389,16 @@ if (UBLOX_GEN_TOOLS) set (tools_tmp_dir "${CMAKE_BINARY_DIR}/output_tools.tmp") - add_custom_target(rm_tools_tmp_tgt + add_custom_target("tools_output_tgt" ALL COMMAND ${CMAKE_COMMAND} -E remove_directory ${tools_tmp_dir} - ) - - add_custom_command( - OUTPUT ${tools_tmp_dir} - DEPENDS ${schema_files} ${src_files} rm_tools_tmp_tgt COMMAND ${COMMSDSL2TOOLS_QT} ${warn_as_error} ${COMMSDSL2TOOLS_QT_EXTRA_ARGS} --protocol "::CC UBLOX:UBX protocol used by the U-blox GNSS Receivers.:cc.UbloxProtocolPlugin" -o ${tools_tmp_dir} -c ${PROJECT_SOURCE_DIR}/src/tools -p ${PROJECT_SOURCE_DIR} -i ${UBLOX_SCHEMA_FILES_LIST_FILE} - ) - - add_custom_target("tools_output_tgt" ALL COMMAND ${CMAKE_COMMAND} -DGENERATED="${tools_tmp_dir}" -DOUTPUT="${UBLOX_TOOLS_OUTPUT_DIR}" -P "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" - DEPENDS ${tools_tmp_dir} "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_files}) + DEPENDS "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_files}) if (UBLOX_BUILD_TOOLS) if ((NOT UBLOX_GEN_PROTOCOL) OR (NOT UBLOX_BUILD_PROTOCOL)) @@ -468,23 +444,15 @@ if (UBLOX_GEN_SWIG) set (swig_tmp_dir "${CMAKE_BINARY_DIR}/output_swig.tmp") - add_custom_target(rm_swig_tmp_tgt + add_custom_target("swig_output_tgt" ALL COMMAND ${CMAKE_COMMAND} -E remove_directory ${swig_tmp_dir} - ) - - add_custom_command( - OUTPUT ${swig_tmp_dir} - DEPENDS ${schema_files} ${src_files} rm_swig_tmp_tgt COMMAND ${COMMSDSL2SWIG} ${warn_as_error} ${COMMSDSL2SWIG_EXTRA_ARGS} -c ${UBLOX_SWIG_SRC_DIR} -o ${swig_tmp_dir} -p ${PROJECT_SOURCE_DIR} -i ${UBLOX_SCHEMA_FILES_LIST_FILE} - ) - - add_custom_target("swig_output_tgt" ALL COMMAND ${CMAKE_COMMAND} -DGENERATED="${swig_tmp_dir}" -DOUTPUT="${UBLOX_SWIG_OUTPUT_DIR}" -P "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" - DEPENDS ${swig_tmp_dir} "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_files}) + DEPENDS "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_files}) if (UBLOX_BUILD_SWIG) if ((NOT UBLOX_GEN_PROTOCOL) OR (NOT UBLOX_BUILD_PROTOCOL)) @@ -535,23 +503,15 @@ if (UBLOX_GEN_EMSCRIPTEN) set (emscripten_tmp_dir "${CMAKE_BINARY_DIR}/output_emscripten.tmp") - add_custom_target(rm_emscripten_tmp_tgt + add_custom_target("emscripten_output_tgt" ALL COMMAND ${CMAKE_COMMAND} -E remove_directory ${emscripten_tmp_dir} - ) - - add_custom_command( - OUTPUT ${emscripten_tmp_dir} - DEPENDS ${schema_files} ${src_files} rm_emscripten_tmp_tgt COMMAND ${COMMSDSL2EMSCRIPTEN} ${warn_as_error} ${COMMSDSL2EMSCRIPTEN_EXTRA_ARGS} -o ${emscripten_tmp_dir} -c ${PROJECT_SOURCE_DIR}/src/emscripten -p ${PROJECT_SOURCE_DIR} -i ${UBLOX_SCHEMA_FILES_LIST_FILE} - ) - - add_custom_target("emscripten_output_tgt" ALL COMMAND ${CMAKE_COMMAND} -DGENERATED="${emscripten_tmp_dir}" -DOUTPUT="${UBLOX_EMSCRIPTEN_OUTPUT_DIR}" -P "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" - DEPENDS ${emscripten_tmp_dir} "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_files}) + DEPENDS "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_files}) if (UBLOX_BUILD_EMSCRIPTEN) if ((NOT UBLOX_GEN_PROTOCOL) OR (NOT UBLOX_BUILD_PROTOCOL)) From e76ea737dd430bb70cc7a347260f595c48139bd6 Mon Sep 17 00:00:00 2001 From: Alex Robenko Date: Mon, 30 Dec 2024 10:59:15 +1000 Subject: [PATCH 07/10] Forcing dslVersion="7". --- dsl/field/cfgval.xml | 6 +++--- dsl/main.xml | 2 +- dsl/message/AidAlpsrv.xml | 4 ++-- dsl/message/AidIni.xml | 28 ++++++++++++++-------------- dsl/message/CfgDosc.xml | 2 +- dsl/message/CfgEsrc.xml | 2 +- dsl/message/CfgFixseed.xml | 2 +- dsl/message/CfgGeofence.xml | 2 +- dsl/message/CfgGnss.xml | 4 ++-- dsl/message/CfgNavx5.xml | 6 +++--- dsl/message/CfgNmea.xml | 4 ++-- dsl/message/CfgOdo.xml | 2 +- dsl/message/CfgPm2.xml | 6 +++--- dsl/message/CfgPrt.xml | 26 +++++++++++--------------- dsl/message/CfgTmode2.xml | 12 ++++++------ dsl/message/CfgTmode3.xml | 4 ++-- dsl/message/CfgTp5.xml | 18 +++++++++--------- dsl/message/CfgValget.xml | 4 ++-- dsl/message/EsfMeas.xml | 4 ++-- dsl/message/EsfStatus.xml | 4 ++-- dsl/message/LogBatch.xml | 2 +- dsl/message/LogFindtime.xml | 4 ++-- dsl/message/MgaBds.xml | 10 +++++----- dsl/message/MgaFlash.xml | 8 ++++---- dsl/message/MgaGal.xml | 8 ++++---- dsl/message/MgaGlo.xml | 6 +++--- dsl/message/MgaGps.xml | 10 +++++----- dsl/message/MgaIni.xml | 14 +++++++------- dsl/message/MgaQzss.xml | 6 +++--- dsl/message/MonComms.xml | 2 +- dsl/message/MonPatch.xml | 4 ++-- dsl/message/NavDgps.xml | 2 +- dsl/message/NavGeofence.xml | 2 +- dsl/message/NavOrb.xml | 4 ++-- dsl/message/NavSat.xml | 2 +- dsl/message/NavSbas.xml | 2 +- dsl/message/NavSig.xml | 2 +- dsl/message/NavSlas.xml | 2 +- dsl/message/NavStatus.xml | 4 ++-- dsl/message/NavSvinfo.xml | 4 ++-- dsl/message/RxmImes.xml | 4 ++-- dsl/message/RxmMeasx.xml | 4 ++-- dsl/message/RxmPmreq.xml | 2 +- dsl/message/RxmRaw.xml | 2 +- dsl/message/RxmRawx.xml | 2 +- dsl/message/RxmRlm.xml | 4 ++-- dsl/message/RxmSfrbx.xml | 2 +- dsl/message/RxmSvsi.xml | 2 +- dsl/message/TimSmeas.xml | 2 +- dsl/message/TimVcocal.xml | 6 +++--- dsl/message/TimVrfy.xml | 2 +- dsl/message/UpdSos.xml | 8 ++++---- 52 files changed, 138 insertions(+), 142 deletions(-) diff --git a/dsl/field/cfgval.xml b/dsl/field/cfgval.xml index bd69238..45b0ed7 100644 --- a/dsl/field/cfgval.xml +++ b/dsl/field/cfgval.xml @@ -756,7 +756,7 @@ - + @@ -765,7 +765,7 @@ - + @@ -3595,7 +3595,7 @@ - + diff --git a/dsl/main.xml b/dsl/main.xml index bd2635b..7a99255 100644 --- a/dsl/main.xml +++ b/dsl/main.xml @@ -1,5 +1,5 @@ - + diff --git a/dsl/message/AidAlpsrv.xml b/dsl/message/AidAlpsrv.xml index 61ae353..7f2e6a1 100644 --- a/dsl/message/AidAlpsrv.xml +++ b/dsl/message/AidAlpsrv.xml @@ -6,7 +6,7 @@ - + @@ -17,7 +17,7 @@ - + diff --git a/dsl/message/AidIni.xml b/dsl/message/AidIni.xml index a1b51e7..554e393 100644 --- a/dsl/message/AidIni.xml +++ b/dsl/message/AidIni.xml @@ -1,22 +1,22 @@ - + - + - + - + - + - + @@ -25,19 +25,19 @@ - + - + - + - + @@ -48,16 +48,16 @@ - + - + - + - + diff --git a/dsl/message/CfgDosc.xml b/dsl/message/CfgDosc.xml index e5207a7..50df7bb 100644 --- a/dsl/message/CfgDosc.xml +++ b/dsl/message/CfgDosc.xml @@ -2,7 +2,7 @@ - + diff --git a/dsl/message/CfgEsrc.xml b/dsl/message/CfgEsrc.xml index 8fb66b5..2e3667a 100644 --- a/dsl/message/CfgEsrc.xml +++ b/dsl/message/CfgEsrc.xml @@ -2,7 +2,7 @@ - + diff --git a/dsl/message/CfgFixseed.xml b/dsl/message/CfgFixseed.xml index 9ae4fc4..b5a0f28 100644 --- a/dsl/message/CfgFixseed.xml +++ b/dsl/message/CfgFixseed.xml @@ -2,7 +2,7 @@ - + diff --git a/dsl/message/CfgGeofence.xml b/dsl/message/CfgGeofence.xml index 90c9c9e..6127564 100644 --- a/dsl/message/CfgGeofence.xml +++ b/dsl/message/CfgGeofence.xml @@ -2,7 +2,7 @@ - + diff --git a/dsl/message/CfgGnss.xml b/dsl/message/CfgGnss.xml index e5b74d8..f3c6a22 100644 --- a/dsl/message/CfgGnss.xml +++ b/dsl/message/CfgGnss.xml @@ -4,7 +4,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/dsl/message/CfgNavx5.xml b/dsl/message/CfgNavx5.xml index 5df58c1..da49af5 100644 --- a/dsl/message/CfgNavx5.xml +++ b/dsl/message/CfgNavx5.xml @@ -27,7 +27,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -81,7 +81,7 @@ - + diff --git a/dsl/message/CfgNmea.xml b/dsl/message/CfgNmea.xml index 2fe367f..7a13a45 100644 --- a/dsl/message/CfgNmea.xml +++ b/dsl/message/CfgNmea.xml @@ -51,7 +51,7 @@ - + @@ -65,7 +65,7 @@ - + diff --git a/dsl/message/CfgOdo.xml b/dsl/message/CfgOdo.xml index dab898a..9e29978 100644 --- a/dsl/message/CfgOdo.xml +++ b/dsl/message/CfgOdo.xml @@ -17,7 +17,7 @@ - + diff --git a/dsl/message/CfgPm2.xml b/dsl/message/CfgPm2.xml index 61b61da..142ebe2 100644 --- a/dsl/message/CfgPm2.xml +++ b/dsl/message/CfgPm2.xml @@ -22,11 +22,11 @@ - + - + @@ -43,7 +43,7 @@ - + diff --git a/dsl/message/CfgPrt.xml b/dsl/message/CfgPrt.xml index 903bf52..68c1524 100644 --- a/dsl/message/CfgPrt.xml +++ b/dsl/message/CfgPrt.xml @@ -32,16 +32,15 @@ - + - - + - + @@ -51,21 +50,20 @@ - + - - + - + @@ -78,7 +76,7 @@ - + @@ -88,9 +86,8 @@ - + - @@ -103,14 +100,13 @@ - + - - + @@ -121,7 +117,7 @@ - + diff --git a/dsl/message/CfgTmode2.xml b/dsl/message/CfgTmode2.xml index a25fcbc..4c34c3e 100644 --- a/dsl/message/CfgTmode2.xml +++ b/dsl/message/CfgTmode2.xml @@ -11,22 +11,22 @@ - + - + - + - + - + - + diff --git a/dsl/message/CfgTmode3.xml b/dsl/message/CfgTmode3.xml index dd8d7fd..37c6dbc 100644 --- a/dsl/message/CfgTmode3.xml +++ b/dsl/message/CfgTmode3.xml @@ -13,7 +13,7 @@ - + @@ -23,7 +23,7 @@ - + diff --git a/dsl/message/CfgTp5.xml b/dsl/message/CfgTp5.xml index a1abb2a..79bd06a 100644 --- a/dsl/message/CfgTp5.xml +++ b/dsl/message/CfgTp5.xml @@ -13,28 +13,28 @@ - + - + - + - + - + - + - + - + @@ -56,7 +56,7 @@ - + diff --git a/dsl/message/CfgValget.xml b/dsl/message/CfgValget.xml index 7cd631e..99903aa 100644 --- a/dsl/message/CfgValget.xml +++ b/dsl/message/CfgValget.xml @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/dsl/message/EsfMeas.xml b/dsl/message/EsfMeas.xml index 04c1b82..796c086 100644 --- a/dsl/message/EsfMeas.xml +++ b/dsl/message/EsfMeas.xml @@ -18,10 +18,10 @@ - + - + diff --git a/dsl/message/EsfStatus.xml b/dsl/message/EsfStatus.xml index a696cc0..3b088e6 100644 --- a/dsl/message/EsfStatus.xml +++ b/dsl/message/EsfStatus.xml @@ -11,7 +11,7 @@ - + @@ -34,7 +34,7 @@ - + diff --git a/dsl/message/LogBatch.xml b/dsl/message/LogBatch.xml index 5ae7f2a..e9ce9b4 100644 --- a/dsl/message/LogBatch.xml +++ b/dsl/message/LogBatch.xml @@ -27,7 +27,7 @@ - + diff --git a/dsl/message/LogFindtime.xml b/dsl/message/LogFindtime.xml index 0f44c2e..e22d99d 100644 --- a/dsl/message/LogFindtime.xml +++ b/dsl/message/LogFindtime.xml @@ -2,7 +2,7 @@ - + @@ -15,7 +15,7 @@ - + diff --git a/dsl/message/MgaBds.xml b/dsl/message/MgaBds.xml index 0b46fb4..8f88fc9 100644 --- a/dsl/message/MgaBds.xml +++ b/dsl/message/MgaBds.xml @@ -1,7 +1,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -78,7 +78,7 @@ - + diff --git a/dsl/message/MgaFlash.xml b/dsl/message/MgaFlash.xml index c980d74..7131d7f 100644 --- a/dsl/message/MgaFlash.xml +++ b/dsl/message/MgaFlash.xml @@ -1,20 +1,20 @@ - + - + - + - + diff --git a/dsl/message/MgaGal.xml b/dsl/message/MgaGal.xml index 84cf4a8..ed54ff8 100644 --- a/dsl/message/MgaGal.xml +++ b/dsl/message/MgaGal.xml @@ -1,7 +1,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -60,7 +60,7 @@ - + @@ -71,7 +71,7 @@ - + diff --git a/dsl/message/MgaGlo.xml b/dsl/message/MgaGlo.xml index 5919592..58fbdc0 100644 --- a/dsl/message/MgaGlo.xml +++ b/dsl/message/MgaGlo.xml @@ -1,7 +1,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/dsl/message/MgaGps.xml b/dsl/message/MgaGps.xml index ffb5dbd..9133b2e 100644 --- a/dsl/message/MgaGps.xml +++ b/dsl/message/MgaGps.xml @@ -1,7 +1,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -77,7 +77,7 @@ - + diff --git a/dsl/message/MgaIni.xml b/dsl/message/MgaIni.xml index 758fb32..676ff17 100644 --- a/dsl/message/MgaIni.xml +++ b/dsl/message/MgaIni.xml @@ -1,7 +1,7 @@ - + @@ -11,7 +11,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -98,7 +98,7 @@ - + diff --git a/dsl/message/MgaQzss.xml b/dsl/message/MgaQzss.xml index eb13667..1ecb079 100644 --- a/dsl/message/MgaQzss.xml +++ b/dsl/message/MgaQzss.xml @@ -1,7 +1,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -54,7 +54,7 @@ - + diff --git a/dsl/message/MonComms.xml b/dsl/message/MonComms.xml index 063e220..f52ad15 100644 --- a/dsl/message/MonComms.xml +++ b/dsl/message/MonComms.xml @@ -2,7 +2,7 @@ - + diff --git a/dsl/message/MonPatch.xml b/dsl/message/MonPatch.xml index ecc4fc5..a9a1b0b 100644 --- a/dsl/message/MonPatch.xml +++ b/dsl/message/MonPatch.xml @@ -2,7 +2,7 @@ - + @@ -15,7 +15,7 @@ - + diff --git a/dsl/message/NavDgps.xml b/dsl/message/NavDgps.xml index 92f27e9..cf8b73e 100644 --- a/dsl/message/NavDgps.xml +++ b/dsl/message/NavDgps.xml @@ -5,7 +5,7 @@ - + diff --git a/dsl/message/NavGeofence.xml b/dsl/message/NavGeofence.xml index 143ad60..d2c1067 100644 --- a/dsl/message/NavGeofence.xml +++ b/dsl/message/NavGeofence.xml @@ -14,7 +14,7 @@ - + diff --git a/dsl/message/NavOrb.xml b/dsl/message/NavOrb.xml index 3c94121..a374cc3 100644 --- a/dsl/message/NavOrb.xml +++ b/dsl/message/NavOrb.xml @@ -3,7 +3,7 @@ - + @@ -21,7 +21,7 @@ - + diff --git a/dsl/message/NavSat.xml b/dsl/message/NavSat.xml index 06be935..8a7db16 100644 --- a/dsl/message/NavSat.xml +++ b/dsl/message/NavSat.xml @@ -3,7 +3,7 @@ - + diff --git a/dsl/message/NavSbas.xml b/dsl/message/NavSbas.xml index 984be75..1e3c941 100644 --- a/dsl/message/NavSbas.xml +++ b/dsl/message/NavSbas.xml @@ -27,7 +27,7 @@ - + diff --git a/dsl/message/NavSig.xml b/dsl/message/NavSig.xml index f952b93..8121998 100644 --- a/dsl/message/NavSig.xml +++ b/dsl/message/NavSig.xml @@ -3,7 +3,7 @@ - + diff --git a/dsl/message/NavSlas.xml b/dsl/message/NavSlas.xml index ef0aef6..859180d 100644 --- a/dsl/message/NavSlas.xml +++ b/dsl/message/NavSlas.xml @@ -13,7 +13,7 @@ - + diff --git a/dsl/message/NavStatus.xml b/dsl/message/NavStatus.xml index f7e0e54..f80a713 100644 --- a/dsl/message/NavStatus.xml +++ b/dsl/message/NavStatus.xml @@ -28,14 +28,14 @@ - + - + diff --git a/dsl/message/NavSvinfo.xml b/dsl/message/NavSvinfo.xml index 0a55368..5d1f486 100644 --- a/dsl/message/NavSvinfo.xml +++ b/dsl/message/NavSvinfo.xml @@ -2,7 +2,7 @@ - + @@ -11,7 +11,7 @@ - + diff --git a/dsl/message/RxmImes.xml b/dsl/message/RxmImes.xml index c12c3e8..bba21e8 100644 --- a/dsl/message/RxmImes.xml +++ b/dsl/message/RxmImes.xml @@ -1,7 +1,7 @@ - + @@ -15,7 +15,7 @@ - + diff --git a/dsl/message/RxmMeasx.xml b/dsl/message/RxmMeasx.xml index 2516f89..22a5815 100644 --- a/dsl/message/RxmMeasx.xml +++ b/dsl/message/RxmMeasx.xml @@ -13,14 +13,14 @@ - + - + diff --git a/dsl/message/RxmPmreq.xml b/dsl/message/RxmPmreq.xml index 4074a78..cf55d81 100644 --- a/dsl/message/RxmPmreq.xml +++ b/dsl/message/RxmPmreq.xml @@ -8,7 +8,7 @@ - + diff --git a/dsl/message/RxmRaw.xml b/dsl/message/RxmRaw.xml index b0afa63..33d0224 100644 --- a/dsl/message/RxmRaw.xml +++ b/dsl/message/RxmRaw.xml @@ -3,7 +3,7 @@ - + diff --git a/dsl/message/RxmRawx.xml b/dsl/message/RxmRawx.xml index 7a59f93..6597175 100644 --- a/dsl/message/RxmRawx.xml +++ b/dsl/message/RxmRawx.xml @@ -4,7 +4,7 @@ - + diff --git a/dsl/message/RxmRlm.xml b/dsl/message/RxmRlm.xml index ec2ae31..3db2eba 100644 --- a/dsl/message/RxmRlm.xml +++ b/dsl/message/RxmRlm.xml @@ -2,7 +2,7 @@ - + @@ -13,7 +13,7 @@ - + diff --git a/dsl/message/RxmSfrbx.xml b/dsl/message/RxmSfrbx.xml index e01b802..f8061e2 100644 --- a/dsl/message/RxmSfrbx.xml +++ b/dsl/message/RxmSfrbx.xml @@ -5,7 +5,7 @@ - + diff --git a/dsl/message/RxmSvsi.xml b/dsl/message/RxmSvsi.xml index 2a4a249..96f83d6 100644 --- a/dsl/message/RxmSvsi.xml +++ b/dsl/message/RxmSvsi.xml @@ -4,7 +4,7 @@ - + diff --git a/dsl/message/TimSmeas.xml b/dsl/message/TimSmeas.xml index a155b06..2dcfd62 100644 --- a/dsl/message/TimSmeas.xml +++ b/dsl/message/TimSmeas.xml @@ -2,7 +2,7 @@ - + diff --git a/dsl/message/TimVcocal.xml b/dsl/message/TimVcocal.xml index 7e941c8..3ba2e4b 100644 --- a/dsl/message/TimVcocal.xml +++ b/dsl/message/TimVcocal.xml @@ -1,7 +1,7 @@ - + @@ -13,7 +13,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/dsl/message/TimVrfy.xml b/dsl/message/TimVrfy.xml index 0043c99..a709fef 100644 --- a/dsl/message/TimVrfy.xml +++ b/dsl/message/TimVrfy.xml @@ -12,7 +12,7 @@ - + diff --git a/dsl/message/UpdSos.xml b/dsl/message/UpdSos.xml index 5c8df33..9126a8a 100644 --- a/dsl/message/UpdSos.xml +++ b/dsl/message/UpdSos.xml @@ -10,7 +10,7 @@ - + @@ -22,7 +22,7 @@ - + @@ -32,12 +32,12 @@ - + - + From 05008d30eb93f5557ffadd6fba91a56357860f65 Mon Sep 17 00:00:00 2001 From: Alex Robenko Date: Thu, 9 Jan 2025 08:50:02 +1000 Subject: [PATCH 08/10] Using boost 1.87 on windows runners in github actions. --- .github/workflows/actions_build.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml index b309191..e37dfad 100644 --- a/.github/workflows/actions_build.yml +++ b/.github/workflows/actions_build.yml @@ -11,6 +11,8 @@ env: COMMS_TAG: develop COMMSDSL_TAG: develop CC_TOOLS_QT_TAG: develop + WIN_BOOST_VERSION: "1.87.0" + WIN_BOOST_DIR: "C:/local/boost_1_87_0" jobs: build_gcc_old_ubuntu_20_04: @@ -560,7 +562,8 @@ jobs: if: matrix.arch == 'x64' shell: cmd run: | - choco install boost-msvc-14.2 --version=1.85.0 + choco install boost-msvc-14.2 --version=${{env.WIN_BOOST_VERSION}} + echo BOOST_DIR=${{env.WIN_BOOST_DIR}}/lib64-msvc-14.2/cmake >>%GITHUB_ENV% - name: Prepare externals shell: cmd @@ -585,8 +588,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;${{env.QTDIR}}" ^ - -DCMAKE_POLICY_DEFAULT_CMP0167=OLD -DBoost_USE_STATIC_LIBS=ON ^ + -DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{env.QTDIR}};${{env.BOOST_DIR}}" ^ + -DCMAKE_POLICY_DEFAULT_CMP0167=NEW ^ -DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DUBLOX_TOOLS_QT_VER=${{matrix.qt_ver}} ^ -DUBLOX_GEN_PROTOCOL=ON -DUBLOX_GEN_TEST=ON -DUBLOX_GEN_TOOLS=ON -DUBLOX_BUILD_TOOLS=${{env.BUILD_TOOLS}} ^ -DUBLOX_BUILD_EXAMPLES=${{env.HAS_BOOST}} ^ @@ -621,7 +624,8 @@ jobs: if: matrix.arch == 'x64' shell: cmd run: | - choco install boost-msvc-14.3 --version=1.85.0 + choco install boost-msvc-14.3 --version=${{env.WIN_BOOST_VERSION}} + echo BOOST_DIR=${{env.WIN_BOOST_DIR}}/lib64-msvc-14.3/cmake >>%GITHUB_ENV% - name: Prepare externals shell: cmd @@ -645,7 +649,7 @@ jobs: run: | cmake %GITHUB_WORKSPACE% -A ${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install ^ -DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install" ^ - -DCMAKE_POLICY_DEFAULT_CMP0167=OLD -DBoost_USE_STATIC_LIBS=ON ^ + -DCMAKE_POLICY_DEFAULT_CMP0167=NEW ^ -DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DUBLOX_TOOLS_QT_VER=${{matrix.qt_ver}} ^ -DUBLOX_GEN_PROTOCOL=ON -DUBLOX_GEN_TEST=ON -DUBLOX_BUILD_EXAMPLES=${{env.HAS_BOOST}} ^ -DUBLOX_SCHEMA_FILES_LIST_FILE=%GITHUB_WORKSPACE%/basic_msgs.txt From 27ab16b459a8469cb699f3684812b0df4ae577cc Mon Sep 17 00:00:00 2001 From: Alex Robenko Date: Tue, 14 Jan 2025 08:09:45 +1000 Subject: [PATCH 09/10] Using comms v5.3, commsdsl v7.0, cc_tools_qt v6.0 on github actions. --- .github/workflows/actions_build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml index e37dfad..7aa6e45 100644 --- a/.github/workflows/actions_build.yml +++ b/.github/workflows/actions_build.yml @@ -8,9 +8,9 @@ on: - '**' env: - COMMS_TAG: develop - COMMSDSL_TAG: develop - CC_TOOLS_QT_TAG: develop + COMMS_TAG: v5.3 + COMMSDSL_TAG: v7.0 + CC_TOOLS_QT_TAG: v6.0 WIN_BOOST_VERSION: "1.87.0" WIN_BOOST_DIR: "C:/local/boost_1_87_0" From 29e7aa38225338ad1541caccd559bc2333674983 Mon Sep 17 00:00:00 2001 From: Alex Robenko Date: Tue, 14 Jan 2025 08:11:16 +1000 Subject: [PATCH 10/10] Added copyright to example code. --- examples/common/include/common/boost_wrap.h | 7 +++++++ examples/simple_pos/ProgramOptions.cpp | 7 +++++++ examples/simple_pos/ProgramOptions.h | 7 +++++++ examples/simple_pos/Session.cpp | 7 +++++++ examples/simple_pos/Session.h | 7 +++++++ examples/simple_pos/main.cpp | 7 +++++++ 6 files changed, 42 insertions(+) diff --git a/examples/common/include/common/boost_wrap.h b/examples/common/include/common/boost_wrap.h index 0247a82..6ffa121 100644 --- a/examples/common/include/common/boost_wrap.h +++ b/examples/common/include/common/boost_wrap.h @@ -1,3 +1,10 @@ +// +// Copyright 2018 - 2025 (C). Alex Robenko. All rights reserved. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. + #pragma once #include diff --git a/examples/simple_pos/ProgramOptions.cpp b/examples/simple_pos/ProgramOptions.cpp index e97b6b8..b44bb08 100644 --- a/examples/simple_pos/ProgramOptions.cpp +++ b/examples/simple_pos/ProgramOptions.cpp @@ -1,3 +1,10 @@ +// +// Copyright 2018 - 2025 (C). Alex Robenko. All rights reserved. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. + #include "ProgramOptions.h" #include #include diff --git a/examples/simple_pos/ProgramOptions.h b/examples/simple_pos/ProgramOptions.h index 1a4e1bf..6c6f17e 100644 --- a/examples/simple_pos/ProgramOptions.h +++ b/examples/simple_pos/ProgramOptions.h @@ -1,3 +1,10 @@ +// +// Copyright 2018 - 2025 (C). Alex Robenko. All rights reserved. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. + #pragma once #include diff --git a/examples/simple_pos/Session.cpp b/examples/simple_pos/Session.cpp index 1960dd2..4603622 100644 --- a/examples/simple_pos/Session.cpp +++ b/examples/simple_pos/Session.cpp @@ -1,3 +1,10 @@ +// +// Copyright 2018 - 2025 (C). Alex Robenko. All rights reserved. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. + #include "Session.h" #include diff --git a/examples/simple_pos/Session.h b/examples/simple_pos/Session.h index fbc1f0b..730ea8d 100644 --- a/examples/simple_pos/Session.h +++ b/examples/simple_pos/Session.h @@ -1,3 +1,10 @@ +// +// Copyright 2018 - 2025 (C). Alex Robenko. All rights reserved. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. + #pragma once #include diff --git a/examples/simple_pos/main.cpp b/examples/simple_pos/main.cpp index ce71fd6..73c4f01 100644 --- a/examples/simple_pos/main.cpp +++ b/examples/simple_pos/main.cpp @@ -1,3 +1,10 @@ +// +// Copyright 2018 - 2025 (C). Alex Robenko. All rights reserved. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. + #include #include #include