From ec142640f553275bc793eac171ed9300485c8066 Mon Sep 17 00:00:00 2001 From: Tim Coleman Date: Mon, 31 Jul 2023 14:25:44 -0600 Subject: [PATCH 1/5] updates for latest 3.6.1 OpenStudio packages --- FindOpenStudioSDK.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/FindOpenStudioSDK.cmake b/FindOpenStudioSDK.cmake index 802306d9..c003132a 100644 --- a/FindOpenStudioSDK.cmake +++ b/FindOpenStudioSDK.cmake @@ -1,5 +1,5 @@ set(OPENSTUDIO_VERSION_MAJOR 3) -set(OPENSTUDIO_VERSION_MINOR 5) +set(OPENSTUDIO_VERSION_MINOR 6) set(OPENSTUDIO_VERSION_PATCH 1) set(OPENSTUDIO_VERSION "${OPENSTUDIO_VERSION_MAJOR}.${OPENSTUDIO_VERSION_MINOR}.${OPENSTUDIO_VERSION_PATCH}") @@ -16,23 +16,23 @@ else() set(OPENSTUDIO_BASELINK "https://openstudio-builds.s3.amazonaws.com/${OPENSTUDIO_VERSION}" CACHE STRING "Base link to where the openstudio archives are hosted" FORCE) - set(OPENSTUDIO_VERSION_SHA "+22e1db7be5") + set(OPENSTUDIO_VERSION_SHA "+bb9481519e") if(APPLE) - set(OPENSTUDIO_EXPECTED_HASH f21b03a44aa9ac3e52a4bdfa20009171) + set(OPENSTUDIO_EXPECTED_HASH ba881908f683ec695c209399f261b299) set(OPENSTUDIO_PLATFORM "Darwin-x86_64") set(OPENSTUDIO_EXT "tar.gz") elseif(UNIX) if(LSB_RELEASE_VERSION_SHORT MATCHES "20.04") - set(OPENSTUDIO_EXPECTED_HASH 6e5c93002f0cfb445dcdcdb1270261a4) + set(OPENSTUDIO_EXPECTED_HASH 5e67958249d99f96149b4d5576c3d0ef) set(OPENSTUDIO_PLATFORM "Ubuntu-20.04") else() # Assumes 20.04 - set(OPENSTUDIO_EXPECTED_HASH 6e5c93002f0cfb445dcdcdb1270261a4) + set(OPENSTUDIO_EXPECTED_HASH 5e67958249d99f96149b4d5576c3d0ef) set(OPENSTUDIO_PLATFORM "Ubuntu-20.04") endif() set(OPENSTUDIO_EXT "tar.gz") elseif(WIN32) - set(OPENSTUDIO_EXPECTED_HASH bc83efcb140d20f8f9758559a58c4347) + set(OPENSTUDIO_EXPECTED_HASH 802f8cffeac24f011e636baf1e6ffd40) set(OPENSTUDIO_PLATFORM "Windows") set(OPENSTUDIO_EXT "tar.gz") endif() From 150d7e5a6d5a35f8023778e5d7648bf1ac174e9b Mon Sep 17 00:00:00 2001 From: Tim Coleman Date: Tue, 1 Aug 2023 10:11:24 -0600 Subject: [PATCH 2/5] updates for gem packages --- CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2df89e13..24192525 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,16 +89,16 @@ option(BUILD_PACKAGE "Build package" OFF) # need to update the MD5sum for each platform and url below if(UNIX) if(APPLE) - set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20230616-darwin.tar.gz") - set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "0e1a97892eec849f469afd1a8f115321") + set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20230731-darwin.tar.gz") + set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "6dcaeb17c6567d5e5242c470b0ff2eb0") else() - set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20230616-linux.tar.gz") - set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "8d0ca0d83c184a4b4a9c389ca79ffe8b") + set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20230731-linux.tar.gz") + set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "ff67d59a162288cb7e5d4632e970e53d") endif() elseif(WIN32) if(CMAKE_CL_64) - set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20230616-windows.tar.gz") - set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "97ec22034dd6585a6356c01ba7a66c29") + set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20230801-windows.tar.gz") + set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "2293f9f07643d110a84afaa0c1049c03") endif() endif() From 7e8e58316bf42a3063da430ae50b625470eb755f Mon Sep 17 00:00:00 2001 From: Tim Coleman Date: Tue, 1 Aug 2023 10:20:17 -0600 Subject: [PATCH 3/5] update project version --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 24192525..4a2e3e68 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.10.2) cmake_policy(SET CMP0048 NEW) -project(URBANoptCLI VERSION 0.9.3) +project(URBANoptCLI VERSION 0.10.0) include(FindOpenStudioSDK.cmake) From 032f5afbda281422d3c7d0998540339b1d858a54 Mon Sep 17 00:00:00 2001 From: Tim Coleman Date: Tue, 1 Aug 2023 10:23:31 -0600 Subject: [PATCH 4/5] update ext for Ubuntu installer --- FindOpenStudioSDK.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FindOpenStudioSDK.cmake b/FindOpenStudioSDK.cmake index c003132a..fe8f84e5 100644 --- a/FindOpenStudioSDK.cmake +++ b/FindOpenStudioSDK.cmake @@ -25,10 +25,10 @@ else() elseif(UNIX) if(LSB_RELEASE_VERSION_SHORT MATCHES "20.04") set(OPENSTUDIO_EXPECTED_HASH 5e67958249d99f96149b4d5576c3d0ef) - set(OPENSTUDIO_PLATFORM "Ubuntu-20.04") + set(OPENSTUDIO_PLATFORM "Ubuntu-20.04_x86_64") else() # Assumes 20.04 set(OPENSTUDIO_EXPECTED_HASH 5e67958249d99f96149b4d5576c3d0ef) - set(OPENSTUDIO_PLATFORM "Ubuntu-20.04") + set(OPENSTUDIO_PLATFORM "Ubuntu-20.04_x86_64") endif() set(OPENSTUDIO_EXT "tar.gz") elseif(WIN32) From 4721bc8665752c233717726a9b9370bcdab01bc2 Mon Sep 17 00:00:00 2001 From: Tim Coleman Date: Tue, 1 Aug 2023 10:27:09 -0600 Subject: [PATCH 5/5] fix dash --- FindOpenStudioSDK.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FindOpenStudioSDK.cmake b/FindOpenStudioSDK.cmake index fe8f84e5..6a82a4ef 100644 --- a/FindOpenStudioSDK.cmake +++ b/FindOpenStudioSDK.cmake @@ -25,10 +25,10 @@ else() elseif(UNIX) if(LSB_RELEASE_VERSION_SHORT MATCHES "20.04") set(OPENSTUDIO_EXPECTED_HASH 5e67958249d99f96149b4d5576c3d0ef) - set(OPENSTUDIO_PLATFORM "Ubuntu-20.04_x86_64") + set(OPENSTUDIO_PLATFORM "Ubuntu-20.04-x86_64") else() # Assumes 20.04 set(OPENSTUDIO_EXPECTED_HASH 5e67958249d99f96149b4d5576c3d0ef) - set(OPENSTUDIO_PLATFORM "Ubuntu-20.04_x86_64") + set(OPENSTUDIO_PLATFORM "Ubuntu-20.04-x86_64") endif() set(OPENSTUDIO_EXT "tar.gz") elseif(WIN32)