Release v5.1

commschamp · Oct 11, 2022 · 816a47a · 816a47a
2 parents e28043b + 0d74a9a
commit 816a47a
Show file tree

Hide file tree

Showing 234 changed files with 11,656 additions and 447 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -47,7 +47,9 @@ install:
 build_script:
     - echo ------------------------- Building Project -------------------------
     - cd %BUILD_DIR%
-    - cmake .. -DCMAKE_BUILD_TYPE=%CONFIGURATION% -G "NMake Makefiles" -DCMAKE_INSTALL_PREFIX="%COMMON_INSTALL_DIR%" -DCMAKE_PREFIX_PATH="%COMMON_INSTALL_DIR%" -DCOMMSDSL_TESTS_CXX_STANDARD=%CPP_STD% -DCOMMSDSL_BUILD_UNIT_TESTS=ON
+    - cmake .. -DCMAKE_BUILD_TYPE=%CONFIGURATION% -G "NMake Makefiles" -DCMAKE_INSTALL_PREFIX="%COMMON_INSTALL_DIR%" ^
+        -DCMAKE_PREFIX_PATH="%COMMON_INSTALL_DIR%" -DCOMMSDSL_TESTS_CXX_STANDARD=%CPP_STD% ^
+        -DCOMMSDSL_BUILD_UNIT_TESTS=ON -DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON
     - cmake --build . --config %CONFIGURATION% --target install
     - echo ------------------------- Testing -------------------------
     - ctest

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+github: arobenko
+custom: "https://www.paypal.me/arobenko"
diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml
@@ -45,7 +45,12 @@ jobs:
     - name: Configure CMake
       shell: bash
       working-directory: ${{runner.workspace}}/build
-      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 -DCOMMSDSL_TESTS_C_COMPILER=gcc-${{matrix.cc_ver}} -DCOMMSDSL_TESTS_CXX_COMPILER=g++-${{matrix.cc_ver}} -DCOMMSDSL_TESTS_CXX_STANDARD=${{matrix.cpp}} -DCOMMSDSL_BUILD_UNIT_TESTS=ON -DCOMMSDSL_TEST_USE_SANITIZERS=OFF
+      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 \
+              -DCOMMSDSL_TESTS_C_COMPILER=gcc-${{matrix.cc_ver}} -DCOMMSDSL_TESTS_CXX_COMPILER=g++-${{matrix.cc_ver}} \
+              -DCOMMSDSL_TESTS_CXX_STANDARD=${{matrix.cpp}} -DCOMMSDSL_BUILD_UNIT_TESTS=ON -DCOMMSDSL_TEST_USE_SANITIZERS=OFF \
+              -DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON
       env:
         CC: gcc-8
         CXX: g++-8
@@ -100,7 +105,12 @@ jobs:
     - name: Configure CMake
       shell: bash
       working-directory: ${{runner.workspace}}/build
-      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 -DCOMMSDSL_TESTS_C_COMPILER=gcc-${{matrix.cc_ver}} -DCOMMSDSL_TESTS_CXX_COMPILER=g++-${{matrix.cc_ver}} -DCOMMSDSL_TESTS_CXX_STANDARD=${{matrix.cpp}} -DCOMMSDSL_BUILD_UNIT_TESTS=ON -DCOMMSDSL_TEST_USE_SANITIZERS=OFF
+      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 \
+          -DCOMMSDSL_TESTS_C_COMPILER=gcc-${{matrix.cc_ver}} -DCOMMSDSL_TESTS_CXX_COMPILER=g++-${{matrix.cc_ver}} \
+          -DCOMMSDSL_TESTS_CXX_STANDARD=${{matrix.cpp}} -DCOMMSDSL_BUILD_UNIT_TESTS=ON -DCOMMSDSL_TEST_USE_SANITIZERS=OFF \
+          -DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON
       env:
         CC: gcc-8
         CXX: g++-8
@@ -117,18 +127,14 @@ jobs:
       shell: bash
       run: ctest
 
-
   build_gcc_ubuntu_20_04:
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
         type: [Debug, Release, MinSizeRel]
-        cc_ver: [8, 9, 10, 11]
-        cpp: [11, 14, 17, 20]
-        exclude:
-          - cc_ver: 8
-            cpp: 20
+        cc_ver: [8]
+        cpp: [11, 14, 17]
 
     steps:
     - uses: actions/checkout@v2
@@ -159,7 +165,11 @@ jobs:
     - 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 -DCOMMSDSL_TESTS_CXX_STANDARD=${{matrix.cpp}} -DCOMMSDSL_BUILD_UNIT_TESTS=ON -DCOMMSDSL_TEST_BUILD_DOC=ON
