Skip to content

Update to OS SDK v3.10.0 and EnergyPlus v25.1.0-WithDSOASpaceListFixes #809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmarrec merged 4 commits into from
Jun 19, 2025
Merged

Update to OS SDK v3.10.0 and EnergyPlus v25.1.0-WithDSOASpaceListFixes #809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec7f38f
Update to OS SDK 3.10.0-rc5
jmarrec Jun 17, 2025
1346b3d
Update to OS SDK 3.10.0
jmarrec Jun 18, 2025
768602b
Update E+ files to sign (TODO: glob?)
jmarrec Jun 19, 2025
8eb02bb
Add -Wno-enum-constexpr-conversion for boost 1.79 on recent clang
jmarrec Jun 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMake/install_codesign_script_OpenStudioApp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ endif()

set(FILES_TO_SIGN
EnergyPlus/ExpandObjects
EnergyPlus/energyplus-24.2.0
EnergyPlus/energyplus-25.1.0
EnergyPlus/energyplus.1
EnergyPlus/libenergyplusapi.24.2.0.dylib
EnergyPlus/libenergyplusapi.25.1.0.dylib
EnergyPlus/libintl.8.dylib
EnergyPlus/libpython3.12.dylib
Ruby/openstudio.bundle
Expand Down
3 changes: 3 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,9 @@ if(UNIX)
# Note: CMAKE_CXX_STANDARD (with no extensions) already sets -std=c++17 (or std=c++1z).
if(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
# TODO: workaround for #5398, remove when updating boost
AddCXXFlagIfSupported(-Wno-enum-constexpr-conversion COMPILER_SUPPORTS_enum_constexpr_conversion) # Clang 16.0+ and Apple Clang 15+ only
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
endif()
endif()

Expand Down
18 changes: 9 additions & 9 deletions FindOpenStudioSDK.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
set(OPENSTUDIO_VERSION_MAJOR 3)
set(OPENSTUDIO_VERSION_MINOR 9)
set(OPENSTUDIO_VERSION_MINOR 10)
set(OPENSTUDIO_VERSION_PATCH 0)
set(OPENSTUDIO_VERSION "${OPENSTUDIO_VERSION_MAJOR}.${OPENSTUDIO_VERSION_MINOR}.${OPENSTUDIO_VERSION_PATCH}")

#If this is an official release, leave this "", otherwise put for eg '-rc1'
set(OPENSTUDIO_VERSION_PRERELEASE "")
# Enter SHA, always, eg "+79857912c4"
set(OPENSTUDIO_VERSION_SHA "+c77fbb9569")
set(OPENSTUDIO_VERSION_SHA "+86d7e215a1")

# Paths where the cmake-downloaded archives will be put
set(OPENSTUDIO_ARCHIVE_DIR "${PROJECT_BINARY_DIR}/OpenStudio-${OPENSTUDIO_VERSION}")
Expand All @@ -17,32 +17,32 @@ set(OPENSTUDIO_EXT "tar.gz")
if(APPLE)
set(OPENSTUDIO_PLATFORM "Darwin-${ARCH}")
if(ARCH MATCHES "arm64")
set(OPENSTUDIO_EXPECTED_HASH b373b0f23b529f9764464aae13725558)
set(OPENSTUDIO_EXPECTED_HASH b412f1cd6ab6747c75dece567291e81e)
else()
set(OPENSTUDIO_EXPECTED_HASH 39c5ae27eeb840472e36b728ab906315)
set(OPENSTUDIO_EXPECTED_HASH 00d0321aa6c4ab5a3c36fe2335a07157)
endif()

elseif(UNIX)
set(OPENSTUDIO_PLATFORM "${LSB_RELEASE_ID_SHORT}-${LSB_RELEASE_VERSION_SHORT}-${ARCH}")
if(LSB_RELEASE_VERSION_SHORT MATCHES "24.04")
#set(OPENSTUDIO_PLATFORM "${LSB_RELEASE_ID_SHORT}-22.04-${ARCH}")
if (ARCH MATCHES "arm64")
set(OPENSTUDIO_EXPECTED_HASH 4c35af3cc4e8d7b1aed2dd98b678a243)
set(OPENSTUDIO_EXPECTED_HASH b4f328e0b28a479c55a338e87dac254f)
else()
set(OPENSTUDIO_EXPECTED_HASH 256d18d2d7036883823f2aeae180dfaa)
set(OPENSTUDIO_EXPECTED_HASH 92c3407f888731d6da30b0a7b49d0f5c)
endif()
elseif(LSB_RELEASE_VERSION_SHORT MATCHES "22.04")
if (ARCH MATCHES "arm64")
set(OPENSTUDIO_EXPECTED_HASH fd1ba05628eb55b3bb72923a8395e267)
set(OPENSTUDIO_EXPECTED_HASH d1ae86bba822eeb0541a7603e81a4074)
else()
set(OPENSTUDIO_EXPECTED_HASH 67522b9a1ba5749cf0b3cf101a6131cf)
set(OPENSTUDIO_EXPECTED_HASH 209820bd2f9b487f0d0f4d4df311753f)
endif()
else()
message(FATAL_ERROR "OpenStudio SDK no longer provides packages for Ubuntu 20.04 or older")
endif()

elseif(WIN32)
set(OPENSTUDIO_EXPECTED_HASH c3a1ec4bc98d7418780a702036ce0edb)
set(OPENSTUDIO_EXPECTED_HASH afd101545253e8e7ba17b7b88c0556a2)
set(OPENSTUDIO_PLATFORM "Windows")
endif()

Expand Down
Loading