Merge branch 'master' into feature/echo_pulse_width_to_logical_detection

Author: ClemensLinnhoff

.antora/antora.yml

@@ -0,0 +1,11 @@
+# Component name (without spaces!). All content repositories with the same component name are merged in Antora.
+name: asamosi
+version:
+  # Update version number accordingly. This is the version for the main branch
+  main: 'current'
+  master: 'current'
+  v(*)-antora: V$1
+  v(*): V$1
+  V(*): V$1
+  # Update version number accordingly. This is the version for any other activated branch (branch must be added in the generator site.yml!). Schema = 0.0.x-<branch-name> (only works for branches starting with "feature/")
+  (*): 'V3.6.0-$1'

.antora/modules/gen/doxynav.adoc

@@ -0,0 +1 @@
+../../../doc/images

.antora/modules/interface/images

@@ -0,0 +1,22 @@
+[preface]
+* xref:00_preface/00_foreword.adoc[]
+[preface]
+* xref:00_preface/01_introduction.adoc[]
+* xref:01_scope/01_scope.adoc[]
+* xref:02_normative_references/01_normative_references.adoc[]
+* xref:03_terms_and_definitions/01_terms_and_definitions.adoc[]
+* xref:04_abbreviations/01_abbreviations.adoc[]
+* xref:05_backward_compatibility/01_backward_compatibility.adoc[]
+
+[appendix]
+* xref:xx_annexes/REPLACE_ME.adoc[]
+[bibliography]
+* xref:bibliography.adoc[]
+
+:sectnums!:
+* xref:list_of_figures.adoc[]
+
+:sectnums!:
+* xref:list_of_tables.adoc[]
+
+// TODO Replace with generator

.antora/modules/interface/nav.adoc

@@ -0,0 +1 @@
+../../../doc

.antora/modules/interface/pages

@@ -11,8 +11,8 @@ Is this a bug fix or a feature? Does it break any existing functionality or forc
 How has it been tested?
 
 #### Take this checklist as orientation for yourself, if this PR is ready for the Change Control Board:
