From 97028b134fb2de941aaf2226fce312b599196f0f Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Sat, 19 Sep 2015 01:02:42 +0200 Subject: [PATCH] Adapt to new gitversion library --- biicode.conf | 2 +- src/main.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/biicode.conf b/biicode.conf index 55dc1a87..546e8c9f 100644 --- a/biicode.conf +++ b/biicode.conf @@ -7,7 +7,7 @@ messmer/cmake: 3 messmer/cpp-utils: 2 messmer/fspp: 0 - messmer/gitversion: 2 + messmer/gitversion: 3 [parent] messmer/cryfs: 0 diff --git a/src/main.cpp b/src/main.cpp index 503e3837..af1b8d22 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -10,7 +10,7 @@ #include "filesystem/CryDevice.h" #include "config/CryConfigLoader.h" -#include +#include namespace bf = boost::filesystem; @@ -22,11 +22,11 @@ using std::cout; using std::endl; int main(int argc, char *argv[]) { - cout << "CryFS Version " << gitversion::VERSION.toString() << endl; - if (gitversion::VERSION.isDev()) { - cout << "WARNING! This is a development version based on git commit " << gitversion::VERSION.gitCommitId() << + cout << "CryFS Version " << version::VERSION_STRING << endl; + if (version::IS_DEV_VERSION) { + cout << "WARNING! This is a development version based on git commit " << version::GIT_COMMIT_ID << ". Please do not use in production!" << endl; - } else if (!gitversion::VERSION.isStable()) { + } else if (!version::IS_STABLE_VERSION) { cout << "WARNING! This is an experimental version. Please backup your data frequently!" << endl; } cout << endl;