Merge branch 'update_artifact_buildprocess'

# Conflicts:
#	.github/workflows/buildArtifactsForPackage.yml

Author: kmfrank

.github/workflows/buildArtifactsForPackage.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   CreatePackage:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     needs: [LinuxSharedReleaseBuild, LinuxStaticReleaseBuild, Win32SharedReleaseBuild, Win32StaticReleaseBuild, x64SharedReleaseBuild, x64StaticReleaseBuild]
 
     steps:
@@ -242,7 +242,7 @@ jobs:
 
 
   LinuxSharedReleaseBuild:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
 
     steps:
     - uses: actions/checkout@v3
@@ -311,7 +311,7 @@ jobs:
 
 
   LinuxStaticReleaseBuild:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
 
     steps:
     - uses: actions/checkout@v3
@@ -561,6 +561,4 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         name: x64StaticRelease
-        path: ./cpp/build/out.tgz
-
-
+        path: ./cpp/build/out.tgz

cpp/buildArtifact/collectHeaderFiles.sh

@@ -28,7 +28,7 @@ FIND_HEADERS_SH=${FIND_HEADERS_SH_PATH}/${FIND_HEADERS_SH_FILE}
 # prepare inlude paths for C++ compiler in order to extract ALL necessary non-system include files
 # this has to be done outside the openScenarioReader project folder to also reach all referenced external dependencies
 echo "#!/bin/bash" >${FIND_HEADERS_SH}
-echo "cpp -DCOLLECT_HEADERS -DSUPPORT_OSC_1_0 -DSUPPORT_OSC_1_1 -DSUPPORT_OSC_1_2 -MM \\" >>${FIND_HEADERS_SH}
+echo "cpp -DCOLLECT_HEADERS -DSUPPORT_OSC_1_0 -DSUPPORT_OSC_1_1 -DSUPPORT_OSC_1_2 -DSUPPORT_OSC_1_3 -MM \\" >>${FIND_HEADERS_SH}
 for i in $(find . -type d -print); do
     if [[ $i == *"CMake"* ]] || [[ $i == *"antlr_runtime"* ]] || [[ $i == *"ython"* ]] || [[ $i == *"java"* ]] || [[ $i == *".dir"* ]] || [[ $i == "./build"* ]]; then
         continue

cpp/buildArtifact/createCMakeLists.sh

@@ -78,6 +78,7 @@ set( ENV{CMAKE_BUILD_PARALLEL_LEVEL} 4 )
 option(SUPPORT_OSC_1_0 \"Build the artifacts supporting OSC standard version 1.0\" ON)
 option(SUPPORT_OSC_1_1 \"Build the artifacts supporting OSC standard version 1.1\" ON)
 option(SUPPORT_OSC_1_2 \"Build the artifacts supporting OSC standard version 1.2\" ON)
+option(SUPPORT_OSC_1_3 \"Build the artifacts supporting OSC standard version 1.3\" ON)
 
 if (SUPPORT_OSC_1_0)
 	add_definitions(-DSUPPORT_OSC_1_0)	
@@ -88,6 +89,9 @@ endif (SUPPORT_OSC_1_1)
 if (SUPPORT_OSC_1_2)
 	add_definitions(-DSUPPORT_OSC_1_2)	
 endif (SUPPORT_OSC_1_2)
+if (SUPPORT_OSC_1_3)
+	add_definitions(-DSUPPORT_OSC_1_3)	
+endif (SUPPORT_OSC_1_3)
 
 if( WIN32 )
     add_definitions( -D_CRT_SECURE_NO_WARNINGS )

cpp/buildArtifact/createLinuxWindowsBinPackage.sh

@@ -81,6 +81,12 @@ cp -f "${SCRIPT_DIR}/../CMakeHelpers.cmake" "${SCRIPT_DIR}/${OPEN_SCEANARIO_API}
 ################################################################
 cp -r "${SCRIPT_DIR}/../applications/openScenarioTester/res" "${SCRIPT_DIR}/${OPEN_SCEANARIO_API}"
 
+################################################################
+# copy LICENSE and NOTICE
+################################################################
+cp "${SCRIPT_DIR}/../../LICENSE" "${SCRIPT_DIR}/${OPEN_SCEANARIO_API}"
+cp "${SCRIPT_DIR}/../../NOTICE" "${SCRIPT_DIR}/${OPEN_SCEANARIO_API}"
+
 ################################################################
 # prepare lib files
 ################################################################