Merge pull request #167 from Esri/develop

Develop
Esri · May 7, 2024 · 1d9c05c · 1d9c05c
2 parents ced4954 + 8b5584a
commit 1d9c05c
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ Please refer to the [release notes](#release-notes) for the supported CityEngine
 #### Software Requirements (Latest Release)
 - Windows 10 and 11 (64bit)
 - RedHat Enterprise Linux 7, 8, 9 and compatible (CentOS, Alma Linux, Rocky Linux, ...)
-- CityEngine 2022.1 or older
+- See [release notes](#release-notes) for compatible CityEngine versions and requirements for commercial work.
 - Autodesk Maya 2020, 2022 or 2023
 
 #### Windows: Provided Installer
@@ -190,6 +190,13 @@ Currently we only support one material type per mesh (see [known limitations](#k
 
 ## Release Notes
 
+### v2.3.0 (2024-04-02)
+Required Cityengine version: 2023.1 or older.
+For commercial work, a [license](https://www.esri.com/cityengine) for CityEngine 2023.1 is required.
+
+#### Changed:
+* Updated Procedural Runtime (PRT) to 3.1 (corresponds to CityEngine 2023.1).
+
 ### v2.2.0 (2023-06-15)
 Required Cityengine version: 2023.0 or older.
 

diff --git a/deploy/build.xml b/deploy/build.xml
@@ -16,7 +16,7 @@
 
 	<property name="serlio.vendor" value="Esri R&amp;amp;D Center Zurich" />
 	<property name="serlio.version.major" value="2" />
-	<property name="serlio.version.minor" value="2" />
+	<property name="serlio.version.minor" value="3" />
 	<property name="serlio.version.patch" value="0" />
 	<property name="serlio.version.mmp" value="${serlio.version.major}.${serlio.version.minor}.${serlio.version.patch}" />
 	<property name="serlio.version.preRelease" value="" />

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -11,7 +11,7 @@ include(common.cmake)
 ### version (keep in sync with deploy/build.xml)
 
 set(SRL_VERSION_MAJOR 2)
-set(SRL_VERSION_MINOR 2)
+set(SRL_VERSION_MINOR 3)
 set(SRL_VERSION_PATCH 0)
 
 if (NOT SRL_VERSION_BUILD)

diff --git a/src/common.cmake b/src/common.cmake
@@ -45,7 +45,7 @@ if (NOT prt_DIR)
 		set(PRT_TC "gcc93")
 	endif ()
 
-	set(PRT_VERSION "3.0.8905")
+	set(PRT_VERSION "3.1.9666")
 	set(PRT_CLS "${PRT_OS}-${PRT_TC}-x86_64-rel-opt")
 	set(PRT_URL "https://github.com/esri/cityengine-sdk/releases/download/${PRT_VERSION}/esri_ce_sdk-${PRT_VERSION}-${PRT_CLS}.zip")
 

diff --git a/src/serlio/utils/Utilities.cpp b/src/serlio/utils/Utilities.cpp
@@ -49,12 +49,16 @@ const std::wstring MAYA_SEPARATOR = L"_";
 const std::wstring MAYA_COMPATIBLE_CHARS = L"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_";
 const std::wstring DIGIT_CHARS = L"0123456789";
 
-const std::wstring TOO_NEW_CE_VERSION = L"newer than 2022.0";
+const std::wstring TOO_NEW_CE_VERSION = L"newer than 2023.1";
 const std::wstring CGAC_VERSION_STRING = L"CGAC version ";
 const std::wstring CE_VERSION_STRING = L"CityEngine version ";
 
 const std::map<std::wstring, std::wstring> cgacToCEVersion = {
         // clang-format off
+	{L"2.2", L"2023.1"},
+	{L"2.1", L"2023.0"},
+	{L"2.0", L"2023.0"},
+	{L"1.19", L"2022.1"},
 	{L"1.18", L"2022.0"},
 	{L"1.17", L"2021.1"},
 	{L"1.16", L"2021.0"},

diff --git a/src/test/tests.cpp b/src/test/tests.cpp
@@ -298,17 +298,17 @@ TEST_CASE("replaceCGACWithCEVersion") {
 	}
 
 	SECTION("major number larger than current") {
-		std::wstring inp = L"Unsupported CGAC version 2.0 : major number larger than current (1.17)";
+		std::wstring inp = L"Unsupported CGAC version 3.0 : major number larger than current (1.17)";
 		const std::wstring exp =
-		        L"Unsupported CityEngine version newer than 2022.0 : major number larger than current (2021.1)";
+		        L"Unsupported CityEngine version newer than 2023.1 : major number larger than current (2021.1)";
 		prtu::replaceCGACWithCEVersion(inp);
 		CHECK(inp == exp);
 	}
 
 	SECTION("major number smaller than current") {
-		std::wstring inp = L"Potentially unsupported CGAC version 1.0 : major number smaller than current (2.0)";
+		std::wstring inp = L"Potentially unsupported CGAC version 1.0 : major number smaller than current (3.0)";
 		const std::wstring exp = L"Potentially unsupported CityEngine version 2013.0 : major number smaller than "
-		                         L"current (newer than 2022.0)";
+		                         L"current (newer than 2023.1)";
 		prtu::replaceCGACWithCEVersion(inp);
 		CHECK(inp == exp);
 	}