-- [ ] My suggestion follows the [style and contributors guidelines](https://opensimulationinterface.github.io/osi-documentation/open-simulation-interface/doc/howtocontribute.html).
-- [ ] I have taken care about the [documentation](https://opensimulationinterface.github.io/osi-documentation/open-simulation-interface/doc/commenting.html).
+- [ ] My suggestion follows the [style and contributors guidelines](https://opensimulationinterface.github.io/osi-antora-generator/asamosi/latest/specification/contributing/start_contributing.html).
+- [ ] I have taken care about the [message documentation](https://opensimulationinterface.github.io/osi-antora-generator/asamosi/latest/specification/contributing/commenting_messages.html) and the [fields and enums documentation](https://opensimulationinterface.github.io/osi-antora-generator/asamosi/latest/specification/contributing/commenting_fields_enums.html).
 - [ ] I have done the [DCO signoff](https://opensimulationinterface.github.io/osi-documentation/open-simulation-interface/doc/howtocontribute.html#developer-certification-of-origin-dco).
 - [ ] My changes generate no errors when passing CI tests. 
 - [ ] I have successfully implemented and tested my fix/feature locally.

.github/pull_request_template.md

@@ -0,0 +1,27 @@
+
+name: Antora build trigger
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  trigger_antora:
+    name: Trigger antora generator
+
+    runs-on: Ubuntu-latest
+
+    env:
+      MUP_KEY: ${{ secrets.MACHINE_USER_PAT }}
+
+    steps:
+    - name: Trigger generator
+      if: ${{ env.MUP_KEY != '' }}
+      uses: peter-evans/repository-dispatch@v2
+      with:
+        token: ${{ secrets.MACHINE_USER_PAT }}
+        event-type: antora-build-trigger
+        repository: OpenSimulationInterface/osi-antora-generator
+        client-payload: '{"src": "${{ github.repository }}", "ref": "${{ github.ref }}", "sha": "${{ github.sha }}", "head_ref": "${{ github.head_ref }}"}'

.github/workflows/antora-generator.yml

@@ -9,7 +9,7 @@ jobs:
   build-proto2-linux64:
     name: Build Proto2 Linux 64
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     steps:
     - name: Checkout OSI
@@ -30,22 +30,22 @@ jobs:
 
     - name: Cache Dependencies
       id: cache-depends
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
-        path: protobuf-3.15.8
-        key: ${{ runner.os }}-v1-depends
+        path: protobuf-3.20.1
+        key: ${{ runner.os }}-v2-depends
 
     - name: Download ProtoBuf
       if: steps.cache-depends.outputs.cache-hit != 'true'
-      run: curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v3.15.8/protobuf-all-3.15.8.tar.gz && tar xzvf protobuf-all-3.15.8.tar.gz
+      run: curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v3.20.1/protobuf-all-3.20.1.tar.gz && tar xzvf protobuf-all-3.20.1.tar.gz
 
     - name: Build ProtoBuf
       if: steps.cache-depends.outputs.cache-hit != 'true'
-      working-directory: protobuf-3.15.8
+      working-directory: protobuf-3.20.1
       run: ./configure DIST_LANG=cpp --prefix=/usr && make
 
     - name: Install ProtoBuf
-      working-directory: protobuf-3.15.8
+      working-directory: protobuf-3.20.1
       run: sudo make install && sudo ldconfig
 
     - name: Install proto2cpp
@@ -54,10 +54,15 @@ jobs:
     - name: Prepare C++ Build
       run: mkdir build
 
-    - name: Prepare Documentation Bukd
+    # Versioning
+    - name: Get versioning
+      id: get_version
+      run: echo ::set-output name=VERSION::$(git describe --always)
+
+    - name: Prepare Documentation Build
       run: |
-        sed -i 's/@VERSION_PATCH@/@VERSION_PATCH@_GitHub_MasterBranch/g' doxygen_config.cmake.in
-        echo "EXCLUDE_PATTERNS = */osi3/* */protobuf-3.15.8/* */proto2cpp/*" >> doxygen_config.cmake.in
+        sed -i 's/PROJECT_NUMBER\s*= @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@/PROJECT_NUMBER = master (${{ steps.get_version.outputs.VERSION }})/g' doxygen_config.cmake.in
+        echo "EXCLUDE_PATTERNS = */osi3/* */protobuf-3.20.1/* */proto2cpp/* */flatbuffers/*" >> doxygen_config.cmake.in
         echo "GENERATE_TREEVIEW = YES" >> doxygen_config.cmake.in
 
     - name: Configure C++ Build
@@ -69,7 +74,7 @@ jobs:
       run: cmake --build . --config Release -j 4
 
     - name: Build Python
-      run: python setup.py build && python setup.py sdist 
+      run: python setup.py build && python setup.py sdist
 
     - name: Install Python
       run: python -m pip install .
@@ -95,7 +100,7 @@ jobs:
   build-proto3-linux64:
     name: Build Proto3 Linux 64
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     steps:
     - name: Checkout OSI
@@ -115,20 +120,20 @@ jobs:
       id: cache-depends
       uses: actions/cache@v2
       with:
-        path: protobuf-3.15.8
-        key: ${{ runner.os }}-v1-depends
+        path: protobuf-3.20.1
+        key: ${{ runner.os }}-v2-depends
 
     - name: Download ProtoBuf
       if: steps.cache-depends.outputs.cache-hit != 'true'
-      run: curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v3.15.8/protobuf-all-3.15.8.tar.gz && tar xzvf protobuf-all-3.15.8.tar.gz
+      run: curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v3.20.1/protobuf-all-3.20.1.tar.gz && tar xzvf protobuf-all-3.20.1.tar.gz
 
     - name: Build ProtoBuf
       if: steps.cache-depends.outputs.cache-hit != 'true'
-      working-directory: protobuf-3.15.8
+      working-directory: protobuf-3.20.1
       run: ./configure DIST_LANG=cpp --prefix=/usr && make
 
     - name: Install ProtoBuf
-      working-directory: protobuf-3.15.8
+      working-directory: protobuf-3.20.1
       run: sudo make install && sudo ldconfig
 
     - name: Prepare C++ Build
@@ -148,7 +153,7 @@ jobs:
       run: cmake --build . --config Release -j 4
 
     - name: Build Python
-      run: python setup.py build && python setup.py sdist 
+      run: python setup.py build && python setup.py sdist
 
     - name: Install Python
       run: python -m pip install .

.github/workflows/protobuf.yml

@@ -23,6 +23,8 @@ osi_version.proto
 version.py
 pyproject.toml
 
+compile_commands.json
+
 # Eclipse-specific files, if any
 *.cproject
 *.project

.gitignore

@@ -1,6 +1,3 @@
-[submodule "asciidoc-resources"]
-	path = asciidoc-resources
-	url = https://code.asam.net/simulation/asciidoc-resources.git
 [submodule "flatbuffers"]
 	path = flatbuffers
 	url = https://github.com/google/flatbuffers.git