From 1b02ad37606854a87b2b53a6b4e93bf4b3a6c935 Mon Sep 17 00:00:00 2001 From: tijcolem Date: Tue, 21 May 2024 10:36:04 -0600 Subject: [PATCH 1/3] bump version to 0.12.0 and update gem packages --- CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 983deda3..033aa1ff 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.11.1) +project(URBANoptCLI VERSION 0.12.0) include(FindOpenStudioSDK.cmake) @@ -89,21 +89,21 @@ 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-20240220-darwin.tar.gz") - set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "1f735d71eab98df9be7b72f9d5d8a940") + set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20240521-darwin.tar.gz") + set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "b68de4be53118f58e245aa8bd17f8992") else() if (ARCH MATCHES "arm64") set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20240220-linux-arm.tar.gz") set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "ceb41bdd108a77bc43c6d260725a399f") else() - set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20240220-linux.tar.gz") - set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "715c40a3bf59d539a18a03ad3932ca67") + set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20240521-linux.tar.gz") + set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "3f5bf6bc692b0bcc5f50a5b45c2698b3") endif() endif() elseif(WIN32) if(CMAKE_CL_64) - set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20240220-windows.tar.gz") - set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "944c39e178651173a03efae1d99713e3") + set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20240521-windows.tar.gz") + set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "c01415b7b91a0db7ad97ad0493286598") endif() endif() From e410bf765a195bd04fec7b69a40b5ed5566d7381 Mon Sep 17 00:00:00 2001 From: tijcolem Date: Fri, 24 May 2024 11:43:26 -0600 Subject: [PATCH 2/3] updates for linux arm support --- CMakeLists.txt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 033aa1ff..2c72cded 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,8 +93,8 @@ if(UNIX) set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "b68de4be53118f58e245aa8bd17f8992") else() if (ARCH MATCHES "arm64") - set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20240220-linux-arm.tar.gz") - set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "ceb41bdd108a77bc43c6d260725a399f") + set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20240524-linux-arm.tar.gz") + set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "18915b55621ee755bf92c506b5cdba2a") else() set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20240521-linux.tar.gz") set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "3f5bf6bc692b0bcc5f50a5b45c2698b3") @@ -133,8 +133,13 @@ if(UNIX) set(RUBY_ZIP_FILENAME "ruby-2.7.2-darwin.tar.gz") set(RUBY_ZIP_EXPECTED_MD5 "1ee27d6381797a5af7398f8eee8edb07") else() - set(RUBY_ZIP_FILENAME "ruby-2.7.2-linux.tar.gz") - set(RUBY_ZIP_EXPECTED_MD5 "853425b0c9878b064937f9e49688c6c6") + if (ARCH MATCHES "arm64") + set(URBANOPT_CLI_GEMS_ZIP_FILENAME "ruby-2.7.2-ubuntu-22.04-arm.tar.gz") + set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "bfef9299b151f84334684134c9a09347") + else() + set(RUBY_ZIP_EXPECTED_MD5 "853425b0c9878b064937f9e49688c6c6") + set(RUBY_ZIP_FILENAME "ruby-2.7.2-linux.tar.gz") + endif() endif() elseif(WIN32) set(RUBY_ZIP_FILENAME "ruby-2.7.2-win32.tar.gz") From 65af73929efc606f4d41d243c37621b8c5eecca6 Mon Sep 17 00:00:00 2001 From: tijcolem Date: Fri, 24 May 2024 11:50:13 -0600 Subject: [PATCH 3/3] update for OpenStudio Ubuntu 22.04 arm package --- FindOpenStudioSDK.cmake | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/FindOpenStudioSDK.cmake b/FindOpenStudioSDK.cmake index 1ef76711..21b4090c 100644 --- a/FindOpenStudioSDK.cmake +++ b/FindOpenStudioSDK.cmake @@ -23,6 +23,18 @@ else() set(OPENSTUDIO_PLATFORM "Darwin-x86_64") set(OPENSTUDIO_EXT "tar.gz") elseif(UNIX) + if(LSB_RELEASE_VERSION_SHORT MATCHES "22.04") + if (ARCH MATCHES "arm64") + set(OPENSTUDIO_EXPECTED_HASH d98b3d3d133a7c5bc1b9581553d23811) + set(OPENSTUDIO_PLATFORM "Ubuntu-22.04-arm64") + else() + set(OPENSTUDIO_EXPECTED_HASH 1e48f36417d3d118d6a10f1a7d61f46e) + endif() + set(OPENSTUDIO_EXPECTED_HASH 5c006e5e66e5e859206a63626ea2966f) + set(OPENSTUDIO_PLATFORM "Ubuntu-22.04-x86_64") + else() # Assumes 20.04 + set(OPENSTUDIO_EXPECTED_HASH 5c006e5e66e5e859206a63626ea2966f) + set(OPENSTUDIO_PLATFORM "Ubuntu-20.04-x86_64") if(LSB_RELEASE_VERSION_SHORT MATCHES "20.04") if (ARCH MATCHES "arm64") set(OPENSTUDIO_EXPECTED_HASH d98b3d3d133a7c5bc1b9581553d23811)