From e648e0de726d9a304a9ad6fd3d9482f991ec2b7c Mon Sep 17 00:00:00 2001 From: Ramses Tech User <94632088+ramses-tech-user@users.noreply.github.com> Date: Wed, 28 Sep 2022 12:02:05 +0000 Subject: [PATCH] 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 <46795157+nVxx@users.noreply.github.com> Co-authored-by: Daniel Haas <25718295+bojackHaasman@users.noreply.github.com> Co-authored-by: Mohamed Sharaf-El-Deen <769940+mohhsharaf@users.noreply.github.com> Co-authored-by: Mirko Sova <64351017+smirko-dev@users.noreply.github.com> Co-authored-by: Tobias Hammer Co-authored-by: Violin Yanev --- CHANGELOG.md | 6 ++++++ CMakeLists.txt | 2 +- README.md | 11 +++++++++-- ci/scripts/check_versions.sh | 34 +++++++++++++++++----------------- external/ramses | 2 +- 5 files changed, 34 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d79449b..794b063 100644 --- a/CHANGELOG.md +++ b/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** diff --git a/CMakeLists.txt b/CMakeLists.txt index f367ee6..8131ca5 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/README.md b/README.md index bb905d8..4e6f2dd 100644 --- a/README.md +++ b/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 | diff --git a/ci/scripts/check_versions.sh b/ci/scripts/check_versions.sh index a746cc3..67937e3 100755 --- a/ci/scripts/check_versions.sh +++ b/ci/scripts/check_versions.sh @@ -10,16 +10,13 @@ set -e -usage() { echo "Usage: $0 -t -r ]" 1>&2; exit 1; } +usage() { echo "Usage: $0 -t ]" 1>&2; exit 1; } while getopts ":t:r:" o; do case "${o}" in t) tag=${OPTARG} ;; - r) - root=${OPTARG} - ;; *) usage ;; @@ -27,32 +24,35 @@ while getopts ":t:r:" o; do 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" diff --git a/external/ramses b/external/ramses index c5a15e3..3ac35bf 160000 --- a/external/ramses +++ b/external/ramses @@ -1 +1 @@ -Subproject commit c5a15e37eeb32be61684359db11e887e92715a53 +Subproject commit 3ac35bfc620dd02187500525e2e456e11363f86b