QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-05-01 12:09:36 +00:00
Code Issues Projects Releases Wiki Activity

fix qif option on config file

Browse Source
This commit is contained in:
Andrei Yankovich 2020-03-15 14:22:19 +03:00
parent d473d8af68
commit 0596fe51aa
11 changed files with 18 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Deploy/DeployResources.qrc
View File

@ -1,8 +1,5 @@
<RCC> <RCC>
<qresource prefix="/Distro"> <qresource prefix="/Distro">
<file>Distributions/configures/Qt.json</file>
<file>Distributions/configures/QIF.json</file>
<file>Distributions/configures/C and C++.json</file>
<file>Distributions/configures/Init multiPackage configuration.json</file> <file>Distributions/configures/Init multiPackage configuration.json</file>
<file>Distributions/configures/Init single configuration.json</file> <file>Distributions/configures/Init single configuration.json</file>
<file>Distributions/configures/Init.json</file> <file>Distributions/configures/Init.json</file>

2
Deploy/Distributions/configures/C and C++.json
View File

@ -1,2 +0,0 @@
{
}

2
Deploy/Distributions/configures/QIF.json
View File

@ -1,2 +0,0 @@
{
}

0
Deploy/Distributions/configures/Qt.json
View File

5
Deploy/Distributions/defaultdistro.cpp
View File

@ -8,11 +8,6 @@ DefaultDistro::DefaultDistro(FileManager *fileManager)
}; };
QString DefaultDistro::getConfig() const{
return ":/Distro/Distributions/configures/C and C++.json";
}
bool DefaultDistro::deployTemplate() { bool DefaultDistro::deployTemplate() {
return true; return true;
} }

16
Deploy/Distributions/defaultdistro.h
View File

@ -10,15 +10,15 @@ public:
// iDistribution interface // iDistribution interface
public: public:
QString getConfig() const; QString getConfig() const ;
bool deployTemplate(); bool deployTemplate() override;
Envirement toolKitEnv() const; Envirement toolKitEnv() const override;
QString runCmd(); QString runCmd() override;
QStringList runArg() const; QStringList runArg() const override;
bool removeTemplate() const; bool removeTemplate() const override;
QProcessEnvironment processEnvirement() const; QProcessEnvironment processEnvirement() const override;
QStringList outPutFiles() const; QStringList outPutFiles() const override;
}; };
#endif // DEFAULTDISTRO_H #endif // DEFAULTDISTRO_H

1
Deploy/Distributions/idistribution.h
View File

@ -16,7 +16,6 @@ public:
iDistribution(FileManager * fileManager); iDistribution(FileManager * fileManager);
virtual ~iDistribution(); virtual ~iDistribution();
virtual QString getConfig() const = 0;
virtual bool deployTemplate() = 0; virtual bool deployTemplate() = 0;
virtual bool removeTemplate() const = 0; virtual bool removeTemplate() const = 0;
virtual Envirement toolKitEnv() const = 0; virtual Envirement toolKitEnv() const = 0;

4
Deploy/Distributions/qif.cpp
View File

@ -44,10 +44,6 @@ Envirement QIF::toolKitEnv() const {
return result; return result;
} }
QString QIF::getConfig() const {
return ":/Distro/Distributions/configures/QIF.json";
}
QString QIF::runCmd() { QString QIF::runCmd() {
QString base = "binarycreator"; QString base = "binarycreator";

15
Deploy/Distributions/qif.h
View File

@ -11,14 +11,13 @@ class DEPLOYSHARED_EXPORT QIF: public iDistribution
{ {
public: public:
QIF(FileManager *fileManager); QIF(FileManager *fileManager);
Envirement toolKitEnv() const; Envirement toolKitEnv() const override;
QString getConfig() const; QString runCmd() override;
QString runCmd(); bool deployTemplate() override;
bool deployTemplate(); QStringList runArg() const override;
QStringList runArg() const; bool removeTemplate() const override;
bool removeTemplate() const; QProcessEnvironment processEnvirement() const override;
QProcessEnvironment processEnvirement() const; QStringList outPutFiles() const override;
QStringList outPutFiles() const;
private: private:
QString binarycreator; QString binarycreator;

20
Deploy/configparser.cpp
View File

@ -60,13 +60,6 @@ bool parsePackagesPrivate(Container& mainContainer,
bool ConfigParser::parseParams() { 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"); auto path = QuasarAppUtils::Params::getStrArg("confFile");
bool createFile = !QFile::exists(path) && bool createFile = !QFile::exists(path) &&
QuasarAppUtils::Params::isEndable("confFile"); QuasarAppUtils::Params::isEndable("confFile");
@ -84,6 +77,9 @@ bool ConfigParser::parseParams() {
} }
} }
auto distro = getDistribution();
_packing->setDistribution(distro);
switch (DeployCore::getMode()) { switch (DeployCore::getMode()) {
case RunMode::Info: { case RunMode::Info: {
qInfo() << "Print info ..." ; qInfo() << "Print info ..." ;
@ -1122,16 +1118,6 @@ iDistribution *ConfigParser::getDistribution() {
return new DefaultDistro(_fileManager); return new DefaultDistro(_fileManager);
} }
bool ConfigParser::configureDistribution(iDistribution *distro) {
if (!loadFromFile(distro->getConfig())) {
return false;
}
_packing->setDistribution(distro);
return true;
}
void ConfigParser::initEnvirement() { void ConfigParser::initEnvirement() {
QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); QProcessEnvironment env = QProcessEnvironment::systemEnvironment();

2
Deploy/configparser.h
View File

@ -90,8 +90,6 @@ private:
iDistribution* getDistribution(); iDistribution* getDistribution();
bool configureDistribution(iDistribution *distro);
bool isNeededQt() const; bool isNeededQt() const;
public: public:
ConfigParser(FileManager *filemanager, DependenciesScanner *scaner, Packing* pac); ConfigParser(FileManager *filemanager, DependenciesScanner *scaner, Packing* pac);