Skip to content
New issue

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

#

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

Already on GitHub? # to your account

1 1 0 rc3 #250

Merged
merged 8 commits into from
Oct 13, 2020
Merged

1 1 0 rc3 #250

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4005479
Merge pull request #211 from openstudiocoalition/develop
macumber Aug 19, 2020
8930482
Merge branch 'develop'
jmarrec Sep 1, 2020
82dcb6d
Merge remote-tracking branch 'remotes/openstudiocoalition/master' int…
macumber Oct 13, 2020
097065e
Bump to OS 3.1.0-rc3
macumber Oct 13, 2020
5fc6345
Update OPENSTUDIO_BASELINK_RELEASE
macumber Oct 13, 2020
2fc5459
Don't alter urls for github
macumber Oct 13, 2020
b658547
Correct typo
jmarrec Oct 13, 2020
2191ea2
Another typo in sha
jmarrec Oct 13, 2020
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ endif()

# 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 "rc1")
set(PROJECT_VERSION_PRERELEASE "rc3")

# OpenStudio version: Only include Major.Minor.Patch, eg "3.0.0", even if you have a prerelease tag
set(OPENSTUDIOAPPLICATION_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
Expand Down
18 changes: 12 additions & 6 deletions FindOpenStudioSDK.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@ set(OPENSTUDIO_VERSION "${OPENSTUDIO_VERSION_MAJOR}.${OPENSTUDIO_VERSION_MINOR}.
#If this is a release enter the SHA as "+79857912c4"
#set(OPENSTUDIO_VERSION_SHA "+09b7c8a554")
#If this is a pre-release enter the pre-release and SHA as "-rc1+79857912c4"
set(OPENSTUDIO_VERSION_SHA "-rc2+527967526b")
set(OPENSTUDIO_VERSION_SHA "-rc3+dec0b9e")

# Paths where the cmake-downloaded archives will be put
set(OPENSTUDIO_ARCHIVE_DIR "${PROJECT_BINARY_DIR}/OpenStudio-${OPENSTUDIO_VERSION}")

# If downloaded, we need the SHA to match. This block is here since we need "OPENSTUDIO_PLATFORM" anyways
if(APPLE)
set(OPENSTUDIO_EXPECTED_HASH 98125a55e5243531c06f15e61dc9289a)
set(OPENSTUDIO_EXPECTED_HASH 2053c404707fbc636f5000d6bd927111)
set(OPENSTUDIO_PLATFORM "Darwin")
set(OPENSTUDIO_EXT "tar.gz")
elseif(UNIX)
set(OPENSTUDIO_EXPECTED_HASH 568c4cb9ba9f5ad5d8b11bc1d4799898)
set(OPENSTUDIO_EXPECTED_HASH f66add09d7b5564b8e13f4c0d4ec9565)
set(OPENSTUDIO_PLATFORM "Linux")
set(OPENSTUDIO_EXT "tar.gz")
elseif(WIN32)
set(OPENSTUDIO_EXPECTED_HASH 2bf8114499bbe78edf882919213b76d9)
set(OPENSTUDIO_EXPECTED_HASH ca7893d7c21326af948894342b872c47)
set(OPENSTUDIO_PLATFORM "Windows")
set(OPENSTUDIO_EXT "tar.gz")
endif()
Expand All @@ -46,7 +46,9 @@ else()
# Not found: no problem, we download it

# base link for release builds
set(OPENSTUDIO_BASELINK_RELEASE "https://openstudio-builds.s3.amazonaws.com/${OPENSTUDIO_VERSION}"
set(OPENSTUDIO_BASELINK_RELEASE
#"https://openstudio-builds.s3.amazonaws.com/${OPENSTUDIO_VERSION}"
https://github.com/NREL/OpenStudio/releases/download/v3.1.0-rc3
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we just perhaps try to capture it from SHA, but whatever for now

CACHE STRING "Base link to where the openstudio archives are hosted" FORCE)

# base link for develop builds. (Using https will fail)
Expand Down Expand Up @@ -85,7 +87,11 @@ else()
# Try with the official releases first, then fall back to the CI (develop) nightly builds
foreach(BASELINK IN LISTS OPENSTUDIO_BASELINK_RELEASE OPENSTUDIO_BASELINK_CI)
set(OPENSTUDIO_URL "${BASELINK}/${OPENSTUDIO_ARCHIVE_NAME}")
string(REPLACE "+" "%2B" OPENSTUDIO_URL ${OPENSTUDIO_URL})

if(BASELINK MATCHES "amazonaws")
string(REPLACE "+" "%2B" OPENSTUDIO_URL ${OPENSTUDIO_URL})
endif()

message(STATUS "Try Downloading OpenStudio SDK: ${OPENSTUDIO_URL}")

# Cannot use EXPECTED_MD5 here, or it'll throw an error, which we do not want.
Expand Down