From d80bbaa50a6e3c5c7536cced330f8db14695dcf4 Mon Sep 17 00:00:00 2001 From: Larry Gritz Date: Fri, 30 Sep 2022 16:43:53 -0700 Subject: [PATCH] Stage for release Signed-off-by: Larry Gritz --- CHANGES.md | 6 ++++-- CMakeLists.txt | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 7f1c1f4e3..cb76f474c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,8 +1,8 @@ -Release 1.12 -- beta 1 Sep 2022 (compared to 1.11) --------------------------------------------------- +Release 1.12 -- 1 Oct 2022 (compared to 1.11) +---------------------------------------------- Big Deal Changes: * **Batch shading**: A fully operational "batch shading" support when using CPUs supporting the Intel AVX2 or AVX512 instruction set architectures, @@ -249,6 +249,7 @@ Build & test system improvements: #1271 (1.12.0.1) - Build against LLVM 11 #1274 (1.12.0.1), LLVM 12 #1351 (1.12.1.0) #1412 (1.12.3), LLVM 13 #1420 (1.12.3), LLVM 14 #1492 (1.12.4.6) + LLVM 15 #1592 (1.12.6.2) - Fix build break against recent OIIO master change where m_mutex field was removed from ImageInput. #1281 (1.12.0.1/1.11.9) - Work to ensure that OIIO will build correctly against the upcoming @@ -300,6 +301,7 @@ Build & test system improvements: #1501 (1.12.5.0) - Overhaul of GHA ci.yml to use strategy matrix. #1474 (1.12.4.4) - Test against clang 14 and fix new warnings. #1498 (1.12.5.0) + - Test against clang 15 and fix new warnings. #1586 (1.12.6.2) - A scorecards workflow guards against a variety of security issues of the CI system itself. #1529 (1.12.6.0) - Enable SonarCloud static analysis. #1551 #1556 #1563 (1.12.6.0) diff --git a/CMakeLists.txt b/CMakeLists.txt index eaf992c70..0ad1b398f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,14 +4,14 @@ cmake_minimum_required (VERSION 3.12) -set (OSL_VERSION "1.12.6.1" CACHE STRING "Version") +set (OSL_VERSION "1.12.6.2" CACHE STRING "Version") project (OSL VERSION ${OSL_VERSION} LANGUAGES CXX C HOMEPAGE_URL "https://github.com/AcademySoftwareFoundation/OpenShadingLanguage") set (PROJ_NAME ${PROJECT_NAME}) # short name string (TOLOWER ${PROJ_NAME} PROJ_NAME_LOWER) # short name lower case string (TOUPPER ${PROJ_NAME} PROJ_NAME_UPPER) # short name upper case -set (PROJECT_VERSION_RELEASE_TYPE "RC1" CACHE STRING +set (PROJECT_VERSION_RELEASE_TYPE "" CACHE STRING "Build type, for example: dev, beta2, RC1 (empty string for normal release)") set (${PROJECT_NAME}_VERSION_RELEASE_TYPE ${PROJECT_VERSION_RELEASE_TYPE}) set (PROJECT_AUTHORS "Contributors to the Open Shading Language project")