Skip to content
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

Update to E+ v24.2.0a #5267

Merged
merged 6 commits into from
Oct 7, 2024
Merged

Update to E+ v24.2.0a #5267

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2d8749d
Start to update cmakelists.
joseph-robertson Oct 3, 2024
2b320b5
Add more installer hashes.
joseph-robertson Oct 3, 2024
4b2c04d
Merge branch 'v24.2.0-IOFreeze' into v24.2.1-RC1
joseph-robertson Oct 3, 2024
7d61e87
Update eplus release name.
joseph-robertson Oct 4, 2024
e34e5a2
Merge branch 'v24.2.0-IOFreeze' into v24.2.1-RC1
joseph-robertson Oct 4, 2024
61df624
Update all hashes
jmarrec Oct 7, 2024
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
23 changes: 11 additions & 12 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,11 +196,11 @@ set(ENERGYPLUS_VERSION_MINOR 2)
set(ENERGYPLUS_VERSION_PATCH 0)
set(ENERGYPLUS_VERSION "${ENERGYPLUS_VERSION_MAJOR}.${ENERGYPLUS_VERSION_MINOR}.${ENERGYPLUS_VERSION_PATCH}")
# Build SHA is not required to have a value, but if it does OpenStudio will require this build.
set(ENERGYPLUS_BUILD_SHA "e7ecb2d53b")
set(ENERGYPLUS_BUILD_SHA "94a887817b")

# ENERGYPLUS_RELEASE_NAME is used to locate the E+ download
# from the github releases
set(ENERGYPLUS_RELEASE_NAME "v24.2.0")
set(ENERGYPLUS_RELEASE_NAME "v24.2.0a")

set(ENERGYPLUS_REPO "NREL")

Expand Down Expand Up @@ -639,27 +639,27 @@ endif()
if(UNIX)
if(APPLE)
if (ARCH MATCHES "arm64")
set(ENERGYPLUS_EXPECTED_HASH 2133bece9c363df12679fd785e018833)
set(ENERGYPLUS_EXPECTED_HASH f36afc055a675ae95523d6f41ec478c0)
set(ENERGYPLUS_PLATFORM "Darwin-macOS13-arm64")
else()
set(ENERGYPLUS_EXPECTED_HASH f091e1891b92bafe751de393f162fbbe)
set(ENERGYPLUS_EXPECTED_HASH b2003c461277c0bd4e91a4c003b350ac)
set(ENERGYPLUS_PLATFORM "Darwin-macOS12.1-x86_64")
endif()
elseif(LSB_RELEASE_ID_SHORT MATCHES "CentOS")
set(ENERGYPLUS_EXPECTED_HASH 92764fe6197b35843236f2cc10c1513a)
set(ENERGYPLUS_EXPECTED_HASH 4000e06b944daf4f2b0841ac0d3873b5)
set(ENERGYPLUS_PLATFORM "Linux-CentOS7.9.2009-x86_64")
else()
if(LSB_RELEASE_VERSION_SHORT MATCHES "24.04")
if (ARCH MATCHES "arm64")
# set(ENERGYPLUS_EXPECTED_HASH 7ce649525157b6e18b170eb72916e83c) ???
set(ENERGYPLUS_EXPECTED_HASH afc61e89b7f9e2658c3d99778be50be0)
else()
set(ENERGYPLUS_EXPECTED_HASH 84a2246e9bd29e119e3d9e908ad4f9fa)
set(ENERGYPLUS_EXPECTED_HASH 22b3e5f6071d6011ffeeacf854a97c73)
endif()
elseif(LSB_RELEASE_VERSION_SHORT MATCHES "22.04")
if (ARCH MATCHES "arm64")
set(ENERGYPLUS_EXPECTED_HASH 7ce649525157b6e18b170eb72916e83c)
set(ENERGYPLUS_EXPECTED_HASH 3c18cb8063ec30ef591109ddf8842bf0)
else()
set(ENERGYPLUS_EXPECTED_HASH 6fd5be2cb29461645efb487c860e9413)
set(ENERGYPLUS_EXPECTED_HASH 9f11a16e6f8a7d658791c5389d700ef1)
endif()
else() # e.g., 18.04, 20.04
message(FATAL_ERROR "EnergyPlus no longer provides packages for Ubuntu < 22.04")
Expand Down Expand Up @@ -696,12 +696,11 @@ elseif(WIN32)
if(CMAKE_SIZEOF_VOID_P EQUAL 8) # 64 bit
set(ENERGYPLUS_PATH "EnergyPlus-${ENERGYPLUS_VERSION}-${ENERGYPLUS_BUILD_SHA}-Windows-x86_64")
set(ENERGYPLUS_ARCH 64)
set(ENERGYPLUS_EXPECTED_HASH 2675ea68249e0355dbf631da746aa370)
set(ENERGYPLUS_EXPECTED_HASH 6a2d1d43d64490c87d894ed58f71ccdc)
else()
set(ENERGYPLUS_PATH "EnergyPlus-${ENERGYPLUS_VERSION}-${ENERGYPLUS_BUILD_SHA}-Windows-i386")
set(ENERGYPLUS_ARCH 32)
# set(ENERGYPLUS_EXPECTED_HASH 766cf42388ca5b682800fe6ded8ac3ee) ?
set(ENERGYPLUS_REPO "jmarrec")
set(ENERGYPLUS_EXPECTED_HASH 7f0c2901399f43bff6e23c01a5992df1)
endif()
if(EXISTS "${PROJECT_BINARY_DIR}/${ENERGYPLUS_PATH}.zip")
file(MD5 "${PROJECT_BINARY_DIR}/${ENERGYPLUS_PATH}.zip" ENERGYPLUS_HASH)
Expand Down