Merge pull request #723 from openstudiocoalition/v1.7.2-patch

v1.7.2 patch to not automatically download results measure
openstudiocoalition · Jul 15, 2024 · 10eb8f7 · 10eb8f7
2 parents fd8611d + a6efa4f
commit 10eb8f7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 22 deletions.
diff --git a/.github/workflows/app_build.yml b/.github/workflows/app_build.yml
@@ -95,7 +95,7 @@ jobs:
  BINARY_PKG_PATH: _CPack_Packages/Darwin/IFW
  COMPRESSED_PKG_PATH: _CPack_Packages/Darwin/TGZ
  MACOSX_DEPLOYMENT_TARGET: 11.0
- SDKROOT: /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
+ SDKROOT: /Applications/Xcode_15.0.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
  QT_OS_NAME: mac
  QT_ARCH: clang_64
  - os: macos-arm64
@@ -110,7 +110,7 @@ jobs:
  BINARY_PKG_PATH: _CPack_Packages/Darwin/IFW
  COMPRESSED_PKG_PATH: _CPack_Packages/Darwin/TGZ
  MACOSX_DEPLOYMENT_TARGET: 12.1
- SDKROOT: /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
+ SDKROOT: /Applications/Xcode_15.0.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
  QT_OS_NAME: mac
  QT_ARCH: arm_64
 
@@ -213,6 +213,9 @@ jobs:
  echo "Using previously installed ninja and IFW"
  echo "/Users/irvinemac/Qt/Tools/QtInstallerFramework/4.3/bin/" >> $GITHUB_PATH
  else
+ echo "Setting Xcode version"
+ sudo xcode-select -s "/Applications/Xcode_15.0.1.app/Contents/Developer/"
+
  echo "Using brew to install ninja"
  brew install ninja md5sha1sum ccache
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,7 @@ if(CCACHE_PROGRAM)
  set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_PROGRAM} CACHE FILEPATH "C compiler cache used")
 endif()
 
-project(OpenStudioApplication VERSION 1.7.1)
+project(OpenStudioApplication VERSION 1.7.2)
 
 # Check system info globally so we can use it everywhere after: Has to be done before FindOpenStudioSDK.cmake
 if(APPLE)

diff --git a/ConanInstall.cmake b/ConanInstall.cmake
@@ -5,8 +5,8 @@
 if(NOT CONAN_OPENSTUDIO_ALREADY_RUN)
 
  set(CMAKE_CONAN_EXPECTED_HASH
- 5cdb3042632da3efff558924eecefd580a0e786863a857ca097c3d1d43df5dcd)
- set(CMAKE_CONAN_VERSION "0.18.1")
+ 6abed7382c98a76b447675b30baff6a0b2f5d263041f6eb2fb682b80adaa2555)
+ set(CMAKE_CONAN_VERSION "b240c809b5ea097077fc8222cad71d2329288e48")
 
  if(EXISTS "${CMAKE_BINARY_DIR}/conan.cmake")
  file(SHA256 "${CMAKE_BINARY_DIR}/conan.cmake" CMAKE_CONAN_HASH)

diff --git a/src/openstudio_lib/OSDocument.cpp b/src/openstudio_lib/OSDocument.cpp
@@ -1480,23 +1480,9 @@ std::vector<BCLComponent> OSDocument::componentAttributeSearch(const std::vector
 }
 
 boost::optional<BCLMeasure> OSDocument::standardReportMeasure() {
- const std::string uid("a25386cd-60e4-46bc-8b11-c755f379d916");
- boost::optional<BCLMeasure> result = getLocalMeasure(uid);
-
- if (!result) {
- // if we don't have a result measure in local bcl, use the one in the installer
- result = BCLMeasure::load(m_resourcesPath / toPath("openstudio_results"));
- }
-
- if (m_haveLocalBCL && RemoteBCL::isOnline()) {
- RemoteBCL remoteBCL;
- boost::optional<BCLMeasure> onlineResult = remoteBCL.getMeasure(uid);
- if (onlineResult) {
- result = onlineResult;
- }
- }
-
- return result;
+ // DLM: Breaking changes in openstudio_results measures prevent us from being able to ensure
+ // that measure in users local BCL or remote BCL will work, just use measure in installer
+ return BCLMeasure::load(m_resourcesPath / toPath("openstudio_results"));
 }
 
 bool OSDocument::save() {