include subversion information used for each build in the --show-config output and as a banner in --interactive mode; intended to resolve confusion in cases where you don't know where a CVC4 binary came from

3 files changed, 38 insertions, 1 deletions

diff --git a/src/util/configuration.cpp b/src/util/configuration.cpp
index afd30bba9..db3c5520e 100644
--- a/src/util/configuration.cpp
+++ b/src/util/configuration.cpp
@@ -108,4 +108,20 @@ bool Configuration::isBuiltWithTlsSupport() {
   return USING_TLS;
 }
 
+bool Configuration::isSubversionBuild() {
+  return IS_SUBVERSION_BUILD;
+}
+
+const char* Configuration::getSubversionBranchName() {
+  return SUBVERSION_BRANCH_NAME;
+}
+
+unsigned Configuration::getSubversionRevision() {
+  return SUBVERSION_REVISION;
+}
+
+bool Configuration::hasSubversionModifications() {
+  return SUBVERSION_HAS_MODIFICATIONS;
+}
+
 }/* CVC4 namespace */
diff --git a/src/util/configuration.h b/src/util/configuration.h
index 3aae370d9..258431114 100644
--- a/src/util/configuration.h
+++ b/src/util/configuration.h
@@ -35,6 +35,12 @@ class CVC4_PUBLIC Configuration {
   /** Private default ctor: Disallow construction of this class */
   Configuration();
 
+  // these constants are filled in by the build system
+  static const bool IS_SUBVERSION_BUILD;
+  static const char* const SUBVERSION_BRANCH_NAME;
+  static const unsigned SUBVERSION_REVISION;
+  static const bool SUBVERSION_HAS_MODIFICATIONS;
+
 public:
 
   static std::string getName();
@@ -76,7 +82,13 @@ public:
   static bool isBuiltWithCudd();
 
   static bool isBuiltWithTlsSupport();
-};
+
+  static bool isSubversionBuild();
+  static const char* getSubversionBranchName();
+  static unsigned getSubversionRevision();
+  static bool hasSubversionModifications();
+
+};/* class Configuration */
 
 }/* CVC4 namespace */
 
diff --git a/src/util/options.cpp b/src/util/options.cpp
index dbe0f6804..f68b64ab6 100644
--- a/src/util/options.cpp
+++ b/src/util/options.cpp
@@ -578,6 +578,15 @@ throw(OptionException) {
       fputs(Configuration::about().c_str(), stdout);
       printf("\n");
       printf("version    : %s\n", Configuration::getVersionString().c_str());
+      if(Configuration::isSubversionBuild()) {
+        printf("subversion : yes [%s r%u%s]\n",
+               Configuration::getSubversionBranchName(),
+               Configuration::getSubversionRevision(),
+               Configuration::hasSubversionModifications() ?
+                 " (with modifications)" : "");
+      } else {
+        printf("subversion : %s\n", Configuration::isSubversionBuild() ? "yes" : "no");
+      }
       printf("\n");
       printf("library    : %u.%u.%u\n",
              Configuration::getVersionMajor(),