From 412521e7fc3fd3d66ec80df2688fb9794fdcc28b Mon Sep 17 00:00:00 2001
From: Stefan Cyliax <stefan.cyliax@asam.net>
Date: Thu, 18 Nov 2021 13:53:46 +0100
Subject: [PATCH] Prepare Release of 3.4 (#598)

* maint: Increased version for next release and reworked versioning for doxygen build

Signed-off-by: Stefan Cyliax <stefan.cyliax@asam.net>
---
 .github/workflows/protobuf.yml | 9 +++++++--
 .gitmodules                    | 3 ---
 README.md                      | 2 +-
 VERSION                        | 4 ++--
 asciidoc-resources             | 1 -
 5 files changed, 10 insertions(+), 9 deletions(-)
 delete mode 160000 asciidoc-resources

diff --git a/.github/workflows/protobuf.yml b/.github/workflows/protobuf.yml
index 11b52d5ff..493ee5a74 100644
--- a/.github/workflows/protobuf.yml
+++ b/.github/workflows/protobuf.yml
@@ -54,9 +54,14 @@ 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
+        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.15.8/* */proto2cpp/*" >> doxygen_config.cmake.in
         echo "GENERATE_TREEVIEW = YES" >> doxygen_config.cmake.in
 
diff --git a/.gitmodules b/.gitmodules
index cae3296fc..af7fa7314 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -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
diff --git a/README.md b/README.md
index 6053ce638..5ea6fee68 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ def main():
 
     sv_ground_truth = sensorview.global_ground_truth
     sv_ground_truth.version.version_major = 3
-    sv_ground_truth.version.version_minor = 3
+    sv_ground_truth.version.version_minor = 4
     sv_ground_truth.version.version_patch = 0
 
     sv_ground_truth.timestamp.seconds = 0
diff --git a/VERSION b/VERSION
index 909aa38e2..1edb9a12b 100644
--- a/VERSION
+++ b/VERSION
@@ -1,3 +1,3 @@
 VERSION_MAJOR = 3
-VERSION_MINOR = 3
-VERSION_PATCH = 1
+VERSION_MINOR = 4
+VERSION_PATCH = 0
diff --git a/asciidoc-resources b/asciidoc-resources
deleted file mode 160000
index e0bd50515..000000000
--- a/asciidoc-resources
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e0bd5051571733414a219ed0e94f5de346ca49cd