QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-04-27 18:24:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #622 from QuasarApp/task_519

Browse Source 
Added disableRunScript and disableShortCut options
This commit is contained in:
Andrei Yankovich 2021-06-11 16:48:58 +03:00 committed by GitHub
commit 4e3a91dc4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 585 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Deploy/DeployResources.qrc
View File

@ -26,4 +26,8 @@
<file>Distributions/Templates/Icon.png</file>
<file>Distributions/Templates/Icon.ico</file>
</qresource>
<qresource prefix="/Scripts">
<file>ScriptsTemplates/windows.bat</file>
<file>ScriptsTemplates/linux.sh</file>
</qresource>
</RCC>

15
Deploy/Distributions/Templates/deb/DEBIAN/postinst
View File

@ -1,6 +1,7 @@
#!/bin/bash
APPS=$BASH_ARRAY_APPLICATIONS
APPS_SHORTCUTS=$BASH_ARRAY_SHORTCUTS_APPLICATIONS
TARGET_DIR=/opt/$PREFIX/
@ -35,14 +36,20 @@ do
DEST_NAME=$app
SRC_FILE="$TARGET_DIR/$app.sh"
DEST_FILE="/usr/share/applications/$app.desktop"
createShortCut
if [ ! -e /usr/bin/"${app,,}" ]; then
ln -s "$TARGET_DIR/$app.sh" /usr/bin/"${app,,}"
echo "${app,,}"
fi
done
for app in "${APPS_SHORTCUTS[@]}"
do
DEST_NAME=$app
SRC_FILE="$TARGET_DIR/$app"
DEST_FILE="/usr/share/applications/${app%.*}.desktop"
createShortCut
done

9
Deploy/Distributions/Templates/deb/DEBIAN/prerm
View File

@ -1,15 +1,18 @@
#!/bin/bash
APPS=$BASH_ARRAY_APPLICATIONS
APPS_SHORTCUTS=$BASH_ARRAY_SHORTCUTS_APPLICATIONS
for app in "${APPS[@]}"
do
SRC_FILE="$TARGET_DIR/$app.sh"
rm "/usr/share/applications/$app.desktop"
if [ -e /usr/bin/"${app,,}" ]; then
rm /usr/bin/"${app,,}"
echo "Remove ${app,,}"
fi
done
for app in "${APPS_SHORTCUTS[@]}"
do
rm "/usr/share/applications/${app%.*}.desktop"
done

22
Deploy/Distributions/Templates/qif/packages/default/meta/installscript.qs
View File