+      run: |
+        cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
+        -DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCOMMSDSL_TESTS_CXX_STANDARD=${{matrix.cpp}} \
+        -DCOMMSDSL_BUILD_UNIT_TESTS=ON -DCOMMSDSL_TEST_BUILD_DOC=ON \
+        -DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON
       env:
         CC: gcc-${{matrix.cc_ver}}
         CXX: g++-${{matrix.cc_ver}}
@@ -175,6 +185,67 @@ jobs:
       working-directory: ${{runner.workspace}}/build
       shell: bash
       run: ctest
+
+  build_gcc_ubuntu_22_04:
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        type: [Debug, Release, MinSizeRel]
+        cc_ver: [9, 10, 11, 12]
+        cpp: [11, 14, 17, 20]
+
+    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 libxml2-dev doxygen gcc-${{matrix.cc_ver}} g++-${{matrix.cc_ver}} \
+        python3 libpython3-dev swig default-jdk default-jre
+
+    - 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_BRANCH}}
+        CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_BRANCH}}
+
+    - 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 -DCOMMSDSL_TESTS_CXX_STANDARD=${{matrix.cpp}} \
+        -DCOMMSDSL_BUILD_UNIT_TESTS=ON -DCOMMSDSL_TEST_BUILD_DOC=ON \
+        -DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON -DCOMMSDSL_BUILD_COMMSDSL2SWIG=ON
+      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 
+
+    - name: Testing    
+      working-directory: ${{runner.workspace}}/build
+      shell: bash
+      run: ctest      
 
   build_clang_ubuntu_18_04:
     runs-on: ubuntu-18.04
@@ -219,7 +290,12 @@ jobs:
     - name: Configure CMake
       shell: bash
       working-directory: ${{runner.workspace}}/build
-      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 -DCOMMSDSL_TESTS_C_COMPILER=clang-${{matrix.cc_ver}} -DCOMMSDSL_TESTS_CXX_COMPILER=clang++-${{matrix.cc_ver}} -DCOMMSDSL_TESTS_CXX_STANDARD=${{matrix.cpp}} -DCOMMSDSL_BUILD_UNIT_TESTS=ON -DCOMMSDSL_TEST_USE_SANITIZERS=OFF
+      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 \
+          -DCOMMSDSL_TESTS_C_COMPILER=clang-${{matrix.cc_ver}} -DCOMMSDSL_TESTS_CXX_COMPILER=clang++-${{matrix.cc_ver}} \
+          -DCOMMSDSL_TESTS_CXX_STANDARD=${{matrix.cpp}} -DCOMMSDSL_BUILD_UNIT_TESTS=ON -DCOMMSDSL_TEST_USE_SANITIZERS=OFF \
+          -DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON
       env:
         CC: clang-6.0
         CXX: clang++-6.0
@@ -242,7 +318,7 @@ jobs:
       fail-fast: false
       matrix:
         type: [Debug, Release, MinSizeRel]
-        cc_ver: [7, 8, 9, 10, 11, 12]
+        cc_ver: [7, 8, 9, 10, 11]
         cpp: [11, 14, 17, 20]
         exclude:
           - cc_ver: 7
@@ -279,7 +355,72 @@ jobs:
     - 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 -DCOMMSDSL_TESTS_CXX_STANDARD=${{matrix.cpp}} -DCOMMSDSL_BUILD_UNIT_TESTS=ON
+      run: |
+          cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
+          -DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCOMMSDSL_TESTS_CXX_STANDARD=${{matrix.cpp}} \
+          -DCOMMSDSL_BUILD_UNIT_TESTS=ON \
+          -DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON
+      env:
+        CC: clang-${{matrix.cc_ver}}
+        CXX: clang++-${{matrix.cc_ver}}
+
+    - name: Build Target 
+      working-directory: ${{runner.workspace}}/build
+      shell: bash
+      run: cmake --build . --config ${{matrix.type}} --target install
+      env:
+        VERBOSE: 1 
+
+    - name: Testing    
+      working-directory: ${{runner.workspace}}/build
+      shell: bash
+      run: ctest
+
+  build_clang_ubuntu_22_04:
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        type: [Debug, Release, MinSizeRel]
+        cc_ver: [12, 13, 14]
+        cpp: [11, 14, 17, 20]
+
+    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 libxml2-dev clang-${{matrix.cc_ver}} \
+        python3 libpython3-dev swig  default-jdk default-jre
+
+    - 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_BRANCH}}
+        CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_BRANCH}} 
+
+    - 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 -DCOMMSDSL_TESTS_CXX_STANDARD=${{matrix.cpp}} \
+          -DCOMMSDSL_BUILD_UNIT_TESTS=ON \
+          -DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON -DCOMMSDSL_BUILD_COMMSDSL2SWIG=ON
       env:
         CC: clang-${{matrix.cc_ver}}
         CXX: clang++-${{matrix.cc_ver}}

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,10 +3,13 @@ project ("commsdsl")
 
 option (COMMSDSL_WARN_AS_ERR "Treat warning as error" ON)
 option (COMMSDSL_USE_CCACHE "Use ccache on UNIX systems if it's available" ON)
