Merge branch 'master' into feature/10215_clean_indirect_diffraction_ui

Refs #10215

Code/Mantid/Build/CMake/FindQwt.cmake

@@ -1,47 +1,36 @@
 ###############################################################################
-# - Attempt to find Qwt libraries and include files. 
-# QWT_INCLUDE_DIR where to find qwt_plot.h, etc.
-# QWT_LIBRARIES libraries to link against
-# QWT_FOUND If false, do not try to use Qwt
-# QWT_VERSION Sets a string containing the version number parsed from 
-#             qwt_global.h
+# Attempt to find Qwt libraries and include files.
+# Set
+#   QWT_INCLUDE_DIR: where to find qwt_plot.h, etc.
+#   QWT_LIBRARIES:   libraries to link against
+#   QWT_VERSION:     a string containing the version number
 ###############################################################################
 
-find_path ( QWT_INCLUDE_DIR qwt.h PATHS
-            /usr/local/include 
-            /usr/include/qwt-qt4 
-            /usr/include/qwt 
-            /usr/include/qwt5 
-            /usr/include/qwt5-qt4
-	    ${CMAKE_INCLUDE_PATH}/qwt 
-)
-find_library ( QWT_LIBRARY NAMES qwt-qt4 qwt qwt5-qt4 )
+find_path ( QWT_INCLUDE_DIR qwt.h 
+            PATHS /opt/include /usr/local/include /usr/include ${CMAKE_INCLUDE_PATH}
+            PATH_SUFFIXES qwt5 qwt5-qt4 qwt-qt4 qwt )
+find_library ( QWT_LIBRARY NAMES qwt5-qt4 qwt-qt4 qwt )
 find_library ( QWT_LIBRARY_DEBUG qwtd )
 
-# handle the QUIETLY and REQUIRED arguments and set QWT_FOUND to TRUE if 
-# all listed variables are TRUE
+# in REQUIRED mode: terminate if one of the above find commands failed
 include ( FindPackageHandleStandardArgs )
 find_package_handle_standard_args( Qwt DEFAULT_MSG QWT_LIBRARY QWT_INCLUDE_DIR )
 
-if ( QWT_INCLUDE_DIR )
-  # Look for line in qwt_global.h containing version string
-  file ( STRINGS ${QWT_INCLUDE_DIR}/qwt_global.h QWT_VERSION 
-         REGEX "^#define[ \t]+QWT_VERSION_STR[ \t]+\"[0-9]+.[0-9]+.[0-9]+\"$" )
-  if ( NOT QWT_VERSION )
-    message ( WARNING "Unrecognized Qwt version, cannot find QWT_VERSION_STR in qwt_global.h" )
-    set ( QWT_VERSION "0.0.0" )
-  else()
-    # Hack off the portion up to and including the first double quote 
-    string( REGEX REPLACE "^#define[ \t]+QWT_VERSION_STR[ \t]+\"" "" QWT_VERSION ${QWT_VERSION} )
-    # Hack off the portion from the second double quote to the end of the line
-    string( REGEX REPLACE "\"$" "" QWT_VERSION ${QWT_VERSION} )
-  endif()
-
-  if ( QWT_LIBRARY_DEBUG )
-    set( QWT_LIBRARIES optimized ${QWT_LIBRARY} debug ${QWT_LIBRARY_DEBUG} )
-  else ()
-    set( QWT_LIBRARIES ${QWT_LIBRARY} )
-  endif ()
+# Parse version string from qwt_global.h
+file ( STRINGS ${QWT_INCLUDE_DIR}/qwt_global.h QWT_VERSION 
+       REGEX "^#define[ \t]+QWT_VERSION_STR[ \t]+\"[0-9]+.[0-9]+.[0-9]+\"$" )
+if ( NOT QWT_VERSION )
+    message ( FATAL_ERROR "Unrecognized Qwt version (cannot find QWT_VERSION_STR in qwt_global.h)" )
 endif()
+#   hack off the portion up to and including the first double quote 
+string( REGEX REPLACE "^#define[ \t]+QWT_VERSION_STR[ \t]+\"" "" QWT_VERSION ${QWT_VERSION} )
+#   hack off the portion from the second double quote to the end of the line
+string( REGEX REPLACE "\"$" "" QWT_VERSION ${QWT_VERSION} )
+
+if ( QWT_LIBRARY_DEBUG )
+  set( QWT_LIBRARIES optimized ${QWT_LIBRARY} debug ${QWT_LIBRARY_DEBUG} )
+else ()
+  set( QWT_LIBRARIES ${QWT_LIBRARY} )
+endif ()
 
 mark_as_advanced ( QWT_INCLUDE_DIR QWT_LIBRARY QWT_LIBRARY_DEBUG )

Code/Mantid/Build/CMake/LinuxSetup.cmake

@@ -97,9 +97,15 @@ if ( "${UNIX_DIST}" MATCHES "RedHatEnterprise" )
 							             "  ln -s $RPM_INSTALL_PREFIX0/${BIN_DIR}/launch_mantidplot.sh $RPM_INSTALL_PREFIX0/${BIN_DIR}/MantidPlot\n"
                                                                      "fi\n"
 	)
