From 0596fe51aaca4ebc1c6665a7747cccf3c788a86c Mon Sep 17 00:00:00 2001 From: EndrII Date: Sun, 15 Mar 2020 14:22:19 +0300 Subject: [PATCH] fix qif option on config file --- Deploy/DeployResources.qrc | 3 --- .../Distributions/configures/C and C++.json | 2 -- Deploy/Distributions/configures/QIF.json | 2 -- Deploy/Distributions/configures/Qt.json | 0 Deploy/Distributions/defaultdistro.cpp | 5 ----- Deploy/Distributions/defaultdistro.h | 16 +++++++-------- Deploy/Distributions/idistribution.h | 1 - Deploy/Distributions/qif.cpp | 4 ---- Deploy/Distributions/qif.h | 15 +++++++------- Deploy/configparser.cpp | 20 +++---------------- Deploy/configparser.h | 2 -- 11 files changed, 18 insertions(+), 52 deletions(-) delete mode 100755 Deploy/Distributions/configures/C and C++.json delete mode 100755 Deploy/Distributions/configures/QIF.json delete mode 100755 Deploy/Distributions/configures/Qt.json diff --git a/Deploy/DeployResources.qrc b/Deploy/DeployResources.qrc index 961a241..dacdbd8 100644 --- a/Deploy/DeployResources.qrc +++ b/Deploy/DeployResources.qrc @@ -1,8 +1,5 @@ - Distributions/configures/Qt.json - Distributions/configures/QIF.json - Distributions/configures/C and C++.json Distributions/configures/Init multiPackage configuration.json Distributions/configures/Init single configuration.json Distributions/configures/Init.json diff --git a/Deploy/Distributions/configures/C and C++.json b/Deploy/Distributions/configures/C and C++.json deleted file mode 100755 index 2c63c08..0000000 --- a/Deploy/Distributions/configures/C and C++.json +++ /dev/null @@ -1,2 +0,0 @@ -{ -} diff --git a/Deploy/Distributions/configures/QIF.json b/Deploy/Distributions/configures/QIF.json deleted file mode 100755 index 2c63c08..0000000 --- a/Deploy/Distributions/configures/QIF.json +++ /dev/null @@ -1,2 +0,0 @@ -{ -} diff --git a/Deploy/Distributions/configures/Qt.json b/Deploy/Distributions/configures/Qt.json deleted file mode 100755 index e69de29..0000000 diff --git a/Deploy/Distributions/defaultdistro.cpp b/Deploy/Distributions/defaultdistro.cpp index 65ee976..c02ac94 100644 --- a/Deploy/Distributions/defaultdistro.cpp +++ b/Deploy/Distributions/defaultdistro.cpp @@ -8,11 +8,6 @@ DefaultDistro::DefaultDistro(FileManager *fileManager) }; - -QString DefaultDistro::getConfig() const{ - return ":/Distro/Distributions/configures/C and C++.json"; -} - bool DefaultDistro::deployTemplate() { return true; } diff --git a/Deploy/Distributions/defaultdistro.h b/Deploy/Distributions/defaultdistro.h index 51c0bf5..69681cd 100644 --- a/Deploy/Distributions/defaultdistro.h +++ b/Deploy/Distributions/defaultdistro.h @@ -10,15 +10,15 @@ public: // iDistribution interface public: - QString getConfig() const; - bool deployTemplate(); - Envirement toolKitEnv() const; - QString runCmd(); - QStringList runArg() const; - bool removeTemplate() const; - QProcessEnvironment processEnvirement() const; + QString getConfig() const ; + bool deployTemplate() override; + Envirement toolKitEnv() const override; + QString runCmd() override; + QStringList runArg() const override; + bool removeTemplate() const override; + QProcessEnvironment processEnvirement() const override; - QStringList outPutFiles() const; + QStringList outPutFiles() const override; }; #endif // DEFAULTDISTRO_H diff --git a/Deploy/Distributions/idistribution.h b/Deploy/Distributions/idistribution.h index fcc8f98..bdf94a8 100644 --- a/Deploy/Distributions/idistribution.h +++ b/Deploy/Distributions/idistribution.h @@ -16,7 +16,6 @@ public: iDistribution(FileManager * fileManager); virtual ~iDistribution(); - virtual QString getConfig() const = 0; virtual bool deployTemplate() = 0; virtual bool removeTemplate() const = 0; virtual Envirement toolKitEnv() const = 0; diff --git a/Deploy/Distributions/qif.cpp b/Deploy/Distributions/qif.cpp index 8c40e65..2dae221 100644 --- a/Deploy/Distributions/qif.cpp +++ b/Deploy/Distributions/qif.cpp @@ -44,10 +44,6 @@ Envirement QIF::toolKitEnv() const { return result; } -QString QIF::getConfig() const { - return ":/Distro/Distributions/configures/QIF.json"; -} - QString QIF::runCmd() { QString base = "binarycreator"; diff --git a/Deploy/Distributions/qif.h b/Deploy/Distributions/qif.h index c7c0197..1427770 100644 --- a/Deploy/Distributions/qif.h +++ b/Deploy/Distributions/qif.h @@ -11,14 +11,13 @@ class DEPLOYSHARED_EXPORT QIF: public iDistribution { public: QIF(FileManager *fileManager); - Envirement toolKitEnv() const; - QString getConfig() const; - QString runCmd(); - bool deployTemplate(); - QStringList runArg() const; - bool removeTemplate() const; - QProcessEnvironment processEnvirement() const; - QStringList outPutFiles() const; + Envirement toolKitEnv() const override; + QString runCmd() override; + bool deployTemplate() override; + QStringList runArg() const override; + bool removeTemplate() const override; + QProcessEnvironment processEnvirement() const override; + QStringList outPutFiles() const override; private: QString binarycreator; diff --git a/Deploy/configparser.cpp b/Deploy/configparser.cpp index 822a1c0..489e8d5 100644 --- a/Deploy/configparser.cpp +++ b/Deploy/configparser.cpp @@ -60,13 +60,6 @@ bool parsePackagesPrivate(Container& mainContainer, bool ConfigParser::parseParams() { - auto distro = getDistribution(); - if (!configureDistribution(distro)) { - QuasarAppUtils::Params::verboseLog("Configure distrebutive fail!", - QuasarAppUtils::Error); - return false; - } - auto path = QuasarAppUtils::Params::getStrArg("confFile"); bool createFile = !QFile::exists(path) && QuasarAppUtils::Params::isEndable("confFile"); @@ -84,6 +77,9 @@ bool ConfigParser::parseParams() { } } + auto distro = getDistribution(); + _packing->setDistribution(distro); + switch (DeployCore::getMode()) { case RunMode::Info: { qInfo() << "Print info ..." ; @@ -1122,16 +1118,6 @@ iDistribution *ConfigParser::getDistribution() { return new DefaultDistro(_fileManager); } -bool ConfigParser::configureDistribution(iDistribution *distro) { - if (!loadFromFile(distro->getConfig())) { - return false; - } - - _packing->setDistribution(distro); - - return true; -} - void ConfigParser::initEnvirement() { QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); diff --git a/Deploy/configparser.h b/Deploy/configparser.h index 814561b..6d2f0cd 100644 --- a/Deploy/configparser.h +++ b/Deploy/configparser.h @@ -90,8 +90,6 @@ private: iDistribution* getDistribution(); - bool configureDistribution(iDistribution *distro); - bool isNeededQt() const; public: ConfigParser(FileManager *filemanager, DependenciesScanner *scaner, Packing* pac);