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

Merge branch 'main' of github.com:QuasarApp/CQtDeployer

Browse Source
This commit is contained in:
Andrei Yankovich 2021-06-15 18:04:37 +03:00
commit 73e90dda17
5 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Deploy/Distributions/qif.cpp
View File

@ -248,6 +248,10 @@ QString QIF::installerFile() const {
#else
QString sufix = ".exe";
#endif
QString qifOut = QuasarAppUtils::Params::getArg("qifOut");
if (qifOut.size()) {
return DeployCore::_config->getTargetDir() + "/" + qifOut;
}
return DeployCore::_config->getTargetDir() + "/Installer" + generalInfo.Name + sufix;
}

1
Deploy/deploycore.cpp
View File

@ -321,6 +321,7 @@ void DeployCore::help() {
" Available styles: quasar, quasarDark"},
{"-qifBanner [path/to/banner.png]", "Sets path to the banner png file."},
{"-qifLogo [path/to/logo.png]", "Sets path to the logo png file."},
{"-qifOut [nameOfOutputInstallerFile", "Sets name of output qifw installer. Note: on Windows, the exe suffix will be added to the installer automatically."},
}
},
{

18
UnitTests/tst_deploytest.cpp
View File

@ -184,6 +184,7 @@ private slots:
void testDisableShortcuts();
void testDisableRunScripts();
void testQifOut();
void customTest();
};
@ -1517,6 +1518,23 @@ void deploytest::testDisableRunScripts() {
"-disableRunScript", "TestOnlyC"}, &comapareTreeqif);
}
void deploytest::testQifOut() {
TestUtils utils;
#ifdef Q_OS_UNIX
QString bin = TestBinDir + "TestOnlyC";
#else
QString bin = TestBinDir + "TestOnlyC.exe";
#endif
auto result = utils.createTree({{DISTRO_DIR + "/QIF_OUT.exe"},
{DISTRO_DIR + "/QIF_OUT.exe.md5"}});
// Run deploy installer
runTestParams({"-bin", bin, "clear",
"qif", "-qifOut", "QIF_OUT.exe"}, &result);
}
void deploytest::customTest() {
//runTestParams({"-confFile", "",
// "qifFromSystem"});

1
md/en/Options.md
View File

@ -149,6 +149,7 @@ cqtdeployer -option1 value1 -option2 list, of, values ​​flag1 flag2 flag3
| -qifStyle [path/to/style.css]| Sets the path to the CSS style file or sets the default style. Available styles: quasar |
| -qifBanner [path/to/banner.png]| Sets path to the banner png file. |
| -qifLogo [path/to/logo.png]| Sets path to the logo png file. |
| -qifOut [nameOfOutputInstallerFile] | Sets name of output qifw installer. Note: on Windows, the exe suffix will be added to the installer automatically. |
#### Example: cqtdeployer -bin myApp -qmlDir ~/MyAppProject/qml -qmake ~/Qt/5.15.4/gcc_64/bin/qmake clear

1
md/ru/Options.md
View File

@ -145,6 +145,7 @@ cqtdeployer -option1 value1 -option2 list,of,values flag1 flag2 flag3
| -qifStyle [path/to/style.css]| Устанавливает путь к CSS файлу стиля или устанавливает стиль по умолчанию. Доступные стили: quasar |
| -qifBanner [path/to/banner.png]| Устанавливает путь к png-файлу баннера. |
| -qifLogo [path/to/logo.png]| Устанавливает путь к файлу логотипа png. |
| -qifOut [nameOfOutputInstallerFile] | Устанавливает имя выходного установщика qifw. Примечание: для установщика Windows автоматически добавляется суффикс exe. |