Merge pull request #864 from openstudiocoalition/remove_qt_ruby

Remove Qt from ModelEditor Ruby bindings

Author: jmarrec

.github/workflows/app_build.yml

@@ -435,7 +435,7 @@ jobs:
           pip3 install aqtinstall
           aqt list-qt ${{ matrix.QT_OS_NAME }} desktop --arch $QT_VERSION
           aqt list-qt ${{ matrix.QT_OS_NAME }} desktop --modules $QT_VERSION ${{ matrix.QT_ARCH }}
-          aqt install-qt --outputdir ./build/Qt-install/ ${{ matrix.QT_OS_NAME }} desktop $QT_VERSION ${{ matrix.QT_ARCH }} -m qtwebchannel qtwebengine qtwebview qt5compat qtpositioning qtcharts
+          aqt install-qt --outputdir ./build/Qt-install/ ${{ matrix.QT_OS_NAME }} desktop $QT_VERSION ${{ matrix.QT_ARCH }} -m qtwebchannel qtwebengine qtwebview qtpositioning qtcharts
         fi
 
         echo "$QT_INSTALL_DIR/bin" >> $GITHUB_PATH

CMake/CPackSignAndNotarizeDmg.cmake

@@ -32,6 +32,20 @@ if(APPLE AND CPACK_GENERATOR STREQUAL "IFW")
     message(FATAL_ERROR "CPACK_CODESIGNING_MACOS_IDENTIFIER is required, this should not have happened")
   endif()
 
+  foreach(CPACK_PACKAGE_FILE ${CPACK_PACKAGE_FILES})
+    if(NOT EXISTS "${CPACK_PACKAGE_FILE}")
+      message(STATUS "File does not exist: ${CPACK_PACKAGE_FILE}")
+
+      # wait in case file has not been written to disk yet
+      execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 10)
+
+      if(NOT EXISTS "${CPACK_PACKAGE_FILE}")
+        message(FATAL_ERROR "File still does not exist: ${CPACK_PACKAGE_FILE}")
+      endif()
+
+    endif()
+  endforeach()
+
   codesign_files_macos(
     FILES ${CPACK_PACKAGE_FILES}
     SIGNING_IDENTITY ${CPACK_CODESIGNING_DEVELOPPER_ID_APPLICATION}

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.11.0)
+project(OpenStudioApplication VERSION 1.12.0)
 
 # Check system info globally so we can use it everywhere after: Has to be done before FindOpenStudioSDK.cmake
 if(APPLE)
@@ -272,7 +272,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 "")
+set(PROJECT_VERSION_PRERELEASE "beta")
 
 # 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}")
@@ -544,7 +544,7 @@ message(STATUS "QT_INSTALL_DIR=${QT_INSTALL_DIR}")
 
 find_package(Qt6 ${QT_VERSION} COMPONENTS CoreTools GuiTools WidgetsTools QmlTools WebEngineCoreTools REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
 
-find_package(Qt6 ${QT_VERSION} COMPONENTS Core Core5Compat Gui Widgets Sql Svg Network Xml Concurrent PrintSupport Quick QuickWidgets Qml WebChannel Positioning WebEngineCore WebEngineWidgets Charts REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
+find_package(Qt6 ${QT_VERSION} COMPONENTS Core Gui Widgets Sql Svg Network Xml Concurrent PrintSupport Quick QuickWidgets Qml WebChannel Positioning WebEngineCore WebEngineWidgets Charts REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
 
 find_package(Qt6LinguistTools ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
 
@@ -612,7 +612,6 @@ endif()
 
 # QT_LIBS are linked by OS App and by openstudio_modeleditor.so
 list(APPEND QT_LIBS Qt6::Core)
-list(APPEND QT_LIBS Qt6::Core5Compat)
 list(APPEND QT_LIBS Qt6::Widgets)
 list(APPEND QT_LIBS Qt6::Network)
 list(APPEND QT_LIBS Qt6::Xml)
@@ -643,7 +642,6 @@ list(APPEND QT_INCLUDES ${Qt6Widgets_INCLUDE_DIRS})
 list(APPEND QT_INCLUDES ${Qt6Xml_INCLUDE_DIRS})
 list(APPEND QT_INCLUDES ${Qt6Network_INCLUDE_DIRS})
 list(APPEND QT_INCLUDES ${Qt6Gui_INCLUDE_DIRS})
-list(APPEND QT_INCLUDES "${QT_INSTALL_DIR}/include/QtGui/${QT_VERSION}/QtGui") # needed by qtwinmigrate
 list(APPEND QT_INCLUDES ${Qt6PrintSupport_INCLUDE_DIRS})
 
 # DLM: added this, but seems to conflict with idea of a separate set of Qt Web dependencies?
@@ -708,10 +706,6 @@ get_target_property(OS_CLI_IMPORTED_PATH openstudio::openstudio LOCATION)
 # set(OS_CLI_IMPORTED_NAME "openstudio${CMAKE_EXECUTABLE_SUFFIX}")
 get_filename_component(OS_CLI_IMPORTED_NAME ${OS_CLI_IMPORTED_PATH} NAME)
 
-if(WIN32)
-  include_directories("${PROJECT_SOURCE_DIR}/src/qtwinmigrate")
-  list(APPEND project_directories "qtwinmigrate")
-endif()
 list(APPEND project_directories "utilities")
 list(APPEND project_directories "model_editor")
 list(APPEND project_directories "bimserver")
@@ -730,9 +724,6 @@ add_subdirectory("translations")
 #                        E X P O R T    T A R G E T S                         #
 ###############################################################################
 
-if(WIN32)
-  list(APPEND all_lib_targets "qtwinmigrate")
-endif()
 list(APPEND all_lib_targets "openstudio_modeleditor")
 list(APPEND all_lib_targets "openstudio_bimserver")
 list(APPEND all_lib_targets "openstudio_lib")