summaryrefslogtreecommitdiff
path: root/src/util/configuration.cpp
diff options
context:
space:
mode:
authorMorgan Deters <mdeters@cs.nyu.edu>2013-01-25 17:11:44 -0500
committerMorgan Deters <mdeters@cs.nyu.edu>2013-02-16 15:14:55 -0500
commit72832c1a749e4bde8d16930b0f59e5db9810cafc (patch)
treeee86841b13d5fa8e020e938fdcc79059a9177d47 /src/util/configuration.cpp
parentd389114bc99897fc7ea3c744194225ebab368851 (diff)
Fix version identification for new git repository.
Diffstat (limited to 'src/util/configuration.cpp')
-rw-r--r--src/util/configuration.cpp29
1 files changed, 28 insertions, 1 deletions
diff --git a/src/util/configuration.cpp b/src/util/configuration.cpp
index 59fe28eca..c6e951049 100644
--- a/src/util/configuration.cpp
+++ b/src/util/configuration.cpp
@@ -195,6 +195,33 @@ bool Configuration::isTraceTag(char const * tag){
return false;
}
+bool Configuration::isGitBuild() {
+ return IS_GIT_BUILD;
+}
+
+const char* Configuration::getGitBranchName() {
+ return GIT_BRANCH_NAME;
+}
+
+const char* Configuration::getGitCommit() {
+ return GIT_COMMIT;
+}
+
+bool Configuration::hasGitModifications() {
+ return GIT_HAS_MODIFICATIONS;
+}
+
+std::string Configuration::getGitId() {
+ if(! isGitBuild()) {
+ return "";
+ }
+
+ stringstream ss;
+ ss << "git " << getGitBranchName() << " " << string(getGitCommit()).substr(0, 8)
+ << ( ::CVC4::Configuration::hasGitModifications() ? " (with modifications)" : "" );
+ return ss.str();
+}
+
bool Configuration::isSubversionBuild() {
return IS_SUBVERSION_BUILD;
}
@@ -211,7 +238,7 @@ bool Configuration::hasSubversionModifications() {
return SUBVERSION_HAS_MODIFICATIONS;
}
-string Configuration::getSubversionId() {
+std::string Configuration::getSubversionId() {
if(! isSubversionBuild()) {
return "";
}
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback