From 48e1fc7e97cd4316739edbadb67806bccdd524e5 Mon Sep 17 00:00:00 2001 From: Julien Marrec Date: Tue, 5 Nov 2024 18:37:22 +0100 Subject: [PATCH 1/2] Fix #5281 - Use rebuilt E+ with correct entitlements --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 05fe5faf2f..cec0c0541e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -638,11 +638,15 @@ endif() if(UNIX) if(APPLE) + # TODO: temp for #5281 - Resigned with a different entitlements to avoid an issue when we pip install stuff into the E+ dir with native comps (numpy for eg) + set(ENERGYPLUS_REPO "jmarrec") + set(ENERGYPLUS_RELEASE_NAME "v24.2.0a-entitlements") + if (ARCH MATCHES "arm64") - set(ENERGYPLUS_EXPECTED_HASH f36afc055a675ae95523d6f41ec478c0) + set(ENERGYPLUS_EXPECTED_HASH 29616d6aa23e2fc0f71362da9794ef08) set(ENERGYPLUS_PLATFORM "Darwin-macOS13-arm64") else() - set(ENERGYPLUS_EXPECTED_HASH b2003c461277c0bd4e91a4c003b350ac) + set(ENERGYPLUS_EXPECTED_HASH 21bdad40fbc560b4b382469ef9f96936) set(ENERGYPLUS_PLATFORM "Darwin-macOS12.1-x86_64") endif() elseif(LSB_RELEASE_ID_SHORT MATCHES "CentOS") From 1832b845a47f5d60bbbedcb6cb5ab651847dfeb3 Mon Sep 17 00:00:00 2001 From: Julien Marrec Date: Tue, 5 Nov 2024 18:37:57 +0100 Subject: [PATCH 2/2] Bump to rc3 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cec0c0541e..bc5303263c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -161,7 +161,7 @@ get_directory_property(hasParent PARENT_DIRECTORY) # TODO: Modify the more specific variables as needed to indicate prerelease, etc # Keep in beta in-between release cycles. Set to empty string (or comment out) for official) -set(PROJECT_VERSION_PRERELEASE "rc2") +set(PROJECT_VERSION_PRERELEASE "rc3") # OpenStudio version: Only include Major.Minor.Patch, eg "3.0.0", even if you have a prerelease tag set(OPENSTUDIO_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")