-	file ( WRITE ${CMAKE_CURRENT_BINARY_DIR}/launch_mantidplot.sh "#!/bin/sh\n"
-								      "scl enable mantidlibs \"${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/MantidPlot_exe $*\" \n"
+        if ( "${UNIX_CODENAME}" MATCHES "Santiago" ) # el6
+            file ( WRITE ${CMAKE_CURRENT_BINARY_DIR}/launch_mantidplot.sh "#!/bin/sh\n"
+	           "scl enable mantidlibs \"${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/MantidPlot_exe $*\" \n"
 	)
+        else ()
+            file ( WRITE ${CMAKE_CURRENT_BINARY_DIR}/launch_mantidplot.sh "#!/bin/sh\n"
+	           "LD_LIBRARY_PATH=/usr/lib64/paraview:${LD_LIBRARY_PATH} ${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/MantidPlot_exe $* \n"
+	)
+	endif()
 
     install ( FILES  ${CMAKE_CURRENT_BINARY_DIR}/launch_mantidplot.sh
           DESTINATION ${BIN_DIR}

Code/Mantid/Build/Jenkins/buildscript

@@ -13,6 +13,7 @@
 # Print out the versions of things we are using
 ###############################################################################
 cmake --version
+echo "SHA1=${sha1}"
 
 ###############################################################################
 # OS X setup steps

Code/Mantid/Build/Jenkins/buildscript.bat

@@ -8,6 +8,7 @@
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 
 "C:\Program Files (x86)\CMake 2.8\bin\cmake.exe" --version 
+echo %sha1%
 
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 :: Check the required build configuration

Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-f20.spec → Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer.spec

@@ -1,16 +1,17 @@
 Name:           mantid-developer
-Version:        1.3
-Release:        8%{?dist}
+Version:        1.4
+Release:        1%{?dist}
 Summary:        Meta Package to install dependencies for Mantid Development
 
 Group:          Development/Tools
 License:        GPL
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires: rpmfusion-nonfree-release
+%{?fc20:Requires: rpmfusion-nonfree-release}
 Requires: cmake-gui >= 2.8.5
 Requires: boost-devel
+%{?el6:Requires: epel-release}
 Requires: gperftools-devel
 Requires: gperftools-libs
 Requires: gcc-c++
@@ -27,11 +28,16 @@ Requires: OCE-devel
 Requires: poco-devel
 Requires: PyQt4-devel
 Requires: python-devel
-Requires: python-ipython
+Requires: python-ipython >= 1.1
+Conflicts: python-ipython >= 2.0
 Requires: python-sphinx
 Requires: qscintilla-devel
 Requires: qt-devel >= 4.6
+%if 0%{?el6}
+Requires: qwt-devel
+%else
 Requires: qwt5-qt4-devel
+%endif
 Requires: qwtplot3d-qt4-devel
 Requires: redhat-lsb
 Requires: rpmdevtools
@@ -44,8 +50,14 @@ Requires: texlive-latex-bin
 Requires: texlive-was
 Requires: tex-preview
 Requires: dvipng
+%if 0%{?el6}
+Requires: mantidlibs-qt-devel
+Requires: mantidlibs-qtwebkit-devel
+Requires: scl-utils
+%else
 Requires: qt-devel
 Requires: qtwebkit-devel
+%endif
 
 BuildArch: noarch
 
@@ -68,6 +80,9 @@ required for Mantid development.
 %files
 
 %changelog
+* Wed Aug 13 2014 Peter Peterson <petersonpf@ornl.gov>
+- Merged all three distribution spec files into one
+
 * Fri Apr 25 2014 Michael Reuter <reuterma@ornl.gov>
 - Added texlive-latex-bin, texlive-was, tex-preview
 

Code/Mantid/CMakeLists.txt

@@ -184,13 +184,20 @@ if ( ENABLE_CPACK )
       message ( STATUS " CPACK_PACKAGE_FILE_NAME = ${CPACK_PACKAGE_FILE_NAME}" )
 
       # rhel requirements
-      set ( CPACK_RPM_PACKAGE_REQUIRES "boost >= 1.34.1,qt4 >= 4.2,nexus,nexus-python,qwt,gsl,glibc,qwtplot3d-qt4,muParser,numpy" )
-      # OpenCASCADE changed names when packaged for Fedora 20
-      if( "${UNIX_CODENAME}" MATCHES "Heisenbug" )
+      set ( CPACK_RPM_PACKAGE_REQUIRES "boost >= 1.34.1,qt4 >= 4.2,nexus,nexus-python,gsl,glibc,qwtplot3d-qt4,muParser,numpy" )
+      # OpenCASCADE changed names when packaged for Fedora 20 and RHEL7
+      if( "${UNIX_CODENAME}" MATCHES "Heisenbug" OR "${UNIX_CODENAME}" MATCHES "Maipo" )
         set( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},OCE-devel" )
       else()
         set( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},OpenCASCADE-libs-modelling >= 6.3.0,OpenCASCADE-libs-foundation >= 6.3.0,OpenCASCADE-libs-visualization >= 6.3.0,OpenCASCADE-libs-ocaf >= 6.3.0,OpenCASCADE-libs-ocaf-lite >= 6.3.0" )
       endif()
+      # Qwt is qwt5-qt4 in RHEL7
+      if( "${UNIX_CODENAME}" MATCHES "Maipo" )
+        set( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},qwt5-qt4" )
+      else()
+        set( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},qwt" )
+      endif()
+
       set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},poco-crypto,poco-data,poco-mysql,poco-sqlite,poco-odbc,poco-util,poco-xml,poco-zip,poco-net,poco-netssl,poco-foundation,PyQt4,sip" )
       set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},python-ipython >= 1.1.0" )
       # scipy & matplotlib