QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-04-26 17:54:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #724 from QuasarApp/task_704

Browse Source 
Fix call qifw binarycreator tool on windows
This commit is contained in:
Andrei Yankovich 2022-10-23 16:19:57 +03:00 committed by GitHub
commit e2bd87974a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CQtDeployer/main.cpp
View File

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

4
src/Deploy/CMakeLists.txt
View File

@ -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"
)

20
src/Deploy/src/Distributions/qif.cpp
View File

@ -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();

5
src/Deploy/src/deploy.cpp
View File

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

5
src/Deploy/src/deploy.h
View File

@ -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();
/**