add git commit number to the debug output to help us debugging

FlexibleSUSY · Oct 25, 2014 · 6ec44e7 · 6ec44e7
1 parent b6092e9
commit 6ec44e7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/config/config.h.in b/config/config.h.in
@@ -8,6 +8,7 @@
 #define FLEXIBLESUSY_MINOR    @FLEXIBLESUSY_MINOR@
 #define FLEXIBLESUSY_PATCH    @FLEXIBLESUSY_PATCH@
 #define FLEXIBLESUSY_EXTRA    "@FLEXIBLESUSY_EXTRA@"
+#define GIT_COMMIT            "@GIT_COMMIT@"
 
 #define SARAH_VERSION         "@SARAH_VERSION@"
 #define SARAH_MAJOR           @SARAH_MAJOR@

diff --git a/configure b/configure
@@ -9,6 +9,7 @@ FLEXIBLESUSY_MINOR=0
 FLEXIBLESUSY_PATCH=2
 FLEXIBLESUSY_EXTRA=""
 FLEXIBLESUSY_VERSION="${FLEXIBLESUSY_MAJOR}.${FLEXIBLESUSY_MINOR}.${FLEXIBLESUSY_PATCH}${FLEXIBLESUSY_EXTRA}"
+GIT_COMMIT="`git describe --tags || echo unknown`"
 
 # directory of this script
 BASEDIR=$(dirname $0)
@@ -270,9 +271,10 @@ logmsg() {
 
 #_____________________________________________________________________
 log_package_information() {
-    logmsg "Package: ${PROGRAM_NAME}"
-    logmsg "Version: ${FLEXIBLESUSY_VERSION}"
-    logmsg "Date:    ${DATE}"
+    logmsg "Package:    ${PROGRAM_NAME}"
+    logmsg "Version:    ${FLEXIBLESUSY_VERSION}"
+    logmsg "Date:       ${DATE}"
+    logmsg "Git commit: ${GIT_COMMIT}"
 }
 
 #_____________________________________________________________________
@@ -1938,6 +1940,7 @@ replace_markers() {
 	-e "s|@FLEXIBLESUSY_MINOR@|$FLEXIBLESUSY_MINOR|" \
 	-e "s|@FLEXIBLESUSY_PATCH@|$FLEXIBLESUSY_PATCH|" \
 	-e "s|@FLEXIBLESUSY_EXTRA@|$FLEXIBLESUSY_EXTRA|" \
+        -e "s|@GIT_COMMIT@|$GIT_COMMIT|"   \
 	-e "s|@PKGNAME@|$PROGRAM_NAME|"    \
 	-e "s|@ABSBASEDIR@|$ABSBASEDIR|"   \
 	-e "s|@INSTALL_DIR@|$INSTALL_DIR|" \
@@ -2216,6 +2219,7 @@ sed -e "s|@FLEXIBLESUSY_VERSION@|$FLEXIBLESUSY_VERSION|" \
     -e "s|@FLEXIBLESUSY_MINOR@|$FLEXIBLESUSY_MINOR|" \
     -e "s|@FLEXIBLESUSY_PATCH@|$FLEXIBLESUSY_PATCH|" \
     -e "s|@FLEXIBLESUSY_EXTRA@|$FLEXIBLESUSY_EXTRA|" \
+    -e "s|@GIT_COMMIT@|$GIT_COMMIT|"   \
     -e "s|@PKGNAME@|$PROGRAM_NAME|"    \
     -e "s|@CPPFLAGS@|$CPPFLAGS|"       \
     -e "s|@CXXFLAGS@|$CXXFLAGS|"       \
@@ -2234,6 +2238,7 @@ sed -e "s|@FLEXIBLESUSY_VERSION@|$FLEXIBLESUSY_VERSION|" \
     -e "s|@FLEXIBLESUSY_MINOR@|$FLEXIBLESUSY_MINOR|" \
     -e "s|@FLEXIBLESUSY_PATCH@|$FLEXIBLESUSY_PATCH|" \
     -e "s|@FLEXIBLESUSY_EXTRA@|$FLEXIBLESUSY_EXTRA|" \
+    -e "s|@GIT_COMMIT@|$GIT_COMMIT|"                 \
     -e "s|@PKGNAME@|$PROGRAM_NAME|"                  \
     -e "s|@BLASLIBS@|$BLASLIBS|"                     \
     -e "s|@BOOSTTESTLIBS@|$BOOSTTESTLIBS|"           \
@@ -2273,6 +2278,7 @@ sed -e "s|@FLEXIBLESUSY_VERSION@|$FLEXIBLESUSY_VERSION|" \
     -e "s|@FLEXIBLESUSY_MINOR@|$FLEXIBLESUSY_MINOR|" \
     -e "s|@FLEXIBLESUSY_PATCH@|$FLEXIBLESUSY_PATCH|" \
     -e "s|@FLEXIBLESUSY_EXTRA@|$FLEXIBLESUSY_EXTRA|" \
+    -e "s|@GIT_COMMIT@|$GIT_COMMIT|"   \
     -e "s|@PKGNAME@|$PROGRAM_NAME|"    \
     < $TEXVERSION_TMPL > $TEXVERSION
 
@@ -2281,6 +2287,7 @@ sed -e "s|@FLEXIBLESUSY_VERSION@|$FLEXIBLESUSY_VERSION|" \
     -e "s|@FLEXIBLESUSY_MINOR@|$FLEXIBLESUSY_MINOR|" \
     -e "s|@FLEXIBLESUSY_PATCH@|$FLEXIBLESUSY_PATCH|" \
     -e "s|@FLEXIBLESUSY_EXTRA@|$FLEXIBLESUSY_EXTRA|" \
+    -e "s|@GIT_COMMIT@|$GIT_COMMIT|"   \
     -e "s|@PKGNAME@|$PROGRAM_NAME|"    \
     < $DOC_MAINPAGE_TMPL > $DOC_MAINPAGE
 

diff --git a/src/build_info.cpp b/src/build_info.cpp
@@ -59,6 +59,7 @@ void print_version_info(std::ostream& ostr)
 
    ostr <<
       "FlexibleSUSY version:            " FLEXIBLESUSY_VERSION "\n"
+      "FlexibleSUSY git commit:         " GIT_COMMIT "\n"
       "SARAH version:                   " SARAH_VERSION "\n"
       "Mathematica version:             " << MATHEMATICA_VERSION << "\n"
       "Boost version:                   " << boost_major << '.' << boost_minor