-option (COMMSDSL_INSTALL_LIBRARY "Install commdsl library" ON )
+option (COMMSDSL_INSTALL_LIBRARY "Install commdsl library" OFF )
 option (COMMSDSL_INSTALL_LIBRARY_HEADERS "Install commdsl library headers" ${COMMSDSL_INSTALL_LIBRARY})
-option (COMMSDSL_BUILD_APPS "Build applications" ON)
-option (COMMSDSL_INSTALL_APPS "Build applications" ${COMMSDSL_BUILD_APPS})
+option (COMMSDSL_BUILD_COMMSDSL2COMMS "Build commsdsl2comms" ON)
+option (COMMSDSL_BUILD_COMMSDSL2TEST "Build commsdsl2test" OFF)
+option (COMMSDSL_BUILD_COMMSDSL2TOOLS_QT "Build commsdsl2tools_qt" OFF)
+option (COMMSDSL_BUILD_COMMSDSL2SWIG "Build commsdsl2swig" OFF)
+option (COMMSDSL_INSTALL_APPS "Install applications" ON)
 option (COMMSDSL_BUILD_UNIT_TESTS "Build unittests." OFF)
 option (COMMSDSL_VALGRIND_TESTS "Enable testing with valgrind (applicable when COMMSDSL_BUILD_UNIT_TESTS is on)" OFF)
 option (COMMSDSL_TEST_USE_SANITIZERS "Build unittiests with sanitizers (applicable when COMMSDSL_BUILD_UNIT_TESTS is on)" ON)

