moved version to libnfcbusiness

cli/Interface/MainClass.cpp

@@ -19,17 +19,6 @@ MainClass::MainClass(int argc, char *argv[])
 {
 }
 
-#define Q(x) #x
-#define QUOTE(x) Q(x)
-
-#ifndef GIT_SHA1
-#define GIT_SHA1 "unknown"
-#endif
-
-#ifndef GIT_REF_NAME
-#define GIT_REF_NAME "unknown"
-#endif
-
 int MainClass::main()
 {
     CommandLineParser parser(_argc, _argv);
@@ -233,8 +222,8 @@ void MainClass::printPercentDump(int done, int total)
 
 void MainClass::printVersion() const
 {
-    std::cout << "LibNfc version: " << LibNfcBusiness::getVersion() << std::endl;
-    std::cout << "Mifare-tools version: " << QUOTE(GIT_REF_NAME) << "-" << QUOTE(GIT_SHA1) << std::endl;
+    std::cout << "LibNfc version: " << LibNfcBusiness::getLibNfcVersion() << std::endl;
+    std::cout << "Mifare-tools version: " << LibNfcBusiness::getMifareToolsVersion() << std::endl;
 }
 
 std::shared_ptr<NfcDeviceBusiness> MainClass::getDevice(const std::string &deviceName, std::vector<std::shared_ptr<NfcDeviceBusiness>> devices)

src/Business/LibNfcBusiness.cpp

@@ -5,6 +5,17 @@
 #include <algorithm>
 #include "LibNfcBusiness.h"
 
+#define Q(x) #x
+#define QUOTE(x) Q(x)
+
+#ifndef GIT_SHA1
+#define GIT_SHA1 "unknown"
+#endif
+
+#ifndef GIT_REF_NAME
+#define GIT_REF_NAME "unknown"
+#endif
+
 LibNfcBusiness::LibNfcBusiness()
 {
     _libNfc = std::make_shared<LibNfc>();
@@ -23,7 +34,7 @@ ResultBool LibNfcBusiness::init()
     return _libNfc->init();
 }
 
-std::string LibNfcBusiness::getVersion()
+std::string LibNfcBusiness::getLibNfcVersion()
 {
     return LibNfc::getVersion();
 }
@@ -61,3 +72,8 @@ std::shared_ptr<LibNfc> LibNfcBusiness::getLibNfc() const
 {
     return _libNfc;
 }
+
+std::string LibNfcBusiness::getMifareToolsVersion()
+{
+    return QUOTE(GIT_REF_NAME)  "-"  QUOTE(GIT_SHA1);
+}

src/Business/LibNfcBusiness.h

@@ -26,7 +26,9 @@ public:
 
     std::shared_ptr<LibNfc> getLibNfc() const;
 
-    static std::string getVersion();
+    static std::string getLibNfcVersion();
+
+    static std::string getMifareToolsVersion();
 
 protected:
     std::shared_ptr<LibNfc> _libNfc;