diff --git a/Deploy/Distributions/qif.cpp b/Deploy/Distributions/qif.cpp index 8d47ded..413a76c 100644 --- a/Deploy/Distributions/qif.cpp +++ b/Deploy/Distributions/qif.cpp @@ -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; } diff --git a/Deploy/deploycore.cpp b/Deploy/deploycore.cpp index 16f541d..ca8f01d 100644 --- a/Deploy/deploycore.cpp +++ b/Deploy/deploycore.cpp @@ -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.run", "Sets name of output qifw installer."}, } }, { diff --git a/UnitTests/tst_deploytest.cpp b/UnitTests/tst_deploytest.cpp index 20ba059..701583e 100644 --- a/UnitTests/tst_deploytest.cpp +++ b/UnitTests/tst_deploytest.cpp @@ -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"}, + {DISTRO_DIR + "/QIF_OUT.md5"}}); + + // Run deploy installer + runTestParams({"-bin", bin, "clear", + "qif", "-qifOut", "QIF_OUT"}, &result); +} + void deploytest::customTest() { //runTestParams({"-confFile", "", // "qifFromSystem"}); diff --git a/md/en/Options.md b/md/en/Options.md index 1fbc7a6..7fbd496 100644 --- a/md/en/Options.md +++ b/md/en/Options.md @@ -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.run] | Sets name of output qifw installer. | #### Example: cqtdeployer -bin myApp -qmlDir ~/MyAppProject/qml -qmake ~/Qt/5.15.4/gcc_64/bin/qmake clear diff --git a/md/ru/Options.md b/md/ru/Options.md index 09d4415..905db24 100644 --- a/md/ru/Options.md +++ b/md/ru/Options.md @@ -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.run] | Устанавливает имя выходного установщика qifw. |