Oss release v1.2.1 created 2022-09-28-12-02

see CHANGELOG.md for details

Original commit sha: c4aaa47af0f0645fe0becc367642daca9c8729b3

Co-authored-by: Askanaz Torosyan <[email protected]>
Co-authored-by: Daniel Haas <[email protected]>
Co-authored-by: Mohamed Sharaf-El-Deen <[email protected]>
Co-authored-by: Mirko Sova <[email protected]>
Co-authored-by: Tobias Hammer <[email protected]>
Co-authored-by: Violin Yanev <[email protected]>

Author: 7 people

CHANGELOG.md

@@ -8,6 +8,12 @@
 
 **FIXED**
 
+# v1.2.1
+
+**FIXED**
+
+* Upgrade ramses from 27.0.122 to 27.0.125 (patchfix)
+
 # v1.2.0
 
 **Features**

CMakeLists.txt

@@ -15,7 +15,7 @@ cmake_minimum_required(VERSION 3.13)
 
 set(RLOGIC_VERSION_MAJOR 1)
 set(RLOGIC_VERSION_MINOR 2)
-set(RLOGIC_VERSION_PATCH 0)
+set(RLOGIC_VERSION_PATCH 1)
 
 set(RLOGIC_VERSION ${RLOGIC_VERSION_MAJOR}.${RLOGIC_VERSION_MINOR}.${RLOGIC_VERSION_PATCH})
 set(ramses-logic_VERSION "${RLOGIC_VERSION}" CACHE STRING "Ramses Logic version" FORCE)

README.md

@@ -32,8 +32,15 @@ Prefer to learn by example? Have a look at our [self-contained example snippets]
 
 # Version matrix
 
-|Logic    | Included Ramses version       | Minimum required Ramses version    | Binary file compatibility    |
-|---------|-------------------------------|------------------------------------|------------------------------|
+The following matrix explains which versions of Ramses Logic are compatible with which versions of Ramses, and also
+to what extent binary files are supported. Read the table like this: `Logic` version **X** should be used with
+Ramses version **Y** (included Ramses version). If you need older Ramses, it must be at least **Z**
+(Minimum required Ramses version) - but keep in mind we don't test all combinations. You can also load
+existing files exported with Logic Engine version **W** or newer (Binary file compatibility).
+
+|Logic     | Included Ramses version       | Minimum required Ramses version    | Binary file compatibility    |
+|----------|-------------------------------|------------------------------------|------------------------------|
+|v1.2.1    | 27.0.125                      | 27.0.102                           | >= 1.0.0, F-Levels 01 - 03   |
 |v1.2.0    | 27.0.122                      | 27.0.102                           | >= 1.0.0, F-Levels 01 - 03   |
 |v1.1.x    | 27.0.121                      | 27.0.102                           | >= 1.0.0, F-Levels 01, 02    |
 |v1.0.x    | 27.0.119                      | 27.0.102                           | >= 1.0.0                     |

ci/scripts/check_versions.sh

@@ -10,49 +10,49 @@
 
 set -e
 
-usage() { echo "Usage: $0 -t <tag> -r <root>]" 1>&2; exit 1; }
+usage() { echo "Usage: $0 -t <tag>]" 1>&2; exit 1; }
 
 while getopts ":t:r:" o; do
     case "${o}" in
         t)
             tag=${OPTARG}
             ;;
-        r)
-            root=${OPTARG}
-            ;;
         *)
             usage
             ;;
     esac
 done
 shift $((OPTIND-1))
 
-if [ -z "${tag}" ]; then
-    echo "Missing tag!"
-    usage
-fi
+SCRIPT_DIR=$( cd "$( dirname $(realpath "${BASH_SOURCE[0]}") )" && pwd )
+REPO_ROOT=$(realpath "${SCRIPT_DIR}/../..")
 
-cmakelists="${root}/CMakeLists.txt"
+cmakelists="${REPO_ROOT}/CMakeLists.txt"
 if [ -f "$cmakelists" ]; then
-    echo "Comparing $tag against version declared in $cmakelists"
-
     VERSION_MAJOR=`cat $cmakelists | grep "set(RLOGIC_VERSION_MAJOR" | sed 's/^[^0-9]*\([0-9]*\).*$/\1/'`
     VERSION_MINOR=`cat $cmakelists | grep "set(RLOGIC_VERSION_MINOR" | sed 's/^[^0-9]*\([0-9]*\).*$/\1/'`
     VERSION_PATCH=`cat $cmakelists | grep "set(RLOGIC_VERSION_PATCH" | sed 's/^[^0-9]*\([0-9]*\).*$/\1/'`
     cmake_version="v$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
 
-    if [ "$cmake_version" = "$tag" ]; then
-        echo "Tag $tag matches version in $cmakelists"
+    if [ -z "${tag}" ]; then
+        echo "No tag provided! Will use tag from CMakeLists.txt to check other files"
+        tag=$cmake_version
     else
-        echo "Tag $tag does not match the version in $cmakelists ($cmake_version)" 1>&2
-        exit 1
+        echo "Comparing $tag against version declared in $cmakelists"
+
+        if [ "$cmake_version" = "$tag" ]; then
+            echo "Tag $tag matches version in $cmakelists"
+        else
+            echo "Tag $tag does not match the version in $cmakelists ($cmake_version)" 1>&2
+            exit 1
+        fi
     fi
 else
     echo "Could not find CMakeLists ($cmakelists)!" 1>&2
     exit 1
 fi
 
-changelog="${root}/CHANGELOG.md"
+changelog="${REPO_ROOT}/CHANGELOG.md"
 if [ -f "$changelog" ]; then
     echo "Checking if version $tag is mentioned in $changelog"
 
@@ -68,7 +68,7 @@ else
     exit 1
 fi
 
-readme="${root}/README.md"
+readme="${REPO_ROOT}/README.md"
 if [ -f "$readme" ]; then
     echo "Checking if version $tag is mentioned in $readme"