QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-04-28 02:34:34 +00:00
Code Issues Projects Releases Wiki Activity

fix windows bat files

Browse Source
This commit is contained in:
Andrei Yankovich 2021-06-11 15:59:29 +03:00
parent 2562fc49c9
commit 858656d3a2
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Deploy/ScriptsTemplates/windows.bat
View File

@ -13,10 +13,10 @@
@echo off
SET BASE_DIR=%~dp0
SET PATH=%BASE_DIR%LIB_PATH;%PATH%;SYSTEM_LIB_PATH
SET PATH=%BASE_DIR%CQT_LIB_PATH;%PATH%;CQT_SYSTEM_LIB_PATH
SET CQT_PKG_ROOT=%BASE_DIR%
SET CQT_RUN_FILE=%BASE_DIR%BASE_NAME.bat
SET CQT_RUN_FILE=%BASE_DIR%CQT_BASE_NAME.bat
CUSTOM_SCRIPT_BLOCK
CQT_CUSTOM_SCRIPT_BLOCK
RUN_COMMAND
CQT_RUN_COMMAND

21
Deploy/metafilemanager.cpp
View File

@ -196,28 +196,31 @@ QHash<QString, QString> MetaFileManager::toReplace(const QString& target,
QFileInfo targetInfo(target);
QHash<QString, QString> result = {
{"CQT_BIN_PATH", distro.getBinOutDir()},
{"CQT_LIB_PATH", distro.getLibOutDir()},
{"CQT_QML_PATH", distro.getQmlOutDir()},
{"CQT_PLUGIN_PATH", distro.getPluginsOutDir()},
{"CQT_SYSTEM_LIB_PATH", distro.getLibOutDir() + DeployCore::systemLibsFolderName()},
{"CQT_BASE_NAME", targetInfo.baseName()}
{"CQT_BIN_PATH", QDir::toNativeSeparators(distro.getBinOutDir())},
{"CQT_LIB_PATH", QDir::toNativeSeparators(distro.getLibOutDir())},
{"CQT_QML_PATH", QDir::toNativeSeparators(distro.getQmlOutDir())},
{"CQT_PLUGIN_PATH", QDir::toNativeSeparators(distro.getPluginsOutDir())},
{"CQT_SYSTEM_LIB_PATH", QDir::toNativeSeparators(distro.getLibOutDir() + DeployCore::systemLibsFolderName())},
{"CQT_BASE_NAME", QDir::toNativeSeparators(targetInfo.baseName())}
};
bool fGui = DeployCore::isGui(_mudulesMap.value(target));
if (targetInfo.completeSuffix().compare(".exe", Qt::CaseInsensitive) == 0) {
if (targetInfo.completeSuffix().compare("exe", Qt::CaseInsensitive) == 0) {
result.insert("CQT_CUSTOM_SCRIPT_BLOCK", generateCustoScriptBlok(true));
// Run application as invoke of the console for consle applications
// And run gui applciation in the detached mode.
QString runCmd;
if (fGui) {
runCmd = "start \"" + targetInfo.baseName() + "\" /B " +
runCmd = "start \"" + targetInfo.baseName() + "\" %0 " +
"\"%BASE_DIR%" + distro.getBinOutDir() + targetInfo.fileName() + "\" %*";
runCmd = QDir::toNativeSeparators(runCmd).arg("/B");
} else {
runCmd = "call \"%BASE_DIR%" + distro.getBinOutDir() + targetInfo.fileName() + "\" %*";
runCmd = QDir::toNativeSeparators(runCmd);
}
result.insert("CQT_RUN_COMMAND", runCmd);
@ -227,7 +230,7 @@ QHash<QString, QString> MetaFileManager::toReplace(const QString& target,
QString runCmd = "\"$BASE_DIR" + distro.getBinOutDir() + targetInfo.fileName() + "\" \"$@\" ";
result.insert("CQT_RUN_COMMAND", runCmd);
result.insert("CQT_RUN_COMMAND", QDir::toNativeSeparators(runCmd));
}
return result;