diff --git a/docker/startELC12.sh b/docker/startELC12.sh
new file mode 100644
index 0000000..a5cab3f
--- /dev/null
+++ b/docker/startELC12.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+chmod 777 output/licenceGenerator
+
+#./output/licenceGenerator -cid=9f54495344434954615ad803c50171bf -csd=400e00325b5900003be77f800a400043 -outputType=file -configFileName=licData.xml
+
+cd output
+./licenceGenerator -cid=9f54495344434954615ad803c50171bf -csd=400e00325b5900003be77f800a400043 -outputType=file -configFileName=licData.xml
\ No newline at end of file
diff --git a/docker/startuid.sh b/docker/startuid.sh
new file mode 100644
index 0000000..84aeb08
--- /dev/null
+++ b/docker/startuid.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+chmod 777 output/licenceGenerator
+
+#./output/licenceGenerator -uid=a3395d1b898b4fdbbd563f9c75b3e885 -outputType=file -configFileName=licData.xml
+
+cd output
+./licenceGenerator -uid=a3395d1b898b4fdbbd563f9c75b3e885 -outputType=file -configFileName=licData.xml
\ No newline at end of file
diff --git a/licData.xml b/licData.xml
new file mode 100644
index 0000000..128ea8e
--- /dev/null
+++ b/licData.xml
@@ -0,0 +1,8 @@
+
+
+EOV_OSV
+wago
+Licence pro EOV_OSV
+zst.ceskatrebova.ddts.cz
+ROV21
+
\ No newline at end of file
diff --git a/output/ezlic_drt0_xxbxdjhxyhc.lic b/output/ezlic_drt0_xxbxdjhxyhc.lic
index fb8b19f..b0464cf 100644
Binary files a/output/ezlic_drt0_xxbxdjhxyhc.lic and b/output/ezlic_drt0_xxbxdjhxyhc.lic differ
diff --git a/output/ezlic_eovosv0_wqxcyjpdxji.lic b/output/ezlic_eovosv0_wqxcyjpdxji.lic
new file mode 100644
index 0000000..3574cb3
Binary files /dev/null and b/output/ezlic_eovosv0_wqxcyjpdxji.lic differ
diff --git a/output/licData.xml b/output/licData.xml
index ff346fa..128ea8e 100644
--- a/output/licData.xml
+++ b/output/licData.xml
@@ -1,39 +1,8 @@
-
-
-DRT
+
+
+EOV_OSV
wago
Licence pro EOV_OSV
-Licence ELC3
-
--
-pt_Ez_interHW
-0
-3
-
--
-pt_Ez_buffer
-1
-4294967295
-
--
-pt_Ez_webs
-2
-4294967295
-
--
-pt_Ez_iec104c
-5
-55
-
--
-pt_Ez_iec104s
-6
-66
-
--
-pt_Ez_iec61850c
-7
-77
-
-
+zst.ceskatrebova.ddts.cz
+ROV21
\ No newline at end of file
diff --git a/output/licDataActual3.xml b/output/licDataActual3.xml
new file mode 100644
index 0000000..ff346fa
--- /dev/null
+++ b/output/licDataActual3.xml
@@ -0,0 +1,39 @@
+
+
+DRT
+wago
+Licence pro EOV_OSV
+Licence ELC3
+
+-
+pt_Ez_interHW
+0
+3
+
+-
+pt_Ez_buffer
+1
+4294967295
+
+-
+pt_Ez_webs
+2
+4294967295
+
+-
+pt_Ez_iec104c
+5
+55
+
+-
+pt_Ez_iec104s
+6
+66
+
+-
+pt_Ez_iec61850c
+7
+77
+
+
+
\ No newline at end of file
diff --git a/output/licDataTest.xml b/output/licDataTest.xml
new file mode 100644
index 0000000..128ea8e
--- /dev/null
+++ b/output/licDataTest.xml
@@ -0,0 +1,8 @@
+
+
+EOV_OSV
+wago
+Licence pro EOV_OSV
+zst.ceskatrebova.ddts.cz
+ROV21
+
\ No newline at end of file
diff --git a/output/licenceGenerator b/output/licenceGenerator
index dfe6a21..cff66bd 100644
Binary files a/output/licenceGenerator and b/output/licenceGenerator differ
diff --git a/src/CreateLicence.cpp b/src/CreateLicence.cpp
index 2ade626..cc52d9c 100644
--- a/src/CreateLicence.cpp
+++ b/src/CreateLicence.cpp
@@ -1,7 +1,7 @@
#ifndef EZ_APPLICATION_LICENCE_DISABLE
#define LINUX 1
//#define WINDOWS 1
-#define READ 1
+//#define READ 1
#include
#include "licenceGenerator.h"
@@ -19,7 +19,7 @@ int main(int argc, char *argv[])
unordered_map arguments = getArguments(argc, argv);
LicenceGenerator generatorOld = LicenceGenerator(arguments["-uid"], arguments["-cid"], arguments["-csd"], arguments["-configFileName"]);
generatorOld.createLicenceFile();
- system("pause");
+ //system("pause");
#ifdef READ
InitStructure initStructure = {};
diff --git a/src/generator/LicenceGenerator.cpp b/src/generator/LicenceGenerator.cpp
index 450737d..8fa7f93 100644
--- a/src/generator/LicenceGenerator.cpp
+++ b/src/generator/LicenceGenerator.cpp
@@ -6,7 +6,7 @@
#include "pugixml.hpp"
#include
-#define WINDOWS 1
+#define LINUX 1
LicenceGenerator::LicenceGenerator()
{
@@ -44,7 +44,7 @@ bool LicenceGenerator::processInputConfiguration()
{
string fullFile = getCompletePath(this->configFileName);
- const int fileNameLength = fullFile.length();
+ const int fileNameLength = fullFile.length();
char fileName[fileNameLength] = {};
getCharsFromString(fullFile, fileName, fileNameLength);
@@ -89,8 +89,7 @@ bool LicenceGenerator::processInputConfiguration()
}
else
{
- cout << "file: " << fileName << "\n";
- throw LicenceException((int)GeneralError::FileOpenError, "Unable to open the config file.");
+ throw LicenceException((int)GeneralError::FileOpenError, "Unable to open the config file: " + fullFile + "\n");
}
return true;
}
diff --git a/start.sh b/start.sh
new file mode 100644
index 0000000..84aeb08
--- /dev/null
+++ b/start.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+chmod 777 output/licenceGenerator
+
+#./output/licenceGenerator -uid=a3395d1b898b4fdbbd563f9c75b3e885 -outputType=file -configFileName=licData.xml
+
+cd output
+./licenceGenerator -uid=a3395d1b898b4fdbbd563f9c75b3e885 -outputType=file -configFileName=licData.xml
\ No newline at end of file