Merge remote-tracking branch 'origin/master' into feature/7639_Add_su…

…pport_for_ICAT4_interface

Conflicts:
	Code/Mantid/Framework/ICat/src/ICat3/ICat3Helper.cpp
Refs #7639.

Code/Mantid/Build/CMake/CommonSetup.cmake

@@ -81,6 +81,7 @@ endif()
 
 set ( MtdVersion_WC_LAST_CHANGED_REV 0 )
 set ( MtdVersion_WC_LAST_CHANGED_DATE Unknown )
+set ( MtdVersion_WC_LAST_CHANGED_DATETIME 0 )
 set ( NOT_GIT_REPO "Not" )
 
 find_package ( Git )
@@ -106,6 +107,49 @@ if ( GIT_FOUND )
     )
     string ( SUBSTRING ${MtdVersion_WC_LAST_CHANGED_DATE} 0 16 MtdVersion_WC_LAST_CHANGED_DATE )
 
+    execute_process ( COMMAND ${GIT_EXECUTABLE} log -1 --format=format:%H
+                      OUTPUT_VARIABLE MtdVersion_WC_LAST_CHANGED_SHA_LONG
+                      WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+
+    # getting the datetime (as iso8601 string) to turn into the patch string
+    execute_process ( COMMAND ${GIT_EXECUTABLE} log -1 --format=format:%ci
+                      OUTPUT_VARIABLE MtdVersion_WC_LAST_CHANGED_DATETIME
+                      WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+    )
+    if ( MtdVersion_WC_LAST_CHANGED_DATETIME )
+      # split into "date time timezone"
+      string (REPLACE " " ";" LISTVERS ${MtdVersion_WC_LAST_CHANGED_DATETIME})
+      list (GET LISTVERS 0 ISODATE)
+      list (GET LISTVERS 1 ISOTIME)
+      list (GET LISTVERS 2 ISOTIMEZONE)
+
+      # turn the date into a number
+      string (REPLACE "-" "" ISODATE ${ISODATE})
+
+      # prepare the time
+      string (REGEX REPLACE "^([0-9]+:[0-9]+).*" "\\1" ISOTIME ${ISOTIME})
+      string (REPLACE ":" "" ISOTIME ${ISOTIME})
+
+      # convert the timezone into something that can be evaluated for math
+      string (REPLACE "-" "+" ISOTIMEZONE ${ISOTIMEZONE})
+      string (REGEX REPLACE "^([0-9]+)" "-\\1" ISOTIMEZONE ${ISOTIMEZONE})
+
+      # revert the timezone from the time
+      math (EXPR ISOTIME "${ISOTIME}${ISOTIMEZONE}" )
+
+      # deal with times crossing midnight
+      # this does not get the number of days in a month right or jan 1st/dec 31st
+      if ( ISOTIME GREATER 2400 )
+          math (EXPR ISOTIME "${ISOTIME}-2400" )
+	  math (EXPR ISODATE "${ISODATE}+1")
+      elseif (ISOTIME LESS 0)
+          math (EXPR ISOTIME "2400${ISOTIME}" )
+	  math (EXPR ISODATE "${ISODATE}-1")
+      endif ()
+
+      set (MtdVersion_WC_LAST_CHANGED_DATETIME "${ISODATE}.${ISOTIME}")
+    endif ()
+
     ###########################################################################
     # This part puts our hooks (in .githooks) into .git/hooks
     ###########################################################################
@@ -137,7 +181,8 @@ else()
   message ( STATUS "Git not found - using dummy revision number and date" )
 endif()
 
-mark_as_advanced( MtdVersion_WC_LAST_CHANGED_REV MtdVersion_WC_LAST_CHANGED_DATE )
+mark_as_advanced( MtdVersion_WC_LAST_CHANGED_REV MtdVersion_WC_LAST_CHANGED_DATE
+                  MtdVersion_WC_LAST_CHANGED_DATETIME )
 
 ###########################################################################
 # Include the file that contains the version number
@@ -226,8 +271,8 @@ if ( CPPCHECK_EXECUTABLE )
   set ( CPPCHECK_EXCLUDES
         Framework/DataHandling/src/LoadDAE/
         Framework/DataHandling/src/LoadRaw/
-        Framework/ICat/inc/MantidICat/GSoapGenerated/
-        Framework/ICat/src/GSoapGenerated/
+        Framework/ICat/inc/MantidICat/ICat3/GSoapGenerated/
+        Framework/ICat/src/ICat3/GSoapGenerated/
         Framework/ICat/src/GSoapGenerated.cpp
         Framework/ICat/src/GSoap/
         Framework/ICat/src/GSoap.cpp

Code/Mantid/Build/CMake/PatchVersionNumber.cmake.in

@@ -1,4 +1,4 @@
 # This contains the 'patch' part of the version number, obtained from 'git describe' in CommonSetup.cmake
 
-set ( VERSION_PATCH "@MtdVersion_WC_LAST_CHANGED_REV@" )
+set ( VERSION_PATCH "@MtdVersion_WC_LAST_CHANGED_DATETIME@" )
 

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

@@ -0,0 +1,98 @@
+Name:           mantid-developer
+Version:        1.2
+Release:        2%{?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: cmake-gui >= 2.8.5
+Requires: boost-devel
+Requires: gperftools-devel
+Requires: gperftools-libs
+Requires: gcc-c++
+Requires: git-all
+Requires: gsl-devel
+Requires: hdf-devel
+Requires: hdf5-devel
+Requires: muParser-devel
+Requires: mxml-devel
+Requires: nexus >= 4.2
+Requires: nexus-devel >= 4.2
+Requires: numpy
+Requires: OpenCASCADE-devel
+Requires: poco-devel
+Requires: PyQt4-devel
+Requires: python-devel
+Requires: qscintilla-devel
+Requires: qt-devel >= 4.6
+Requires: qwt5-qt4-devel
+Requires: qwtplot3d-qt4-devel
+Requires: redhat-lsb
+Requires: rpmdevtools
+Requires: sip-devel
+Requires: git
+Requires: openssl-devel
+Requires: texlive-latex
+Requires: dvipng
+Requires: qt-devel
+Requires: qt-assistant
+
+BuildArch: noarch
+
+%description
+A virtual package which requires all the dependencies and tools that are 
+required for Mantid development.
+
+%prep
+
+%build
+
+%install
+
+%clean
+
+%post
+# Remove myself once I have installed all the required packages.
+#rpm -e %{name}
+
+%files
+
+%changelog
+* Tue Aug 20 2013 Peter Peterson <petersonpf@ornl.gov>
+- Removed things not necessary for fedora 19.
+
+* Tue May 07 2013 Stuart Campbell <campbellsi@ornl.gov>
+- Added dvipng and latex for qt-assistant stuff
+- Added software collection dependencies
+
+* Thu Jun  7 2012 Russell Taylor <taylorrj@ornl.gov>
+- Remove gmock & gtest now that we include them in our repo
+- Remove subversion dependency now that we use git
+
+* Mon Mar 19 2012 Stuart Campbell <campbellsi@ornl.gov>
+- Updated for google-perftools -> gperftools package rename.
+
+* Wed Feb 22 2012 Stuart Campbell <campbellsi@ornl.gov>
+- Added nexus as it is not required by it's devel package.
+
+* Wed Feb 22 2012 Stuart Campbell <campbellsi@ornl.gov>
+- Added git as a dependency
+- Added openssl-devel dependency
+
+* Mon Feb 20 2012 Stuart Campbell <campbellsi@ornl.gov>
+- Added dependency on NeXus development after nexus rpm split.
+- Updated CMake dependency to 2.8.5 following 'the virus'!
+- Added Google Mock and GTest.
+
+* Fri Jun  3 2011 Stuart Campbell <campbellsi@ornl.gov>
+- Added rpmdevtools and lsb dependencies
+
+* Fri Jun  3 2011 Stuart Campbell <campbellsi@ornl.gov>
+- Added versions for some packages
+
+* Fri Jun  3 2011 Stuart Campbell <campbellsi@ornl.gov>
+- Initial release

Code/Mantid/Framework/API/CMakeLists.txt

@@ -266,6 +266,7 @@ set ( INC_FILES
 
 set ( TEST_FILES
 	#	IkedaCarpenterModeratorTest.h
+	AlgorithmFactoryTest.h
 	AlgorithmHasPropertyTest.h
 	AlgorithmHistoryTest.h
 	AlgorithmManagerTest.h
@@ -287,8 +288,9 @@ set ( TEST_FILES
 	FilePropertyTest.h
 	FrameworkManagerTest.h
 	FuncMinimizerFactoryTest.h
-	FunctionDomainTest.h
-	FunctionFactoryTest.h
+  FunctionAttributeTest.h
+  FunctionDomainTest.h
+  FunctionFactoryTest.h
 	FunctionPropertyTest.h
 	FunctionTest.h
 	FunctionValuesTest.h