Merge pull request #724 from QuasarApp/task_704

Fix call qifw binarycreator tool on windows

src/CQtDeployer/main.cpp

@@ -26,6 +26,8 @@ int main(int argc, char *argv[]) {
 
     Deploy deploy;
 
+    deploy.init();
+
     int code = deploy.run();
 
     if (code) {

src/Deploy/CMakeLists.txt

@@ -13,7 +13,7 @@ set(CURRENT_PROJECT "${CURRENT_PROJECT_DIR}")
 add_definitions(-DCQT_DEPLOYER_LIBRARY)
 
 
-file(GLOB_RECURSE SOURCE_CPP
+file(GLOB SOURCE_CPP
     "src/*.cpp"
     "src/*.h"
 
@@ -22,7 +22,7 @@ file(GLOB_RECURSE SOURCE_CPP
 
 )
 
-file(GLOB_RECURSE SOURCE_QRC
+file(GLOB SOURCE_QRC
     "*.qrc"
     "src/*.qrc"
 )

src/Deploy/src/Distributions/qif.cpp

@@ -47,24 +47,30 @@ Envirement QIF::toolKitEnv() const {
     // SNAP
     result.addEnv(AppPath + "/../QIF/");
 
-    //Installer
+    //Installer nad zip
+#ifdef Q_OS_LINUX
     result.addEnvRec(AppPath + "/../../QIF/", 2);
+#endif
+
+#ifdef Q_OS_WIN32
+    result.addEnvRec(AppPath + "/../QIF/", 2);
+#endif
 
     return result;
 }
 
 QList<SystemCommandData> QIF::runCmd() {
-    QString base = "binarycreator";
-
     SystemCommandData cmd;
 
     QString binarycreator = QuasarAppUtils::Params::getArg("binarycreator");
 
-    if (binarycreator.isEmpty())
-        binarycreator = DeployCore::findProcess(toolKitEnv().concatEnv(), base);
-
     if (binarycreator.isEmpty()) {
-        cmd.command = base;
+        binarycreator = DeployCore::findProcess(toolKitEnv().concatEnv(), "binarycreator");
+        if (binarycreator.isEmpty()) {
+            cmd.command = "binarycreator";
+        } else {
+            cmd.command = binarycreator;
+        }
     } else {
         auto commandsList = binarycreator.split(' ');
         cmd.command = commandsList.first();

src/Deploy/src/deploy.cpp

@@ -48,6 +48,11 @@ int Deploy::run() {
     return Good;
 }
 
+bool Deploy::init() {
+    initCQtDeployerResources();
+    return true;
+}
+
 Deploy::~Deploy() {
 
     if (_extracter) {

src/Deploy/src/deploy.h

@@ -34,6 +34,10 @@ enum exitCodes {
 
 };
 
+inline void initCQtDeployerResources() {
+    Q_INIT_RESOURCE(DeployResources);
+}
+
 class DEPLOYSHARED_EXPORT Deploy
 {
 private:
@@ -54,6 +58,7 @@ private:
 public:
     Deploy();
     int run();
+    bool init();
     ~Deploy();
 
     /**