Re #7321. Unified mantid version and added extra git attr.

mantidproject · Aug 15, 2013 · a8667fa · a8667fa
1 parent 373cd34
commit a8667fa
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/Code/Mantid/Framework/Kernel/CMakeLists.txt b/Code/Mantid/Framework/Kernel/CMakeLists.txt
@@ -366,6 +366,7 @@ add_subdirectory ( test )
 # determine it from git and the file already exists. This makes sure the 
 # version number is correct when building off the source tarball
 
+include (PatchVersionNumber)
 if ( NOT NOT_GIT_REPO OR NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/MantidVersion.cpp )
   configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/src/MantidVersion.cpp.in
                    ${CMAKE_CURRENT_SOURCE_DIR}/src/MantidVersion.cpp

diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/MantidVersion.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/MantidVersion.h
@@ -37,6 +37,7 @@ class MANTID_KERNEL_DLL MantidVersion
 public:
   static const char* version();     ///< The full version number
   static const char* revision();    ///< The abbreviated SHA-1 of the last commit
+  static const char* revisionFull();    ///< The full SHA-1 of the last commit
   static const char* releaseDate(); ///< The date of the last commit
 
 private:

diff --git a/Code/Mantid/Framework/Kernel/src/ConfigService.cpp b/Code/Mantid/Framework/Kernel/src/ConfigService.cpp
@@ -54,7 +54,7 @@ namespace Mantid
  */
 std::string welcomeMessage()
 {
-    return "Welcome to Mantid " + std::string(Mantid::Kernel::MantidVersion::version()) + " - Manipulation and Analysis Toolkit for Instrument Data";
+    return "Welcome to Mantid version " + std::string(Mantid::Kernel::MantidVersion::version()) + " - Manipulation and Analysis Toolkit for Instrument Data";
 }
 
 namespace Kernel
@@ -264,8 +264,8 @@ ConfigServiceImpl::ConfigServiceImpl() :
   g_log.debug() << "ConfigService created." << std::endl;
   g_log.debug() << "Configured Mantid.properties directory of application as " << getPropertiesDir()
       << std::endl;
-  g_log.information() << "This is Mantid Version "
-                      << MantidVersion::version() << "-" << MantidVersion::revision() << std::endl;
+  g_log.information() << "This is Mantid version "
+                      << MantidVersion::version() << " revision " << MantidVersion::revision() << std::endl;
   g_log.information() << "Properties file(s) loaded: " << propertiesFilesList << std::endl;
 #ifndef MPI_BUILD  // There is no logging to file by default in MPI build
   g_log.information() << "Logging to: " << m_logFilePath << std::endl;

diff --git a/Code/Mantid/Framework/Kernel/src/MantidVersion.cpp.in b/Code/Mantid/Framework/Kernel/src/MantidVersion.cpp.in
@@ -12,14 +12,19 @@ const char* MantidVersion::version()
 {
   // The major and minor version numbers are specified in Build/CMake/VersionNumber.cmake
   // The patch number is the number of commits since the most recent tag of the repository
-  return "@VERSION_MAJOR@.@VERSION_MINOR@.@MtdVersion_WC_LAST_CHANGED_REV@";
+  return "@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@";
 }
 
 const char* MantidVersion::revision()
 {
   return "@MtdVersion_WC_LAST_CHANGED_SHA@";
 }
 
+const char* MantidVersion::revisionFull()
+{
+  return "@MtdVersion_WC_LAST_CHANGED_SHA_LONG@";
+}
+
 const char* MantidVersion::releaseDate()
 {
   return "@MtdVersion_WC_LAST_CHANGED_DATE@";