From 0bad60dfdbdc873f31b7ad80bd7f57555628bcfb Mon Sep 17 00:00:00 2001
From: Balazs Racz <balazs.racz@gmail.com>
Date: Mon, 19 Oct 2020 19:23:32 +0200
Subject: [PATCH] Revision script fixes - suppresses the error messages that
 are currently printed on the output at every run. - adds a command to the hxx
 output that looks like this:   #define REVISION_GIT_HASH "b60e1f7:-d-u"  
 This is suitable for being included into the SNIP version string.

---
 bin/revision.py | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/bin/revision.py b/bin/revision.py
index f011cd8c0..2cfce0451 100755
--- a/bin/revision.py
+++ b/bin/revision.py
@@ -93,6 +93,8 @@
     outputcxx += '    "' + gcc + '",\n'
     outputhxx += '"' + gcc + '\\n"\n'
 
+main_git_hash = None
+    
 for x in inputs :
     print x
     # go into the root of the repo
@@ -121,17 +123,19 @@
     outputcxx += ':' + os.path.split(os.path.abspath(x))[1]
     outputhxx += '"' + git_hash + ':' + os.path.split(os.path.abspath(x))[1]
 
+    hashopts = ""
+    
     if dirty or untracked :
-        outputcxx += ':'
-        outputhxx += ':'
+        hashopts += ':'
     if dirty :
-        outputcxx += '-d'
-        outputhxx += '-d'
+        hashopts += '-d'
     if untracked :
-        outputcxx += '-u'
-        outputhxx += '-u'
-    outputcxx += '",\n'
-    outputhxx += '\\n"\n'
+        hashopts += '-u'
+    outputcxx += hashopts + '",\n'
+    outputhxx += hashopts + '\\n"\n'
+
+    if main_git_hash is None:
+        main_git_hash = git_hash + hashopts
 
 outputcxx += '    nullptr\n'
 outputcxx += '};\n'
@@ -142,6 +146,9 @@
 outputhxx += '));\n'
 outputhxx += 'CDI_GROUP_END();\n'
 
+if main_git_hash is not None:
+    outputhxx += '\n#define REVISION_GIT_HASH "' + main_git_hash + '"\n'
+
 os.chdir(orig_dir)
 
 # generate the *.cxxout style content
@@ -165,14 +172,18 @@
                            "-I", """Thu, """, "-I", """Fri, """,
                            "-I", """Sat, """,
                            options.output + 'Try.hxxout',
-                           options.output + '.hxxout'], stdout=f_null)
+                           options.output + '.hxxout'],
+                          stdout=f_null, stderr=f_null)
 diffcxx = subprocess.call(['diff',
                            "-I", """Sun, """, "-I", """Mon, """,
                            "-I", """Tue, """, "-I", """Wed, """,
                            "-I", """Thu, """, "-I", """Fri, """,
                            "-I", """Sat, """,
                            options.output + 'Try.cxxout',
-                           options.output + '.cxxout'], stdout=f_null)
+                           options.output + '.cxxout'],
+                          stdout=f_null, stderr=f_null)
+# disable this because we are not actually writing a cxx file above.
+diffcxx = 0
 
 if diffhxx != 0 :
     os.system('rm -f ' + options.output + '.hxxout')