mirror of
https://github.com/QuasarApp/CQtDeployer.git
synced 2025-04-27 02:04:33 +00:00
fix static resources
This commit is contained in:
parent
68889335fc
commit
6bad492402
@ -26,6 +26,8 @@ int main(int argc, char *argv[]) {
|
||||
|
||||
Deploy deploy;
|
||||
|
||||
deploy.init();
|
||||
|
||||
int code = deploy.run();
|
||||
|
||||
if (code) {
|
||||
|
@ -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"
|
||||
)
|
||||
|
@ -60,25 +60,23 @@ Envirement QIF::toolKitEnv() const {
|
||||
}
|
||||
|
||||
QList<SystemCommandData> QIF::runCmd() {
|
||||
QString base = "binarycreator";
|
||||
|
||||
SystemCommandData cmd;
|
||||
|
||||
QString binarycreator = QuasarAppUtils::Params::getArg("binarycreator");
|
||||
|
||||
if (binarycreator.isEmpty()) {
|
||||
binarycreator = DeployCore::findProcess(toolKitEnv().concatEnv(), 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();
|
||||
cmd.arguments = commandsList.mid(1,-1);
|
||||
}
|
||||
|
||||
if (binarycreator.isEmpty()) {
|
||||
cmd.command = base;
|
||||
cmd.arguments.clear();
|
||||
}
|
||||
|
||||
auto location = DeployCore::_config->getTargetDir() + "/" + getLocation();
|
||||
|
||||
cmd.arguments += QStringList{
|
||||
|
@ -48,6 +48,11 @@ int Deploy::run() {
|
||||
return Good;
|
||||
}
|
||||
|
||||
bool Deploy::init() {
|
||||
initCQtDeployerResources();
|
||||
return true;
|
||||
}
|
||||
|
||||
Deploy::~Deploy() {
|
||||
|
||||
if (_extracter) {
|
||||
|
@ -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();
|
||||
|
||||
/**
|
||||
|
Loading…
x
Reference in New Issue
Block a user