diff --git a/README.md b/README.md
@@ -1,28 +1,39 @@
 # Overview
 This project is a member of [CommsChampion Ecosystem](https://commschamp.github.io).
-It provides several code generators that produce C++11 code of a binary communication protocol,
-defined using [CommsDSL](https://github.com/commschamp/CommsDSL-Specification) 
-schema files as well as satellite codes that could be used for testing and 
-protocol visualization. 
+It provides multiple code generators to produce C++11 binary protocol
+definition code as well as other satellite components that can be used to (fuzz) test
+the protocol definition, visualize the message contents, debug the protocol messages exchange,
+as well as create bindings (glue code) for other high level programming languages.
 
 # What's Inside
 - **commsdsl2comms** - A code generator, that produces C++11 code for binary
 protocol definition out of [CommsDSL](https://github.com/commschamp/CommsDSL-Specification) 
 schema files. The generated outcome is actually a CMake project that can be used to
-build and install multiple targets. For details on how to use the tool, please read the 
+properly install protocol definition headers as well as relevant cmake configuration files. 
+For details on how to use the tool, please read the 
 [commsdsl2comms Manual](doc/Manual_commsdsl2comms.md) 
 documentation page. For details on the generated CMake project please read the
 [Generated CMake Project Walkthrough](doc/GeneratedProjectWalkthrough.md)
 documentation page.
-- **commsdsl2test** - A code generator, that produces C++11 code for fuzz
+- **commsdsl2test** - A code generator that produces C++11 code for fuzz
 testing of the protocol definition produced by the **commsdsl2comms**.
+Details are in the [Testing Generated Protocol Code](doc/TestingGeneratedProtocolCode.md) documentation
+page. Build requires explicit cmake enable [option](CMakeLists.txt).
 - **commsdsl2tools_qt** - A code generator, that produces the protocol
-definition plugin code for [CommmsChampion Tools](https://github.com/commschamp/cc_tools_qt).
-- **libcommsdsl** - A C++ library for parsing of 
-[CommsDSL](https://github.com/commschamp/CommsDSL-Specification) schema files.
-It can be used to implement independent code generators, which can produce
-protocol definition code in other programming languages, bindings to the C++
-classes generated by the **commsdsl2comms**, extra testing, etc... 
+definition plugin code for [CommmsChampion Tools](https://github.com/commschamp/cc_tools_qt),
+which can be used to visualize message contents as well as debug / observe exchange
+of the messages between different systems. Details are in the
+[Visual Protocol Analysis](doc/VisualProtocolAnalysis.md) documentation page.
+Build requires explicit cmake enable [option](CMakeLists.txt).
+- **commsdsl2swig** - A code generator that produces [SWIG](https://www.swig.org) interface 
+file(s) for the protocol definition produced by the **commsdsl2comms**.
+It allows generation of the bindings (glue code) to other high level 
+programming languages using external [swig](https://www.swig.org) utility.
+Details are in the [Other Languages Support](doc/OtherLanguagesSupport.md) documentation page.
+Build requires explicit cmake enable [option](CMakeLists.txt).
+- **libcommsdsl** - A C++ library containing common functionality for parsing of the
+[CommsDSL](https://github.com/commschamp/CommsDSL-Specification) schema files as
+well code generation. It can be used to implement independent code generators.
 NOTE, that at this moment, the library is not documented. Please
 [get in touch](#contact-information) in case you need it. I'll let you know
 when it's going to be ready.
@@ -32,7 +43,7 @@ The code of this project (libraries and tools it contains)
 is licensed under [Apache v2.0](https://www.apache.org/licenses/LICENSE-2.0) license.
 
 The generated code has no license, the vendor is free to
-pick any as long as it's compatibile with the
+pick any as long as it's compatible with the
 [license](https://commschamp.github.io/licenses/) of the
 relevant [CommsChampion Ecosystem](https://commschamp.github.io) project.
 

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -1,8 +1,4 @@
-if (NOT COMMSDSL_BUILD_APPS)
-    return ()
-endif ()
-
-#add_subdirectory (commsdsl2old)
 add_subdirectory (commsdsl2comms)
+add_subdirectory (commsdsl2swig)
 add_subdirectory (commsdsl2test)
 add_subdirectory (commsdsl2tools_qt)
diff --git a/app/commsdsl2comms/CMakeLists.txt b/app/commsdsl2comms/CMakeLists.txt
@@ -1,3 +1,7 @@
+if (NOT COMMSDSL_BUILD_COMMSDSL2COMMS)
+    return()
+endif ()
+
 set (APP_NAME "commsdsl2comms")
 
 add_subdirectory (src)

diff --git a/app/commsdsl2comms/src/CommsBitfieldField.cpp b/app/commsdsl2comms/src/CommsBitfieldField.cpp
@@ -277,13 +277,6 @@ bool CommsBitfieldField::commsHasCustomLengthDeepImpl() const
             });
 }
 
-void CommsBitfieldField::commsSetReferencedImpl()
-{
-    for (auto* m : m_members) {
-        m->commsSetReferenced();
-    }
-}
-
 bool CommsBitfieldField::commsPrepareInternal()
 {
     m_members = commsTransformFieldsList(members());

diff --git a/app/commsdsl2comms/src/CommsBitfieldField.h b/app/commsdsl2comms/src/CommsBitfieldField.h
@@ -58,7 +58,6 @@ class CommsBitfieldField final : public commsdsl::gen::BitfieldField, public Com
     virtual std::string commsCompValueCastTypeImpl(const std::string& accStr, const std::string& prefix) const override;
     virtual std::string commsCompPrepValueStrImpl(const std::string& accStr, const std::string& value) const override;
     virtual bool commsHasCustomLengthDeepImpl() const override;
-    virtual void commsSetReferencedImpl() override;
 
 private:
     bool commsPrepareInternal();

diff --git a/app/commsdsl2comms/src/CommsBundleField.cpp b/app/commsdsl2comms/src/CommsBundleField.cpp
@@ -488,13 +488,6 @@ bool CommsBundleField::commsHasCustomLengthDeepImpl() const
             });
 }
 
-void CommsBundleField::commsSetReferencedImpl()
-{
-    for (auto* m : m_members) {
-        m->commsSetReferenced();
-    }
-}
-
 std::string CommsBundleField::commsDefFieldOptsInternal() const
 {
     commsdsl::gen::util::StringsList opts;

diff --git a/app/commsdsl2comms/src/CommsBundleField.h b/app/commsdsl2comms/src/CommsBundleField.h
@@ -63,7 +63,6 @@ class CommsBundleField final : public commsdsl::gen::BundleField, public CommsFi
     virtual std::string commsCompValueCastTypeImpl(const std::string& accStr, const std::string& prefix) const override;
     virtual std::string commsCompPrepValueStrImpl(const std::string& accStr, const std::string& value) const override;
     virtual bool commsHasCustomLengthDeepImpl() const override;
-    virtual void commsSetReferencedImpl() override;
 
 private:
     bool commsPrepareInternal();

diff --git a/app/commsdsl2comms/src/CommsCmake.cpp b/app/commsdsl2comms/src/CommsCmake.cpp
@@ -142,8 +142,8 @@ bool CommsCmake::commsWriteInternal() const
     ;
 
     util::ReplacementMap repl = {
-        {"NAME", m_generator.currentSchema().mainNamespace()},
-        {"CAP_NAME", util::strToUpper(m_generator.currentSchema().mainNamespace())},
+        {"NAME", m_generator.protocolSchema().mainNamespace()},
+        {"CAP_NAME", util::strToUpper(m_generator.protocolSchema().mainNamespace())},
     };
 
     stream << util::processTemplate(Templ, repl);