Merge pull request #158 from Esri/develop

Release 2.1.0
Esri · Aug 24, 2022 · 5474536 · 5474536
2 parents fadadf6 + 789c95f
commit 5474536
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -189,6 +189,11 @@ Currently we only support one material type per mesh (see [known limitations](#k
 
 ## Release Notes
 
+### v2.1.0 (2022-07-06)
+Required CityEngine version: 2022.0 or older.
+#### Added:
+* Support for Rule Packages (RPK) created with CityEngine 2022.0
+
 ### v2.0.0 (2022-06-20)
 Required CityEngine version: 2021.1 or older.
 #### Added:

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="0" />
+	<property name="serlio.version.minor" value="1" />
 	<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
 
 set(SRL_VERSION_MAJOR 2)
-set(SRL_VERSION_MINOR 0)
+set(SRL_VERSION_MINOR 1)
 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 "2.6.8135")
+	set(PRT_VERSION "2.6.8300")
 	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,13 @@ 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 2021.1";
+const std::wstring TOO_NEW_CE_VERSION = L"newer than 2022.0";
 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"1.18", L"2022.0"},
 	{L"1.17", L"2021.1"},
 	{L"1.16", L"2021.0"},
 	{L"1.15", L"2020.1"},

diff --git a/src/test/tests.cpp b/src/test/tests.cpp
@@ -300,15 +300,15 @@ 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)";
 		const std::wstring exp =
-		        L"Unsupported CityEngine version newer than 2021.1 : major number larger than current (2021.1)";
+		        L"Unsupported CityEngine version newer than 2022.0 : 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)";
 		const std::wstring exp = L"Potentially unsupported CityEngine version 2013.0 : major number smaller than "
-		                         L"current (newer than 2021.1)";
+		                         L"current (newer than 2022.0)";
 		prtu::replaceCGACWithCEVersion(inp);
 		CHECK(inp == exp);
 	}