From 1d2033e367cca4839d1e1f6f95d8a3eaa7306c00 Mon Sep 17 00:00:00 2001 From: Simon Haegler Date: Wed, 22 Jun 2022 12:25:22 +0200 Subject: [PATCH 1/7] Prepare next dev cycle: raise to 2.1.0-dev.0 --- deploy/build.xml | 4 ++-- src/CMakeLists.txt | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/deploy/build.xml b/deploy/build.xml index 56b14f8e..73aa6e83 100644 --- a/deploy/build.xml +++ b/deploy/build.xml @@ -16,10 +16,10 @@ - + - + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4ebc3789..1547fd75 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,8 +11,9 @@ include(common.cmake) ### version set(SRL_VERSION_MAJOR 2) -set(SRL_VERSION_MINOR 0) +set(SRL_VERSION_MINOR 1) set(SRL_VERSION_PATCH 0) +set(SRL_VERSION_PRERELEASE "dev.0") if (NOT SRL_VERSION_BUILD) set(SRL_VERSION_BUILD DEV) From a5cda4e7b0e84a0098f62c0b4c78355d405d5f80 Mon Sep 17 00:00:00 2001 From: Christian Knieling Date: Wed, 6 Jul 2022 13:13:03 +0200 Subject: [PATCH 2/7] Change prt version to 2.6.8300 --- src/common.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common.cmake b/src/common.cmake index ef456e60..bb2b0752 100644 --- 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") From bdad1547997f35e3144fefce27f57651ef86dc45 Mon Sep 17 00:00:00 2001 From: Christian Knieling Date: Wed, 6 Jul 2022 13:13:22 +0200 Subject: [PATCH 3/7] Update error feedback for too new/old CE version --- src/serlio/utils/Utilities.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/serlio/utils/Utilities.cpp b/src/serlio/utils/Utilities.cpp index 417f77b4..b50fa770 100644 --- 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 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"}, From eb4c6e73b8c046b203697eb9cec9049dee6c9320 Mon Sep 17 00:00:00 2001 From: Christian Knieling Date: Wed, 6 Jul 2022 13:13:40 +0200 Subject: [PATCH 4/7] prepare release 2.1.0 --- deploy/build.xml | 2 +- src/CMakeLists.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/deploy/build.xml b/deploy/build.xml index 73aa6e83..cf82e022 100644 --- a/deploy/build.xml +++ b/deploy/build.xml @@ -19,7 +19,7 @@ - + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1547fd75..82e08755 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -13,7 +13,6 @@ include(common.cmake) set(SRL_VERSION_MAJOR 2) set(SRL_VERSION_MINOR 1) set(SRL_VERSION_PATCH 0) -set(SRL_VERSION_PRERELEASE "dev.0") if (NOT SRL_VERSION_BUILD) set(SRL_VERSION_BUILD DEV) From 4ef9d6f47038e16320f106929e945e07a074be7b Mon Sep 17 00:00:00 2001 From: Christian Knieling Date: Wed, 6 Jul 2022 16:57:37 +0200 Subject: [PATCH 5/7] doc: add readme entry for v2.1.0 --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 315131bd..4d06839f 100644 --- 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 file created with CE 2022.0 + ### v2.0.0 (2022-06-20) Required CityEngine version: 2021.1 or older. #### Added: From ab573629023024c61fe4311a169cd51af4cba378 Mon Sep 17 00:00:00 2001 From: chr11115 Date: Wed, 13 Jul 2022 15:39:25 +0200 Subject: [PATCH 6/7] Update tests --- src/test/tests.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/tests.cpp b/src/test/tests.cpp index 3a94731b..cc91e47d 100644 --- a/src/test/tests.cpp +++ b/src/test/tests.cpp @@ -300,7 +300,7 @@ 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); } @@ -308,7 +308,7 @@ TEST_CASE("replaceCGACWithCEVersion") { 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); } From adac0bad68aee16362c62bbc47a249aa146b461a Mon Sep 17 00:00:00 2001 From: chr11115 Date: Wed, 13 Jul 2022 15:41:07 +0200 Subject: [PATCH 7/7] Cleanup: minor wording improvements --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4d06839f..ac7b5285 100644 --- a/README.md +++ b/README.md @@ -192,7 +192,7 @@ Currently we only support one material type per mesh (see [known limitations](#k ### v2.1.0 (2022-07-06) Required CityEngine version: 2022.0 or older. #### Added: -* Support for rule file created with CE 2022.0 +* Support for Rule Packages (RPK) created with CityEngine 2022.0 ### v2.0.0 (2022-06-20) Required CityEngine version: 2021.1 or older.