Add version stuff for mac, and shorten version display in-game to a 7…

… char hash. (cherry picked from commit 9b9d178)
Warzone2100 · Nov 8, 2010 · 2eb5491 · 2eb5491
1 parent fa3abb7
commit 2eb5491
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 4 deletions.
diff --git a/build_tools/autorevision/autorevision.cpp b/build_tools/autorevision/autorevision.cpp
@@ -62,6 +62,11 @@ class assign_once : public T
             _assigned(false)
         {}
 
+        const assign_once<T>& operator=(const assign_once<T>& data)
+        {
+            return *this = static_cast<const T&>(data);
+        }
+
         const assign_once<T>& operator=(const T& data)
         {
             if (!_assigned)
@@ -94,6 +99,9 @@ struct RevisionInformation
 
     assign_once<std::string> low_revision;
     assign_once<std::string> revision;
+    assign_once<std::string> low_revisionCount;
+    assign_once<std::string> revisionCount;
+    assign_once<std::string> tag;
 
     assign_once<std::string> date;
 
@@ -321,6 +329,9 @@ int main(int argc, char** argv)
     if (rev_info.date == "")
         rev_info.date = "0000-00-00 00:00:00";
 
+    rev_info.low_revisionCount = rev_info.low_revision;
+    rev_info.revisionCount = rev_info.revision;
+
     WriteOutput(outputFile, rev_info);
 
     return 0;
@@ -651,10 +662,27 @@ bool RevGitQuery::extractRevision(RevisionInformation& rev_info)
             rev_info.wc_modified = system("git diff --quiet HEAD");
         }
     }
+    std::string tag = runCommand("git describe --exact-match --tags");
+    if (!tag.empty())
+    {
+        rev_info.tag = tag;
+    }
     std::string branch = runCommand("git symbolic-ref HEAD");
     if (!branch.empty())
     {
         rev_info.wc_uri = branch;
+        rev_info.tag = branch;
+    }
+    std::string revCount = runCommand("git rev-list --count HEAD");
+    if (!revCount.empty())
+    {
+        rev_info.low_revisionCount = revCount;
+        rev_info.revisionCount = revCount;
+    }
+    std::string date = runCommand("git log -1 --pretty=format:%ci");
+    if (!date.empty())
+    {
+        rev_info.date = date;
     }
 
     // The working copy URI still needs to be extracted. "svnversion" cannot
@@ -804,12 +832,16 @@ bool WriteOutput(const string& outputFile, const RevisionInformation& rev_info)
     if(do_wx)
         header << "#include <wx/string.h>\n";
 
-    header << "\n#define SVN_LOW_REV      " << integerOnly(rev_info.low_revision.empty() ? rev_info.revision : rev_info.low_revision)
+    header << "\n#define SVN_LOW_REV      " << (rev_info.low_revisionCount.empty() ? rev_info.revisionCount : rev_info.low_revisionCount)
            << "\n#define SVN_LOW_REV_STR \"" << (rev_info.low_revision.empty() ? rev_info.revision : rev_info.low_revision) << "\""
-           << "\n#define SVN_REV          " << integerOnly(rev_info.revision)
+           << "\n#define SVN_REV          " << rev_info.revisionCount
            << "\n#define SVN_REV_STR     \"" << rev_info.revision << "\""
            << "\n#define SVN_DATE        \"" << rev_info.date << "\""
-           << "\n#define SVN_URI         \"" << rev_info.wc_uri << "\"\n";
+           << "\n#define SVN_URI         \"" << rev_info.wc_uri << "\""
+           << "\n#define SVN_TAG         \"" << rev_info.tag << "\"\n"
+           << "\n#define SVN_SHORT_HASH  \"" << rev_info.revision.substr(0, 7) << "\""
+           << "\n#define SVN_SHORT_HASH_WITHOUT_QUOTES " << rev_info.revision.substr(0, 7)
+           << "\n";
 
     header << "\n#define SVN_WC_MODIFIED " << rev_info.wc_modified
            << "\n#define SVN_WC_SWITCHED " << rev_info.wc_switched << "\n\n";

diff --git a/src/version.c b/src/version.c
@@ -31,7 +31,7 @@
 #if (SVN_LOW_REV < SVN_REV)
 # define SVN_FULL_REV_STR "r" SVN_LOW_REV_STR ":" SVN_REV_STR
 #else
-# define SVN_FULL_REV_STR "r" SVN_REV_STR
+# define SVN_FULL_REV_STR "r" SVN_SHORT_HASH
 #endif
 
 unsigned int version_getLowRevision()
@@ -62,6 +62,10 @@ const char* version_getVersionString()
 		{
 			version_string = (SVN_URI " branch " SVN_FULL_REV_STR) + strlen("branches/");
 		}
+		else if (strncmp(svn_uri_cstr, "refs/heads/", strlen("refs/heads/")) == 0)
+		{
+			version_string = (SVN_URI " branch " SVN_FULL_REV_STR) + strlen("refs/heads/");
+		}
 		else if (SVN_REV != 0)
 		{
 			version_string = SVN_URI " " SVN_FULL_REV_STR;