@ -2,6 +2,13 @@ function Component() {
}
function getBasename(file) {
if (!file.length)
return ""
return file.split('.')[0];
}
function generateShortCutCmd(cmd) {
var prefix = "$PREFIX";
@ -12,8 +19,8 @@ function generateShortCutCmd(cmd) {
component.addOperation(
"CreateShortcut",
"@TargetDir@/" + prefix + "/" + cmd + ".bat",
"@DesktopDir@/" + cmd + ".lnk",
"@TargetDir@/" + prefix + "/" + cmd,
"@DesktopDir@/" + getBasename(cmd) + ".lnk",
"iconPath=@TargetDir@/$ICON",
"iconId=0");
@ -23,14 +30,14 @@ function generateShortCutCmd(cmd) {
if (systemInfo.kernelType === "linux") {
console.log("create icons!!! on LINUX");
component.addOperation("CreateDesktopEntry",
"@HomeDir@/.local/share/applications/" + cmd + ".desktop",
"@HomeDir@/.local/share/applications/" + getBasename(cmd) + ".desktop",
"Version=@Version@\n
Type=Application\n
Terminal=false\n
Exec=\"@TargetDir@/" + prefix + "/" + cmd + ".sh\"\n
Name=" + cmd + "\n
Exec=\"@TargetDir@/" + prefix + "/" + cmd + "\"\n
Name=" + getBasename(cmd) + "\n
Icon=@TargetDir@/$ICON\n
Name[en_US]=" + cmd);
Name[en_US]=" + getBasename(cmd));
console.log("create icons!!! on LINUX done");
}
@ -41,8 +48,9 @@ Component.prototype.createOperations = function() {
component.createOperations();
var cmdArray = ["array", "of", "cmds"]; // will be changed in cqtdeployer
var shortcutsCmdArray = ["array", "of", "shortcut", "cmds"]; // will be changed in cqtdeployer
cmdArray.forEach( function (item){
shortcutsCmdArray.forEach( function (item){
generateShortCutCmd(item);
});

21
Deploy/Distributions/idistribution.cpp
View File

@ -196,10 +196,25 @@ bool iDistribution::collectInfo(const DistroModule& pkg,
QString cmdArray = "[";
QString bashArray = "(";
QString cmdShortCutsArray = "[";
QString bashShortCutsArray = "(";
int initSize = cmdArray.size();
for (const auto &target :pkg.targets()) {
auto fileinfo = QFileInfo(target);
const DeployConfig *cfg = DeployCore::_config;
auto fileinfo = QFileInfo(target);
auto targetInfo = cfg->targets().value(target);
if (targetInfo.getShortCut()) {
if (cmdArray.size() > initSize) {
cmdShortCutsArray += ",";
bashShortCutsArray += " ";
}
cmdShortCutsArray += "\"" + targetInfo.getRunScriptFile() + "\"";
bashShortCutsArray += "\"" + targetInfo.getRunScriptFile() + "\"";
}
if (fileinfo.suffix().compare("exe", ONLY_WIN_CASE_INSENSIATIVE) == 0 || fileinfo.suffix().isEmpty()) {
if (cmdArray.size() > initSize) {
cmdArray += ",";
@ -211,9 +226,13 @@ bool iDistribution::collectInfo(const DistroModule& pkg,
}
cmdArray += "]";
bashArray += ")";
cmdShortCutsArray += "]";
bashShortCutsArray += ")";
info.Custom = {{"[\"array\", \"of\", \"cmds\"]", cmdArray}};
info.Custom["[\"array\", \"of\", \"shortcut\", \"cmds\"]"] = cmdShortCutsArray;
info.Custom["$BASH_ARRAY_APPLICATIONS"] = bashArray;
info.Custom["$BASH_ARRAY_APPLICATIONS"] = bashArray;
if (info.Name.isEmpty()) {

34
Deploy/ScriptsTemplates/linux.sh Normal file
View File

@ -0,0 +1,34 @@
#!/bin/sh
# This is default bat run script of The CQtDeployer project.
# This file contains key word that will replaced after deploy project.
#
# ####################################################################
#
# LIB_PATH - are releative path to libraryes of a deployed distribution.
# QML_PATH - are releative path to qml libraryes of a deployed distribution.
# PLUGIN_PATH - are releative path to qt plugins of a deployed distribution.
# BIN_PATH - are releative path to targets of a deployed distribution.
# SYSTEM_LIB_PATH - are releative path to system libraryes of a deployed distribution.
# BASE_NAME - are base name of the executable that will be launched after run this script.
# CUSTOM_SCRIPT_BLOCK - This is code from the customScript option
# RUN_COMMAND - This is command for run application. Requred BASE_DIR variable.
#
# ####################################################################
BASE_DIR=$(dirname "$(readlink -f "$0")")
export LD_LIBRARY_PATH="$BASE_DIR"CQT_LIB_PATH:"$BASE_DIR":$LD_LIBRARY_PATH
export QML_IMPORT_PATH="$BASE_DIR"CQT_QML_PATH:$QML_IMPORT_PATH
export QML2_IMPORT_PATH="$BASE_DIR"CQT_QML_PATH:$QML2_IMPORT_PATH
export QT_PLUGIN_PATH="$BASE_DIR"CQT_PLUGIN_PATH:$QT_PLUGIN_PATH
export QTWEBENGINEPROCESS_PATH="$BASE_DIR"CQT_BIN_PATH/QtWebEngineProcess
export QTDIR="$BASE_DIR"
export CQT_PKG_ROOT="$BASE_DIR"
export CQT_RUN_FILE="$BASE_DIR/CQT_BASE_NAME.sh"
export QT_QPA_PLATFORM_PLUGIN_PATH="$BASE_DIR"CQT_PLUGIN_PATH/platforms:$QT_QPA_PLATFORM_PLUGIN_PATH
CQT_CUSTOM_SCRIPT_BLOCK
CQT_RUN_COMMAND

22
Deploy/ScriptsTemplates/windows.bat Normal file
View File

@ -0,0 +1,22 @@
:: This is default bat run script of The CQtDeployer project.
:: This file contains key word that will replaced after deploy project.
:: ####################################################################
:: LIB_PATH - are releative path to libraryes of a deployed distribution.
:: SYSTEM_LIB_PATH - are releative path to system libraryes of a deployed distribution.
:: BASE_NAME - are base name of the executable that will be launched after run this script.
:: CUSTOM_SCRIPT_BLOCK - This is code from the customScript option
:: RUN_COMMAND - This is command for run application. Requred BASE_DIR variable.
:: ####################################################################
@echo off
SET BASE_DIR=%~dp0
SET PATH=%BASE_DIR%CQT_LIB_PATH;%PATH%;CQT_SYSTEM_LIB_PATH
SET CQT_PKG_ROOT=%BASE_DIR%
SET CQT_RUN_FILE=%BASE_DIR%CQT_BASE_NAME.bat
CQT_CUSTOM_SCRIPT_BLOCK
CQT_RUN_COMMAND

112
Deploy/configparser.cpp
View File

@ -75,7 +75,7 @@ void parseTargetPrivate(DeployConfig& conf,
auto pair = iconPair.split(DeployCore::getSeparator(1), splitbehavior);
if (pair.size() == 1) {
QuasarAppUtils::Params::log(QString("Set new default icon for all tagets: " + pair.value(0)),
QuasarAppUtils::Params::log(QString("Set new default property for all tagets: " + pair.value(0)),
QuasarAppUtils::Debug);
for (auto& editableTarget: cointainer) {
(editableTarget.*adder)(pair.value(0));
@ -96,7 +96,7 @@ void parseTargetPrivate(DeployConfig& conf,
}
for (const auto &target: targetsMap) {
QuasarAppUtils::Params::log(QString("Set new icon for %0 taget. Icon: %1").
QuasarAppUtils::Params::log(QString("Set new property for %0 taget.").
arg(pair.value(0), pair.value(1)),
QuasarAppUtils::Debug);
(target->*adder)(pair.value(1));
@ -104,6 +104,40 @@ void parseTargetPrivate(DeployConfig& conf,
}
}
template <typename Enabler>
bool enableOptionFotTargetPrivate(DeployConfig& conf,
const QStringList &inputParams,
Enabler enabler) {
for (const auto &iconPair: inputParams) {
auto pair = iconPair.split(DeployCore::getSeparator(1), splitbehavior);
if (pair.size() != 1) {
QuasarAppUtils::Params::log(QString("Failed parese list of option values, This option support only single leve list. "
" Example: use -Option val1,val2,val3 "),
QuasarAppUtils::Error);
return false;
}
const auto targetsMap = conf.getTargetsListByFilter(pair.value(0));
if (!targetsMap.size()) {
QuasarAppUtils::Params::log(QString("Not found any targets for the %0 selector").
arg(pair.value(0)),
QuasarAppUtils::Warning);
}
for (const auto &target: targetsMap) {
QuasarAppUtils::Params::log(QString("Set new property for %0 taget.").
arg(pair.value(0)),
QuasarAppUtils::Debug);
(target->*enabler)();
}
}
return true;
}
bool ConfigParser::parseParams() {
auto path = QuasarAppUtils::Params::getArg("confFile");
@ -578,35 +612,6 @@ bool ConfigParser::initPackages() {
return true;
}
bool ConfigParser::initRunScripts() {
const auto list = QuasarAppUtils::Params::getArg("runScript").split(DeployCore::getSeparator(0), splitbehavior);
for (const auto& line: list) {
auto pair = line.split(DeployCore::getSeparator(1), splitbehavior);
if (pair.size() != 2) {
QuasarAppUtils::Params::log("Syntax error of the runScript option."
" Example of use :"
" -runScript \"myTarget;path/To/Target/RunScript.sh,"
"mySecondTarget;path/To/Target/SecondRunScript.sh\"",
QuasarAppUtils::Error);
return false;
}
QFileInfo script(pair.value(1));
if (!script.isFile()) {
QuasarAppUtils::Params::log(QString("The %0 file does not exist.").arg(script.absoluteFilePath()),
QuasarAppUtils::Error);
return false;
}
_config.registerRunScript(pair.value(0),
script.absoluteFilePath());
}
return true;
}
bool ConfigParser::initQmlInput() {
auto qmlDir = QuasarAppUtils::Params::getArg("qmlDir").
@ -683,11 +688,6 @@ bool ConfigParser::parseDeployMode() {
}
}
if (!initRunScripts()) {
return false;
}
initIgnoreEnvList();
initEnvirement();
initIgnoreList();
@ -706,9 +706,9 @@ bool ConfigParser::parseDeployMode() {
" then you must use the classic version of CQtDeployer instead of the snap version."
" This is due to the fact that the snap version"
" runs in an isolated container and has limited access"
" to system utilities and the environment. "
"For get the classic version of cqtdeployer use the cqtdeployer installer "
"https://github.com/QuasarApp/CQtDeployer/releases", QuasarAppUtils::Info);
" to system utilities and the environment."
" For get the classic version of cqtdeployer use the cqtdeployer installer"
" https://github.com/QuasarApp/CQtDeployer/releases", QuasarAppUtils::Info);
}
return false;
@ -760,15 +760,39 @@ bool ConfigParser::parseInitMode() {
return true;
}
void ConfigParser::configureTargets() {
bool ConfigParser::configureTargets() {
const auto icons = QuasarAppUtils::Params::getArg("icon").
split(DeployCore::getSeparator(0), splitbehavior);
const auto runScripts = QuasarAppUtils::Params::getArg("runScript").
split(DeployCore::getSeparator(0), splitbehavior);
const auto disableRunScripts = QuasarAppUtils::Params::getArg("disableRunScript").
split(DeployCore::getSeparator(0), splitbehavior);
const auto disableShortcuts = QuasarAppUtils::Params::getArg("disableShortCut").
split(DeployCore::getSeparator(0), splitbehavior);
if (icons.size()) {
parseTargetPrivate(_config, icons, &TargetInfo::setIcon);
}
return;
if (runScripts.size()) {
parseTargetPrivate(_config, runScripts, &TargetInfo::setRunScript);
}
if (disableShortcuts.size() && !enableOptionFotTargetPrivate(_config, disableShortcuts, &TargetInfo::disableShortCut)) {
packagesErrorLog("disableShortCut");
return false;
}
if (disableRunScripts.size() && !enableOptionFotTargetPrivate(_config, disableRunScripts, &TargetInfo::disableRunScript)) {
packagesErrorLog("disableRunScript");
return false;
}
return true;
}
bool ConfigParser::parseClearMode() {
@ -1150,7 +1174,7 @@ bool ConfigParser::initQmake() {
auto qt = *qtList.begin();
if (qt.right(3).compare("lib", Qt::CaseInsensitive)) {
if (qt.rightRef(3).compare(QString("lib"), Qt::CaseInsensitive)) {
return initQmakePrivate(QFileInfo(qt + "/../bin/qmake").absoluteFilePath());
}
@ -1566,9 +1590,7 @@ bool ConfigParser::smartMoveTargets() {
_config.targetsEdit() = temp;
configureTargets();
return result;
return result && configureTargets();
}
ConfigParser::ConfigParser(FileManager *filemanager, PluginsParser *pluginsParser, DependenciesScanner* scaner, Packing *pac):

3
Deploy/configparser.h
View File

@ -52,7 +52,6 @@ private:
bool loadFromFile(const QString& file);
bool initDistroStruct();
bool initPackages();
bool initRunScripts();
bool parseDeployMode();
bool parseInfoMode();
bool parseInitMode();
@ -60,7 +59,7 @@ private:
* @brief configureTargets Sets targets data from options.
* @return true if function finishe successfull
*/
void configureTargets();
bool configureTargets();
bool parseClearMode();

22
Deploy/deployconfig.cpp
View File

@ -25,6 +25,19 @@ DeployConfig::getTargetsListByFilter(const QString &filter) {
return result;
}
QHash<QString, const TargetInfo *>
DeployConfig::getTargetsListByFilter(const QString &filter) const {
QHash<QString, const TargetInfo*> result;
for( auto it = _targets.cbegin(); it != _targets.cend(); ++it) {
if (it.key().contains(filter, Qt::CaseInsensitive)) {
result.insert(it.key(), &(*it));
}
}
return result;
}
QString DeployConfig::getTargetDir(const QString &target) const {
if (_targets.contains(target))
return targetDir + "/" + _targets.value(target).getPackage();
@ -104,15 +117,6 @@ void DeployConfig::setDefaultPackage(const QString &value) {
defaultPackage = value;
}
void DeployConfig::registerRunScript(const QString &targetName,
const QString &scriptPath) {
_runScripts.insert(targetName, scriptPath);
}
QString DeployConfig::getRunScript(const QString &targetName) const {
return _runScripts.value(targetName, "");
}
QtMajorVersion DeployConfig::isNeededQt() const {
auto Qt = QtMajorVersion::NoQt;

10
Deploy/deployconfig.h
View File

@ -63,6 +63,7 @@ public:
*/
void reset();
QHash<QString, TargetInfo *> getTargetsListByFilter(const QString& filter);
QHash<QString, const TargetInfo *> getTargetsListByFilter(const QString& filter) const;
/**
* @brief targetPath
@ -122,9 +123,6 @@ public:
QString getDefaultPackage() const;
void setDefaultPackage(const QString &value);
void registerRunScript(const QString& targetName, const QString& scriptPath);
QString getRunScript(const QString& targetName) const;
/**
* @brief isNeededQt This method return all needed qt major version for all targets.
* @return qt major version
@ -155,12 +153,6 @@ private:
*/
QHash<QString, DistroModule> _packages;
/**
* @brief _runScripts
* target - pathToScript
*/
QHash<QString, QString> _runScripts;
/**
* @brief targetDir - targe directory (this folder conteins all files of distrebution kit)
*/

9
Deploy/deploycore.cpp
View File

@ -295,7 +295,10 @@ void DeployCore::help() {
{
"Part 4 Control of packages options", {
{"-icon [target;val,val]", "Sets path to icon for a targets"}
{"-icon [target;val,val]", "Sets path to icon for a targets"},
{"-disableRunScript [target;val,val]", "Disables a generation of run script for selected targets"},
{"-disableShortCut [target;val,val]", "Disables a generation of shortcut for selected targets"}
}
},
@ -389,7 +392,9 @@ QStringList DeployCore::helpKeys() {
"allowEmptyPackages",
"runScript",
"getDefaultTemplate",
"tr"
"tr",
"disableRunScript",
"disableShortCut"
};
}

161
Deploy/metafilemanager.cpp
View File

@ -27,46 +27,15 @@ bool MetaFileManager::createRunScriptWindows(const QString &target) {
QFileInfo targetInfo(target);
QString content;
auto runScript = cnf->getRunScript(targetInfo.fileName());
if (runScript.size()) {
QFile script(runScript);
if (!script.open(QIODevice::ReadOnly)) {
return false;
}
content = script.readAll();
script.close();
auto runScript = targetinfo.getRunScript();
} else {
bool fGui = DeployCore::isGui(_mudulesMap.value(target));
auto systemLibsDir = distro.getLibOutDir() + DeployCore::systemLibsFolderName();
content =
"@echo off \n"
"SET BASE_DIR=%~dp0\n"
"SET PATH=%BASE_DIR%" + distro.getLibOutDir() + ";%PATH%;" + systemLibsDir + "\n"
"SET CQT_PKG_ROOT=%BASE_DIR%\n"
"SET CQT_RUN_FILE=%BASE_DIR%%0.bat\n"
"%3\n";
// Run application as invoke of the console for consle applications
// And run gui applciation in the detached mode.
if (fGui) {
content += "start \"%0\" %4 \"%BASE_DIR%" + distro.getBinOutDir() + "%1\" %2 \n";
} else {
content += "call \"%BASE_DIR%" + distro.getBinOutDir() + "%1\" %2 \n";
}
content = content.arg(targetInfo.baseName(), targetInfo.fileName(), "%*",
generateCustoScriptBlok(true)); // %0 %1 %2 %3
content = QDir::toNativeSeparators(content);
if (fGui) {
content = content.arg("/B"); // %4
}
QFile script(runScript);
if (!script.open(QIODevice::ReadOnly)) {
return false;
}
content = script.readAll();
script.close();
replace(toReplace(target, distro), content);
QString fname = DeployCore::_config->getTargetDir(target) + QDir::separator() + targetInfo.baseName()+ ".bat";
@ -90,6 +59,7 @@ bool MetaFileManager::createRunScriptWindows(const QString &target) {
bool MetaFileManager::createRunScriptLinux(const QString &target) {
auto cnf = DeployCore::_config;
auto targetinfo = cnf->targets().value(target);
if (!cnf->targets().contains(target)) {
return false;
@ -99,48 +69,15 @@ bool MetaFileManager::createRunScriptLinux(const QString &target) {
QFileInfo targetInfo(target);
QString content;
auto runScript = cnf->getRunScript(targetInfo.fileName());
if (runScript.size()) {
QFile script(runScript);
if (!script.open(QIODevice::ReadOnly)) {
return false;
}
content = script.readAll();
script.close();
} else {
auto systemLibsDir = distro.getLibOutDir() + DeployCore::systemLibsFolderName();
content =
"#!/bin/sh\n"
"BASE_DIR=$(dirname \"$(readlink -f \"$0\")\")\n"
"export "
"LD_LIBRARY_PATH=\"$BASE_DIR\"" + distro.getLibOutDir() +
":\"$BASE_DIR\":$LD_LIBRARY_PATH:\"$BASE_DIR\"" + systemLibsDir + "\n"
"export QML_IMPORT_PATH=\"$BASE_DIR\"" + distro.getQmlOutDir() + ":$QML_IMPORT_PATH\n"
"export QML2_IMPORT_PATH=\"$BASE_DIR\"" + distro.getQmlOutDir() + ":$QML2_IMPORT_PATH\n"
"export QT_PLUGIN_PATH=\"$BASE_DIR\"" + distro.getPluginsOutDir() + ":$QT_PLUGIN_PATH\n"
"export QTWEBENGINEPROCESS_PATH=\"$BASE_DIR\"" + distro.getBinOutDir() + "QtWebEngineProcess\n"
"export QTDIR=\"$BASE_DIR\"\n"
"export CQT_PKG_ROOT=\"$BASE_DIR\"\n"
"export CQT_RUN_FILE=\"$BASE_DIR/%2\"\n"
"export "
"QT_QPA_PLATFORM_PLUGIN_PATH=\"$BASE_DIR\"" + distro.getPluginsOutDir() +
"platforms:$QT_QPA_PLATFORM_PLUGIN_PATH\n"
""
"%1\n"
"\"$BASE_DIR" + distro.getBinOutDir() + "%0\" \"$@\"\n";
content = content.arg(targetInfo.fileName()); // %0
content = content.arg(generateCustoScriptBlok(false),
targetInfo.baseName()+ ".sh"); // %1 %2
auto runScript = targetinfo.getRunScript();
QFile script(runScript);
if (!script.open(QIODevice::ReadOnly)) {
return false;
}
content = script.readAll();
script.close();
replace(toReplace(target, distro), content);
QString fname = DeployCore::_config->getTargetDir(target) + QDir::separator() + targetInfo.baseName()+ ".sh";
@ -163,6 +100,12 @@ bool MetaFileManager::createRunScriptLinux(const QString &target) {
}
QString MetaFileManager::generateCustoScriptBlok(bool bat) const {
QuasarAppUtils::Params::log("The customScript option are depricated!."
" This option will be removed into next release cqtdeployer."
" Please use the runScript option",
QuasarAppUtils::Warning);
QString res = "";
QString commentMarker = "# ";
@ -173,9 +116,9 @@ QString MetaFileManager::generateCustoScriptBlok(bool bat) const {
auto cstSh = QuasarAppUtils::Params::getArg("customScript", "");
if (cstSh.size()) {
res = "\n" +
commentMarker + "Begin Custom Script (generated by customScript flag)\n"
commentMarker + "Begin Custom Script (generated by customScript flag)\n"
"%0\n" +
commentMarker + "End Custom Script\n"
commentMarker + "End Custom Script\n"
"\n";
res = res.arg(cstSh);
@ -248,14 +191,66 @@ bool MetaFileManager::createQConf(const QString &target) {
QFileDevice::ReadOwner);
}
QHash<QString, QString> MetaFileManager::toReplace(const QString& target,
const DistroModule& distro) const {
QFileInfo targetInfo(target);
QHash<QString, QString> result = {
{"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) {
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() + "\" %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);
} else {
result.insert("CQT_CUSTOM_SCRIPT_BLOCK", generateCustoScriptBlok(false));
QString runCmd = "\"$BASE_DIR" + distro.getBinOutDir() + targetInfo.fileName() + "\" \"$@\" ";
result.insert("CQT_RUN_COMMAND", QDir::toNativeSeparators(runCmd));
}
return result;
}
void MetaFileManager::replace(const QHash<QString, QString> &map, QString &content) {
for (auto it = map.begin(); it != map.end(); ++it) {
content = content.replace(it.key(), it.value());
}
}
void MetaFileManager::createRunMetaFiles(const QHash<QString, DeployCore::QtModule>& modulesMap) {
_mudulesMap = modulesMap;
for (auto i = DeployCore::_config->targets().cbegin(); i != DeployCore::_config->targets().cend(); ++i) {
if (!createRunScript(i.key())) {
if (i.value().fEnableRunScript() && !createRunScript(i.key())) {
QuasarAppUtils::Params::log("Failed to create a run script: " + i.key(),
QuasarAppUtils::Error);
QuasarAppUtils::Error);
}
if (!createQConf(i.key())) {

7
Deploy/metafilemanager.h
View File

@ -12,6 +12,8 @@
#include <deploycore.h>
class FileManager;
class DistroModule;
class TargetInfo;
class MetaFileManager
{
@ -32,6 +34,11 @@ private:
bool createQConf(const QString &target);
QHash<QString, QString> toReplace(const QString &target,
const DistroModule &distro) const;
void replace(const QHash<QString, QString>& map, QString& content);
FileManager* _fileManager = nullptr;
QHash<QString, DeployCore::QtModule> _mudulesMap;
};

72
Deploy/targetinfo.cpp
View File

@ -6,21 +6,23 @@
//#
#include "targetinfo.h"
#include "deploycore.h"
#include "deployconfig.h"
TargetInfo::TargetInfo() {
}
QString TargetInfo::getPackage() const {
return package;
const QString & TargetInfo::getPackage() const {
return _package;
}
void TargetInfo::setPackage(const QString &value) {
package = value;
_package = value;
}
QString TargetInfo::getIcon() const {
if (icon.isEmpty()) {
if (_icon.isEmpty()) {
QFileInfo info(getName());
if (info.suffix() == "exe") {
return ":/shared/Distributions/Templates/Icon.ico";
@ -30,11 +32,69 @@ QString TargetInfo::getIcon() const {
}
return icon;
return _icon;
}
void TargetInfo::setIcon(const QString &value) {
icon = value;
_icon = value;
}
bool TargetInfo::getShortCut() const {
return _fEnableShortCut;
}
void TargetInfo::setShortCut(bool shortcut) {
_fEnableShortCut = shortcut;
}
void TargetInfo::disableShortCut() {
setShortCut(false);
}
QString TargetInfo::getRunScript() const {
if (_runScript.isEmpty()) {
QFileInfo info(getName());
if (info.suffix() == "exe") {
return ":/Scripts/ScriptsTemplates/windows.bat";
}
return ":/Scripts/ScriptsTemplates/linux.sh";
}
return _runScript;
}
void TargetInfo::setRunScript(const QString &newRunScript) {
_runScript = newRunScript;
}
QString TargetInfo::getRunScriptFile() const {
if (_fEnableRunScript) {
QFileInfo runscriptInfo(_runScript);
QFileInfo info(getName());
return info.baseName() + "." + runscriptInfo.completeSuffix();
}
return getName();
}
bool TargetInfo::fEnableRunScript() const {
QFileInfo info(fullPath());
QString compleSufix = info.completeSuffix();
bool defaultRule = compleSufix.compare("exe", Qt::CaseInsensitive) == 0 || compleSufix.isEmpty();
return _fEnableRunScript && defaultRule;
}
void TargetInfo::setFEnableRunScript(bool newFEnableRunScript) {
_fEnableRunScript = newFEnableRunScript;
}
void TargetInfo::disableRunScript() {
setFEnableRunScript(false);
}

89
Deploy/targetinfo.h
View File

@ -11,20 +11,101 @@
#include "distrostruct.h"
#include "libinfo.h"
/**
* @brief The TargetInfo class This clas scontains information about target object. (executable or another files marked in a bin option)
*/
class DEPLOYSHARED_EXPORT TargetInfo: public LibInfo
{
public:
TargetInfo();
QString getPackage() const;
/**
* @brief getPackage This method return name of the package in that contains this target.
* @return name of the package in that contains this target.
*/
const QString & getPackage() const;
/**
* @brief setPackage This method sets new value for pacakge name in that contains this target.
* @param value new This is new value of the pacakge.
*/
void setPackage(const QString &value);
/**
* @brief getIcon This method return path to default icon of the target.
* @return icon path.
* @note if the icon not set then return default icon.
*/
QString getIcon() const;
/**
* @brief setIcon This method sets new iconf for target.
* @param value
*/
void setIcon(const QString &value);
/**
* @brief getShortCut This method return true if the target need to create shortcut.
* @return true if shortcut needed for this target.
*/
bool getShortCut() const;
/**
* @brief setShortCut This method sets new status of the creating shortcut.
* @param shortcut This is new value of the shortcut
*/
void setShortCut(bool shortcut);
/**
* @brief disableShortCut This method disable shortcut for this target.
*/
void disableShortCut();
/**
* @brief getRunScript This method return path to run script.
* @return path to run script
* @note By Default return path to default run scrip file from cqtdeployer resources.
*/
QString getRunScript() const;
/**
* @brief setRunScript sets New path of the run script.
* @param newRunScript This is new path of the run sscript.
*/
void setRunScript(const QString &newRunScript);
/**
* @brief getRunScriptFile This method return name fo the run script file or executable file if the run script are not needed
* @return runscript name
*/
QString getRunScriptFile() const;
/**
* @brief fEnableRunScript This return true if the run script will be generateed for this target else false.
* @return true if the run script will be generateed for this target else false.
*/
bool fEnableRunScript() const;
/**
* @brief setFEnableRunScript This method enable or disable generation runScript.
* @param newFEnableRunScript New value.
*/
void setFEnableRunScript(bool newFEnableRunScript);
/**
* @brief disableRunScript This method disable run script for this target.
*/
void disableRunScript();
private:
QString package = "";
QString icon = "";
};
QString _package = "";
QString _icon = "";
bool _fEnableShortCut = true;
bool _fEnableRunScript = true;
QString _runScript = "";
};
#endif // TARGETINFO_H

29
UnitTests/testRes/TestQMLWidgets.sh
View File

@ -1,13 +1,34 @@
#!/bin/sh
# This is default bat run script of The CQtDeployer project.
# This file contains key word that will replaced after deploy project.
#
# ####################################################################
#
# LIB_PATH - are releative path to libraryes of a deployed distribution.
# QML_PATH - are releative path to qml libraryes of a deployed distribution.
# PLUGIN_PATH - are releative path to qt plugins of a deployed distribution.
# BIN_PATH - are releative path to targets of a deployed distribution.
# SYSTEM_LIB_PATH - are releative path to system libraryes of a deployed distribution.
# BASE_NAME - are base name of the executable that will be launched after run this script.
# CUSTOM_SCRIPT_BLOCK - This is code from the customScript option
# RUN_COMMAND - This is command for run application. Requred BASE_DIR variable.
#
# ####################################################################
BASE_DIR=$(dirname "$(readlink -f "$0")")
export LD_LIBRARY_PATH="$BASE_DIR"/lib/:"$BASE_DIR":$LD_LIBRARY_PATH:"$BASE_DIR"/lib/systemLibs
export LD_LIBRARY_PATH="$BASE_DIR"/lib/:"$BASE_DIR":$LD_LIBRARY_PATH
export QML_IMPORT_PATH="$BASE_DIR"/q/and/q/:$QML_IMPORT_PATH
export QML2_IMPORT_PATH="$BASE_DIR"/q/and/q/:$QML2_IMPORT_PATH
export QT_PLUGIN_PATH="$BASE_DIR"/plugins/:$QT_PLUGIN_PATH
export QTWEBENGINEPROCESS_PATH="$BASE_DIR"/bin/QtWebEngineProcess
export QTWEBENGINEPROCESS_PATH="$BASE_DIR"/bin//QtWebEngineProcess
export QTDIR="$BASE_DIR"
export CQT_PKG_ROOT="$BASE_DIR"
export CQT_RUN_FILE="$BASE_DIR/TestQMLWidgets.sh"
export QT_QPA_PLATFORM_PLUGIN_PATH="$BASE_DIR"/plugins/platforms:$QT_QPA_PLATFORM_PLUGIN_PATH
"$BASE_DIR/bin/TestQMLWidgets" "$@"
export QT_QPA_PLATFORM_PLUGIN_PATH="$BASE_DIR"/plugins//platforms:$QT_QPA_PLATFORM_PLUGIN_PATH
"$BASE_DIR/bin/TestQMLWidgets" "$@"

61
UnitTests/tst_deploytest.cpp
View File

@ -48,7 +48,8 @@ private:
QSet<QString> *tree = nullptr,
bool noWarnings = false,
bool onlySize = false,
exitCodes exitCode = exitCodes::Good);
exitCodes exitCode = exitCodes::Good,
const std::function<void (const DeployConfig *)> &cb = {});
void checkResults(const QSet<QString> &tree,
bool noWarnings,
@ -181,6 +182,9 @@ private slots:
void testMd5();
void testDisableShortcuts();
void testDisableRunScripts();
void customTest();
};
@ -1464,6 +1468,55 @@ void deploytest::testMd5() {
"qifFromSystem"}, &comapareTreeqif);
}
void deploytest::testDisableShortcuts() {
TestUtils utils;
#ifdef Q_OS_UNIX
QString bin = TestBinDir + "TestOnlyC";
#else
QString bin = TestBinDir + "TestOnlyC.exe";
#endif
auto cb = [](const DeployConfig * config){
const auto list = config->getTargetsListByFilter("TestOnlyC");
// Check shrtcut option. all targets should be return false.
for (auto target: list) {
QVERIFY(!target->getShortCut());
}
};
// Run deploy installer
runTestParams({"-bin", bin, "clear",
"-disableShortCut", "TestOnlyC",
"qif", "qifFromSystem"},
nullptr,
false,
false,
exitCodes::Good,
cb);
}
void deploytest::testDisableRunScripts() {
TestUtils utils;
#ifdef Q_OS_UNIX
QString bin = TestBinDir + "TestOnlyC";
#else
QString bin = TestBinDir + "TestOnlyC.exe";
#endif
auto comapareTreeqif = TestModule.onlyC();
comapareTreeqif -= utils.createTree({DISTRO_DIR + "/TestOnlyC.sh",
DISTRO_DIR + "/TestOnlyC.bat"});
// Run deploy installer
runTestParams({"-bin", bin, "clear", "-libDir", TestQtDir + "/bin",
"-disableRunScript", "TestOnlyC"}, &comapareTreeqif);
}
void deploytest::customTest() {
//runTestParams({"-confFile", "",
// "qifFromSystem"});
@ -1721,7 +1774,8 @@ void deploytest::testZip() {
void deploytest::runTestParams(QStringList list,
QSet<QString>* tree,
bool noWarnings, bool onlySize,
exitCodes exitCode) {
exitCodes exitCode,
const std::function<void (const DeployConfig *)> &cb) {
QuasarAppUtils::Params::parseParams(list);
@ -1737,6 +1791,9 @@ void deploytest::runTestParams(QStringList list,
if (tree) {
checkResults(*tree, noWarnings, onlySize);
}
if (cb)
cb(DeployCore::_config);
}
void deploytest::checkResults(const QSet<QString> &tree,

26
md/en/CustomScripts.md Normal file
View File

@ -0,0 +1,26 @@
# Custom Scripts
After version 1.5.1 cqtdeployer support self variables in the custom scripts.
For using custom scripts use the **runScript option**
### Exmaples :
```bash
cqtdeployer -bin MyExecutable.exe -runScript MyExecutable,path/to/my/custom/script.bat
```
```bash
cqtdeployer -bin MyExecutable -runScript MyExecutable,path/to/my/custom/script.sh
```
## Suported variables list:
* CQT_LIB_PATH - are releative path to libraryes of a deployed distribution.
* CQT_QML_PATH - are releative path to qml libraryes of a deployed distribution.
* CQT_PLUGIN_PATH - are releative path to qt plugins of a deployed distribution.
* CQT_BIN_PATH - are releative path to targets of a deployed distribution.
* CQT_SYSTEM_LIB_PATH - are releative path to system libraryes of a deployed distribution.
* CQT_BASE_NAME - are base name of the executable that will be launched after run this script.
* CQT_CUSTOM_SCRIPT_BLOCK - This is code from the customScript option
* CQT_RUN_COMMAND - This is command for run application. Requred BASE_DIR variable.

3
md/en/Home.md
View File

@ -19,7 +19,8 @@
* [Retrieving packaging templates](ExtractDefaultsTemplates.md)
* [Default Environment Variables](EnvironmentVariables.md)
* [Disable standard shortcuts ](DisableShortcats.md)
* [Custom scripts](CustomScripts.md)
## Support the project
If you like what we do and it benefits you, you can support the project on the official page [QuasarApp in Patreon](https://www.patreon.com/QuasarApp)
If you like what we do and it benefits you, you can support the project on the official page [QuasarApp in Patreon](https://www.patreon.com/QuasarApp)

10
md/en/Options.md
View File

@ -66,9 +66,8 @@ cqtdeployer -option1 value1 -option2 list, of, values ​​flag1 flag2 flag3
| | Example: cqtdeployer deb" }, |
| | you can specify the path to your own DEBIAN template. |
| | Examples: cqtdeployer -deb path/to/myCustom/DEBIAN. More details can be found [here](DEB.md) |
| deploySystem | Deploys all libraries not recomendet because there may be conflicts with system libraries |
| deploySystem-with-libc | Deploys all libs include libc (only linux). Do not use this option for a gui application, for gui use the deploySystem option. (on snap version you need to turn on permission) |
| noQt | Ignors the error of initialize of a qmake. Use only if your application does not use the qt framework. |
| deploySystem | Deploys all libraries not recomendet because there may be conflicts with system libraries |
| noQt | Ignors the error of initialize of a qmake. Use only if your application does not use the qt framework. |
| allowEmptyPackages | Allows configure the empty packages. |
| getDefaultTemplate | Extracts defaults deb or qif templates. For more information see the extracting default templates [page](ExtractDefaultsTemplates.md) |
| noHashSum | Disable computation of a packages hash sum |
@ -100,7 +99,6 @@ cqtdeployer -option1 value1 -option2 list, of, values ​​flag1 flag2 flag3
| -extraPlugin [list,params]| Sets an additional path to extraPlugin of an app |
| -recursiveDepth [params] | Sets the Depth of recursive search of libs and ignoreEnv (default 0) |
| -targetDir [params] | Sets target directory(by default it is the path to the first deployable file)|
| -runScript [list,parems] | forces cqtdeployer swap default run script to new from the arguments of option. This option copy all content from input file and insert all code into runScript.sh or .bat. Example of use: cqtdeployer -runScript "myTargetMame;path/to/my/myCustomLaunchScript.sh,myTargetSecondMame;path/to/my/mySecondCustomLaunchScript.sh"|
| -verbose [0-3] | Shows debug log |
### Controll of packages options
@ -130,7 +128,9 @@ cqtdeployer -option1 value1 -option2 list, of, values ​​flag1 flag2 flag3
| Option | Descriptiion |
|-----------------------------|-----------------------------------------------------------|
| -icon [target;val,val] | Sets path to icon for a targets |
| -disableRunScript [target;val,val] | Disables a generation of run script for selected targets|
| -disableShortCut [target;val,val] | Disables a generation of shortcut for selected targets |
| -runScript [target;val,val] | forces cqtdeployer swap default run script to new from the arguments of option. This option copy all content from input file and insert all code into runScript.sh or .bat. Example of use: cqtdeployer -runScript "myTargetMame;path/to/my/myCustomLaunchScript.sh,myTargetSecondMame;path/to/my/mySecondCustomLaunchScript.sh" For get more information about customScript see the documentation [page](CustomScripts.md)|
### Plugins Controll Options

26
md/ru/CustomScripts.md Normal file
View File

@ -0,0 +1,26 @@
# Пользовательские скрипты
После версии 1.5.1 cqtdeployer поддерживает собственные переменные в пользовательских скриптах.
Для использования пользовательских сценариев используйте параметр **runScript**.
### Примеры:
```bash
cqtdeployer -bin MyExecutable.exe -runScript MyExecutable,path/to/my/custom/script.bat
```
```bash
cqtdeployer -bin MyExecutable -runScript MyExecutable,path/to/my/custom/script.sh
```
## Список поддерживаемых переменных:
* CQT_LIB_PATH - это относительный путь к библиотекам развернутого дистрибутива.
* CQT_QML_PATH - это относительный путь к библиотекам qml развернутого дистрибутива.
* CQT_PLUGIN_PATH - это относительный путь к плагинам qt развернутого дистрибутива.
* CQT_BIN_PATH - это относительный путь к целям развернутого дистрибутива.
* CQT_SYSTEM_LIB_PATH - это относительный путь к системным библиотекам развернутого дистрибутива.
* CQT_BASE_NAME - это базовое имя исполняемого файла, который будет запущен после запуска этого скрипта.
* CQT_CUSTOM_SCRIPT_BLOCK - это код из опции customScript
* CQT_RUN_COMMAND - это команда для запуска приложения. Требуется переменная BASE_DIR.

3
md/ru/Home.md
View File

@ -19,7 +19,8 @@
* [Получение шаблонов упаковки](ExtractDefaultsTemplates.md)
* [Стандартные переменные окружения](EnvironmentVariables.md)
* [Отключение стандартных ярлыков](DisableShortcats.md)
* [Пользовательские скрипты](CustomScripts.md)
## Поддержите проект
Если вам нравится то, что мы делаем, и это приносит вам пользу, вы можете поддержать проект на официальной странице [QuasarApp в Patreon](https://www.patreon.com/QuasarApp)
Если вам нравится то, что мы делаем, и это приносит вам пользу, вы можете поддержать проект на официальной странице [QuasarApp в Patreon](https://www.patreon.com/QuasarApp)

5
md/ru/Options.md
View File

@ -68,7 +68,6 @@ cqtdeployer -option1 value1 -option2 list,of,values flag1 flag2 flag3
| | Примеры: cqtdeployer -deb path/to/myCustom/DEBIAN. Подробнее можно посмотреть [здесь](DEB.md) |
| deploySystem | Копирует все библиотеки кроме libc |
| | (не рекомендуется, так как занимает много памяти, возможны конфликты библиотек) |
| deploySystem-with-libc | Копирует все зависимости в том числе и libc, не рекомендуется использовать с gui приложения, в место этого используйте опцию deploySystem |
| noQt | Игнорирует ошибку инициализации qmake. Используйте только в том случае, если ваше приложение не использует платформу qt. |
| allowEmptyPackages | Разрешите настраивать пустые пакеты. |
| getDefaultTemplate | Извлекает deb или qif шаблоны по умолчанию. Для получения дополнительной информации см. [Страницу](ExtractDefaultsTemplates.md) извлечения шаблонов по умолчанию. |
@ -95,7 +94,6 @@ cqtdeployer -option1 value1 -option2 list,of,values flag1 flag2 flag3
| -extraPlugin [list,params] | Устанавливает дополнительный путь для extraPlugin приложения|
| -recursiveDepth [params] | Устанавливает глубину поиска библиотек и глубину игнорирования окружения для ignoreEnv (по умолчанию 0) |
| -targetDir [params] | Устанавливает целевой каталог (по умолчанию это путь к первому развертываемому файлу)|
| -runScript [list,parems] | заставляет cqtdeployer заменить сценарий запуска по умолчанию на новый из аргументов параметра. Эта опция копирует все содержимое из входного файла и вставляет весь код в runScript.sh или .bat. Пример использования: cqtdeployer -runScript "myTargetMame;path/to/my/myCustomLaunchScript.sh,myTargetSecondMame;path/to/my/mySecondCustomLaunchScript.sh"|
| -verbose [0-3] | Показывает дебаг лога |
### Параметры управлениями пакетами:
@ -126,6 +124,9 @@ cqtdeployer -option1 value1 -option2 list,of,values flag1 flag2 flag3
| Option | Descriptiion |
|-----------------------------|-----------------------------------------------------------|
| -icon [target;val,val] | Установит путь к иконке или логотипу для целе |
| -disableRunScript [target; val, val]| Отключает создание сценария выполнения для выбранных целей |
| -disableShortCut [target; val, val] | Отключает создание ярлыков для выбранных целей |
| -runScript [target; val, val] | заставляет cqtdeployer заменить сценарий запуска по умолчанию на новый из аргументов параметра. Эта опция копирует все содержимое из входного файла и вставляет весь код в runScript.sh или .bat. Пример использования: cqtdeployer -runScript "myTargetMame;path/to/my/myCustomLaunchScript.sh,myTargetSecondMame;path/to/my/mySecondCustomLaunchScript.sh". Для получения дополнительной информации смотрите статью [Кастомные скрипты](CustomScripts.md)|
### Параметры управления плагинами: