Adapt to new gitversion library

This commit is contained in:
Sebastian Messmer 2015-09-19 01:02:42 +02:00
parent fe5ea5ab95
commit 97028b134f
2 changed files with 6 additions and 6 deletions

View File

@ -7,7 +7,7 @@
messmer/cmake: 3
messmer/cpp-utils: 2
messmer/fspp: 0
messmer/gitversion: 2
messmer/gitversion: 3
[parent]
messmer/cryfs: 0

View File

@ -10,7 +10,7 @@
#include "filesystem/CryDevice.h"
#include "config/CryConfigLoader.h"
#include <messmer/gitversion/gitversion.h>
#include <gitversion/version.h>
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;