diff --git a/blacklist.cpp b/blacklist.cpp index 26e40bd..ec3f8c6 100644 --- a/blacklist.cpp +++ b/blacklist.cpp @@ -36,7 +36,7 @@ #include #include #include // get the current user-id -#include // ip-address check +//#include // ip-address check #include // ip-address check #include //#include // sorting the vector @@ -269,9 +269,9 @@ inline bool fileExists(const string &name) { */ void printHelp(bool printAll) { - cout << "blacklist " << AutoVersion::FULLVERSION_STRING << ", "; - cout << AutoVersion::STATUS << endl; - cout << "Copyright (c) 2015-2019 by Dominic Reich\n" << endl; + cout << "blacklist " << Version::VERSION_STRING << ", "; + cout << Version::STATUS << endl; + cout << Version::COPYRIGHT << endl; cout << "Usage: blacklist [options] " << endl; if(printAll == true) { diff --git a/version.h b/version.h index 5563ff1..f4d26b5 100644 --- a/version.h +++ b/version.h @@ -1,32 +1,16 @@ #ifndef VERSION_H #define VERSION_H -namespace AutoVersion{ - - //Date Version Types - static const char DATE[] = "03"; - static const char MONTH[] = "11"; - static const char YEAR[] = "2019"; - static const char UBUNTU_VERSION_STYLE[] = "19.11"; +namespace Version{ //Software Status - static const char STATUS[] = "Release Candidate [vserver]"; - static const char STATUS_SHORT[] = "rc"; - - //Standard Version Type - static const long MAJOR = 0; - static const long MINOR = 4; - static const long BUILD = 66; - static const long REVISION = 276; + static const char STATUS[] = "Release Candidate [chronos-vs]"; //Miscellaneous Version Types - static const long BUILDS_COUNT = 66; - #define RC_FILEVERSION 0,4,66,276 - #define RC_FILEVERSION_STRING "0, 4, 66, 276\0" - static const char FULLVERSION_STRING [] = "0.4.66.276"; - - //These values are to keep track of your versioning state, don't modify them. - static const long BUILD_HISTORY = 66; + static const char VERSION_STRING [] = "0.5"; + + //Copyright line usable in the program + static const char COPYRIGHT [] = "Copyright ©2015-2022 Dominic Reich\n"; } #endif //VERSION_H