From 7809f60f3f0edfca17358ea08d12a85087dee8c3 Mon Sep 17 00:00:00 2001 From: Michael Reuter Date: Thu, 26 Jun 2014 09:55:20 -0400 Subject: [PATCH 1/2] Refs #9680. Remove qtassistant from CMake. --- Code/Mantid/Build/CMake/UseSystemQt4.cmake | 2 +- Code/Mantid/Build/CMake/WindowsNSIS.cmake | 3 --- Code/Mantid/CMakeLists.txt | 9 --------- Code/Mantid/docs/CMakeLists.txt | 17 +++++------------ 4 files changed, 6 insertions(+), 25 deletions(-) diff --git a/Code/Mantid/Build/CMake/UseSystemQt4.cmake b/Code/Mantid/Build/CMake/UseSystemQt4.cmake index 3c1fe39d3220..db8dd519ee7d 100644 --- a/Code/Mantid/Build/CMake/UseSystemQt4.cmake +++ b/Code/Mantid/Build/CMake/UseSystemQt4.cmake @@ -74,7 +74,7 @@ SET(QT_QAXSERVER_MODULE_DEPENDS QTGUI QTCORE) SET(QT_QTSCRIPTTOOLS_MODULE_DEPENDS QTGUI QTCORE) # Qt modules (in order of dependence) -FOREACH(module QT3SUPPORT QTOPENGL QTASSISTANT QTDESIGNER QTMOTIF QTNSPLUGIN +FOREACH(module QT3SUPPORT QTOPENGL QTDESIGNER QTMOTIF QTNSPLUGIN QAXSERVER QAXCONTAINER QTSCRIPT QTSVG QTUITOOLS QTHELP QTWEBKIT PHONON QTSCRIPTTOOLS QTGUI QTTEST QTDBUS QTXML QTSQL QTXMLPATTERNS QTNETWORK QTCORE) diff --git a/Code/Mantid/Build/CMake/WindowsNSIS.cmake b/Code/Mantid/Build/CMake/WindowsNSIS.cmake index eb4d649a7a17..583a99ef3b3a 100644 --- a/Code/Mantid/Build/CMake/WindowsNSIS.cmake +++ b/Code/Mantid/Build/CMake/WindowsNSIS.cmake @@ -96,9 +96,6 @@ install ( DIRECTORY ${CMAKE_LIBRARY_PATH}/qt_plugins/imageformats ${CMAKE_LIBRARY_PATH}/qt_plugins/sqldrivers DESTINATION plugins/qtplugins REGEX "^.*d4.dll$" EXCLUDE ) install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/Installers/WinInstaller/qt.conf DESTINATION bin ) - - # Copy assistant.exe - install ( FILES ${CMAKE_LIBRARY_PATH}/assistant.exe DESTINATION bin ) # Release deployments do modify enviromental variables, other deployments do not. if(CPACK_PACKAGE_SUFFIX STREQUAL "") diff --git a/Code/Mantid/CMakeLists.txt b/Code/Mantid/CMakeLists.txt index b0e7ff3f1be1..0f107a2f3478 100644 --- a/Code/Mantid/CMakeLists.txt +++ b/Code/Mantid/CMakeLists.txt @@ -211,15 +211,6 @@ if ( ENABLE_CPACK ) set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES} scl-utils" ) endif() - # qt assistant is in different places in every distro - if ( "${UNIX_DIST}" MATCHES "RedHatEnterprise" ) - set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES} qt4-x11" ) - elseif ( "${UNIX_DIST}" MATCHES "Fedora" ) - set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES} qt4-assistant" ) - elseif ( "${UNIX_DIST}" MATCHES "SUSE LINUX" ) - set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES} libqt4-devel-doc" ) - endif ( "${UNIX_DIST}" MATCHES "RedHatEnterprise" ) - if( "${UNIX_DIST}" MATCHES "Ubuntu" ) # common packages set ( DEPENDS_LIST "libboost-date-time${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}," diff --git a/Code/Mantid/docs/CMakeLists.txt b/Code/Mantid/docs/CMakeLists.txt index 44bd148403bf..dbc0e609d2a9 100644 --- a/Code/Mantid/docs/CMakeLists.txt +++ b/Code/Mantid/docs/CMakeLists.txt @@ -32,7 +32,7 @@ if ( SPHINX_FOUND ) set ( DOCS_RUNNER_EXE ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/MantidPlot ) endif() - # qt-assistant target + # qthelp target if (QT_QCOLLECTIONGENERATOR_EXECUTABLE) set ( BUILDER qthelp ) configure_file ( runsphinx.py.in runsphinx_qthelp.py @ONLY ) @@ -41,12 +41,12 @@ if ( SPHINX_FOUND ) qthelp/MantidProject.qhp COMMAND ${DOCS_RUNNER_EXE} -xq runsphinx_qthelp.py DEPENDS Framework MantidPlot - COMMENT "Building qt-assistant index files") + COMMENT "Building Qt help index files") add_custom_command ( OUTPUT qthelp/MantidProject.qhc COMMAND ${QT_QCOLLECTIONGENERATOR_EXECUTABLE} qthelp/MantidProject.qhcp DEPENDS qthelp/MantidProject.qhcp - COMMENT "Compiling qt-assistant documentation") + COMMENT "Compiling Qt help documentation") add_custom_target ( ${TARGET_PREFIX}-qthelp DEPENDS qthelp/MantidProject.qhc ) @@ -57,7 +57,7 @@ if ( SPHINX_FOUND ) EXCLUDE_FROM_ALL 1) else (QT_QCOLLECTIONGENERATOR_EXECUTABLE) - message (WARNING " Did not find qcollectiongenerator - cannot create qtassistant files") + message (WARNING " Did not find qcollectiongenerator - cannot create Qt help files") endif ( QT_QCOLLECTIONGENERATOR_EXECUTABLE ) # HTML target @@ -99,14 +99,7 @@ if ( SPHINX_FOUND ) if ( PACKAGE_DOCS ) set ( HTML_DOCS_DEST share/doc ) if ( QT_QCOLLECTIONGENERATOR_EXECUTABLE ) - if (WIN32) # copy the assistant executable for windows 32 and 64 - set (QTASSISTANT_EXE ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/assistant.exe) - add_custom_command( OUTPUT ${QTASSISTANT_EXE} - COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${CMAKE_LIBRARY_PATH}/assistant.exe - ${QTASSISTANT_EXE} ) - endif (WIN32) - - # must "make qtassistant" before "make package" otherwise there will be a build failure + # must "make docs-qthelp" before "make package" otherwise there will be a build failure install (FILES ${SPHINX_BUILD_DIR}/qthelp/MantidProject.qhc ${SPHINX_BUILD_DIR}/qthelp/MantidProject.qch DESTINATION ${INBUNDLE}${HTML_DOCS_DEST} ) From 4ae982b363fdbfc7d00aedb661f483cf787979d9 Mon Sep 17 00:00:00 2001 From: Michael Reuter Date: Thu, 26 Jun 2014 15:07:18 -0400 Subject: [PATCH 2/2] Refs #9680. Removing Qt assistant package from developer RPMS. --- .../rpm/mantid-developer/mantid-developer-el6.spec | 3 +-- .../rpm/mantid-developer/mantid-developer-f19.spec | 3 +-- .../rpm/mantid-developer/mantid-developer-f20.spec | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-el6.spec b/Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-el6.spec index 937ff27a3172..ad41e6ea1667 100644 --- a/Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-el6.spec +++ b/Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-el6.spec @@ -1,6 +1,6 @@ Name: mantid-developer Version: 1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Meta Package to install dependencies for Mantid Development Group: Development/Tools @@ -41,7 +41,6 @@ Requires: openssl-devel Requires: texlive-latex Requires: dvipng Requires: mantidlibs-qt-devel -Requires: mantidlibs-qt-assistant Requires: scl-utils BuildArch: noarch diff --git a/Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-f19.spec b/Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-f19.spec index f26f8d718bf9..4c56f3acab44 100644 --- a/Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-f19.spec +++ b/Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-f19.spec @@ -1,6 +1,6 @@ Name: mantid-developer Version: 1.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Meta Package to install dependencies for Mantid Development Group: Development/Tools @@ -41,7 +41,6 @@ Requires: openssl-devel Requires: texlive-latex Requires: dvipng Requires: qt-devel -Requires: qt-assistant BuildArch: noarch diff --git a/Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-f20.spec b/Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-f20.spec index fb9539095ed2..5dfcc58f859b 100644 --- a/Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-f20.spec +++ b/Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-f20.spec @@ -1,6 +1,6 @@ Name: mantid-developer Version: 1.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Meta Package to install dependencies for Mantid Development Group: Development/Tools @@ -45,7 +45,6 @@ Requires: texlive-was Requires: tex-preview Requires: dvipng Requires: qt-devel -Requires: qt-assistant Requires: qtwebkit-devel BuildArch: noarch