QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-05-10 00:19:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'version_1_0'

Browse Source
This commit is contained in:
Andrei Yankovich 2018-08-22 19:14:14 +03:00
commit 941478e99b
2 changed files with 16 additions and 7 deletions

19
CQtDeployer/deploy.cpp

@ -66,16 +66,21 @@ bool Deploy::createRunScript() {
QString content =
"#!/bin/sh\n"
"BASEDIR=$(dirname $0)\n"
"export LD_LIBRARY_PATH=\"$BASEDIR/lib:$BASEDIR\"\n"
"export QML_IMPORT_PATH=\"$BASEDIR/qml\"\n"
"export QML2_IMPORT_PATH=\"$BASEDIR/qml\"\n"
"export QT_PLUGIN_PATH=\"$BASEDIR/plugins\"\n"
"export QT_QPA_PLATFORM_PLUGIN_PATH=\"$BASEDIR/plugins/platforms\"\n"
"$BASEDIR//%1";
"export LD_LIBRARY_PATH=$BASEDIR/lib:$BASEDIR:$LD_LIBRARY_PATH\n"
"export QML_IMPORT_PATH=$BASEDIR/qml:QML_IMPORT_PATH\n"
"export QML2_IMPORT_PATH=$BASEDIR/qml:QML2_IMPORT_PATH\n"
"export QT_PLUGIN_PATH=$BASEDIR/plugins:QT_PLUGIN_PATH\n"
"export QT_QPA_PLATFORM_PLUGIN_PATH=$BASEDIR/plugins/platforms:QT_QPA_PLATFORM_PLUGIN_PATH\n"
"$BASEDIR/%1";
content = content.arg(QFileInfo(target).fileName());
QString fname = targetDir + QDir::separator() + "AppRun.sh";
QString fname = targetDir + QDir::separator();
if (QuasarAppUtils::isEndable("runScript")) {
fname += QuasarAppUtils::getStrArg("runScript");
} else {
fname += "AppRun.sh";
}
QFile F(fname);
if (!F.open(QIODevice::WriteOnly)) {

4
CQtDeployer/main.cpp

@ -30,6 +30,10 @@ void help() {
qInfo() << " -ignore [list,params] : ignore filter for libs";
qInfo() << " | for example -ignore libicudata.so.56,libicudata2.so.56";
qInfo() << " clear : delete all old deploy data";
qInfo() << " -runScript [params] : set new name of out file (AppRun.sh by default)";
qInfo() << " | for example -runScript myApp.sh";
qInfo() << "";
qInfo() << "Example: CDQ -bin myApp -qmlDir ~/Qt/5.11.1/gcc_64/qml -qmake ~/Qt/5.11.1/gcc_64/bin/qmake clear";
}