QuasarApp · EndrII · Mar 3, 2022 · Mar 3, 2022 · Mar 3, 2022 · Mar 3, 2022
diff --git a/Deploy/Deploy.pro b/Deploy/Deploy.pro
@@ -19,7 +19,7 @@ TEMPLATE = lib
 
 DEFINES += DEPLOY_LIBRARY
 
-VERSION = 1.5.4.12
+VERSION = 1.5.4.13
 
 DEFINES += APP_VERSION='\\"$$VERSION\\"'
 

diff --git a/Deploy/Distributions/qif.cpp b/Deploy/Distributions/qif.cpp
@@ -86,6 +86,12 @@ QList<SystemCommandData> QIF::runCmd() {
 
     cmd.arguments.push_back(installerFile());
 
+    QString customFormat = QuasarAppUtils::Params::getArg("qifArchiveFormat");
+    if (customFormat.size()) {
+        cmd.arguments.push_back("--af");
+        cmd.arguments.push_back(customFormat);
+    }
+
     return {cmd};
 }
 

diff --git a/Deploy/deploycore.cpp b/Deploy/deploycore.cpp
@@ -517,6 +517,12 @@ QuasarAppUtils::OptionsDataList DeployCore::avilableOptions() {
                             "Sets target directory(by default it is the path to the first deployable file)"
                         }});
 
+    help.insert(group, {QuasarAppUtils::OptionData{
+                            {"-qifArchiveFormat"}, "[7z|zip|tar|tar.gz|tar.bz2|tar.xz]",
+                            "Sets the format used when packaging new component data archives."
+                            " If you omit this option, the 7z format will be used as a default. "
+                        }});
+
     group = "Part 7 Deb package options";
 
     help.insert(group, {QuasarAppUtils::OptionData{

diff --git a/QIFData/QIF.pri b/QIFData/QIF.pri
@@ -10,7 +10,7 @@ unix: PLATFORM = linux
 win32:PY = python
 unix: PY = python3
 
-qif.commands= $$PY $$PWD/scripts/QIF.py $$PLATFORM 4.2 $$PWD/packages/QIF/data
+qif.commands= $$PY $$PWD/scripts/QIF.py $$PLATFORM 4.3 $$PWD/packages/QIF/data
 alias.commands= $$PY $$PWD/scripts/alias.py
 
 !isEmpty( ONLINE ) {

diff --git a/QIFData/config/configLinux.xml b/QIFData/config/configLinux.xml
@@ -3,7 +3,7 @@
     <WizardDefaultWidth>640px</WizardDefaultWidth>
     <WizardDefaultHeight>400px</WizardDefaultHeight>
     <Name>CQtDeployer</Name>
-    <Version>1.5.4.12</Version>
+    <Version>1.5.4.13</Version>
     <Title>CQtDeployer</Title>
     <Publisher>QuasarApp</Publisher>
     <StartMenuDir>CQtDeployer</StartMenuDir>

diff --git a/QIFData/config/configWin.xml b/QIFData/config/configWin.xml
@@ -3,7 +3,7 @@
     <WizardDefaultWidth>640px</WizardDefaultWidth>
     <WizardDefaultHeight>400px</WizardDefaultHeight>
     <Name>CQtDeployer</Name>
-    <Version>1.5.4.12</Version>
+    <Version>1.5.4.13</Version>
     <Title>CQtDeployer</Title>
     <Publisher>QuasarApp</Publisher>
     <StartMenuDir>CQtDeployer</StartMenuDir>

diff --git a/QIFData/installerCQtDeployer.pri b/QIFData/installerCQtDeployer.pri
@@ -1,4 +1,4 @@
-VERSION = 1.5.4.12
+VERSION = 1.5.4.13
 
 include($$PWD/InstallerBase.pri);
 mkpath( $$PWD/../Distro)
@@ -25,7 +25,7 @@ BASE_DEPLOY_FLAGS_CQT = $$BASE_DEPLOY_FLAGS -targetDir $$DATA_DIR $$OUT_LIB $$OU
 
 win32:CQT_ICON = -icon $$PWD/config/icon.ico
 unix:CQT_ICON = -icon $$PWD/config/logo.png
-BASE_DEPLOY_FLAGS_DEB = $$BASE_DEPLOY_FLAGS -targetDir $$PWD/../Distro $$OUT_LIB $$OUT_BIN deb zip -name CQtDeployer -publisher QuasarApp $$CQT_ICON -deployVersion 1.5.4.12 -debOut CQtDeployer_'$$VERSION'_Linux'_$$QMAKE_HOST.arch'.deb -zipOut CQtDeployer_'$$VERSION'_Linux'_$$QMAKE_HOST.arch'.zip
+BASE_DEPLOY_FLAGS_DEB = $$BASE_DEPLOY_FLAGS -targetDir $$PWD/../Distro $$OUT_LIB $$OUT_BIN deb zip -name CQtDeployer -publisher QuasarApp $$CQT_ICON -deployVersion 1.5.4.13 -debOut CQtDeployer_'$$VERSION'_Linux'_$$QMAKE_HOST.arch'.deb -zipOut CQtDeployer_'$$VERSION'_Linux'_$$QMAKE_HOST.arch'.zip
 
 DEPLOY_TARGET_DEB = $$DEPLOY_TARGET,$$PWD/packages/QIF/data/QIF
 deploy_dep.commands += $$DEPLOYER -bin $$DEPLOY_TARGET $$BASE_DEPLOY_FLAGS_CQT

diff --git a/QIFData/packages/QIF/meta/package.xml b/QIFData/packages/QIF/meta/package.xml
@@ -2,7 +2,7 @@
 <Package>
     <DisplayName>Qt Installer Framework</DisplayName>
     <Description>Qt Installer Framework for CQtDeployer</Description>
-    <Version>4.2.0.0</Version>
-    <ReleaseDate>2021-11-30</ReleaseDate>
+    <Version>4.3.0.0</Version>
+    <ReleaseDate>2022-03-03</ReleaseDate>
     <Default>true</Default>
 </Package>
diff --git a/QIFData/packages/cqtdeployer.1_5/meta/package.xml b/QIFData/packages/cqtdeployer.1_5/meta/package.xml
@@ -2,11 +2,11 @@
 <Package>
     <DisplayName>CQtDeployer 1.5</DisplayName>
     <Description>CQtDeployer 1.5</Description>
-    <Version>1.5.4.12</Version>
+    <Version>1.5.4.13</Version>
     <Default>true</Default>
     <ForcedInstallation>false</ForcedInstallation>
     <Script>installscript.js</Script>
-    <ReleaseDate>2021-06-15</ReleaseDate>
+    <ReleaseDate>2022-03-03</ReleaseDate>
     <SortingPriority>201</SortingPriority>
     <Translations>
         <Translation>ru.qm</Translation>

diff --git a/UnitTests/tst_deploytest.cpp b/UnitTests/tst_deploytest.cpp
@@ -193,6 +193,7 @@ private slots:
     void testQIFResources();
 
     void testCustomPlatform();
+    void testQifArchiveFormat();
 
     void customTest();
 };
@@ -202,6 +203,8 @@ deploytest::deploytest() {
     qputenv("QTEST_FUNCTION_TIMEOUT", "1800000");
     QString qifwPath = qgetenv("PATH") + DeployCore::getEnvSeparator() + TestQtDir + "../../Tools/QtInstallerFramework/4.0/bin/";
     qifwPath += qifwPath + DeployCore::getEnvSeparator() + TestQtDir + "../../Tools/QtInstallerFramework/4.1/bin/";
+    qifwPath += qifwPath + DeployCore::getEnvSeparator() + TestQtDir + "../../Tools/QtInstallerFramework/4.2/bin/";
+    qifwPath += qifwPath + DeployCore::getEnvSeparator() + TestQtDir + "../../Tools/QtInstallerFramework/4.3/bin/";
 
     qputenv("PATH", qifwPath.toLatin1().data());
     TestUtils utils;
@@ -1689,6 +1692,32 @@ void deploytest::testCustomPlatform() {
                   );
 }
 
+void deploytest::testQifArchiveFormat() {
+    TestUtils utils;
+
+#ifdef Q_OS_UNIX
+    QString bin = {TestBinDir + "TestOnlyC"};
+
+    auto result = utils.createTree({{DISTRO_DIR + "/InstallerTestOnlyC.run"},
+                                    {DISTRO_DIR + "/InstallerTestOnlyC.run.md5"}});
+#else
+    QString bin = {TestBinDir + "TestOnlyC.exe"};
+
+    auto result = utils.createTree({{DISTRO_DIR + "/InstallerTestOnlyC.exe"},
+                                    {DISTRO_DIR + "/InstallerTestOnlyC.exe.md5"}});
+#endif
+
+
+    runTestParams({
+                      "-bin", bin,
+                      "qifFromSystem",
+                      "clear",
+                      "qif",
+                      "-qifArchiveFormat", "zip"
+                  }, &result
+                  );
+}
+
 void deploytest::customTest() {
     //runTestParams({"-confFile", "",
     //               "qifFromSystem"});

diff --git a/md/en/Options.md b/md/en/Options.md
@@ -156,6 +156,7 @@ cqtdeployer -option1 value1 -option2 list, of, values flag1 flag2 flag3
 |  -qifConfig [path/to/config.xml] | Sets a custom path to the configure file of the qt ifw installer. By default it is qif/config/config.xml. Note This path sets releative target folder (sets by TargetDir option). |
 |  -qifPackages [path/to/packagesFodoler] | Sets a custom path to the packages directories. By default it is qif/packages. Note This path sets releative target folder (sets by TargetDir option). |
 |  -qifResources [path/to/resources1.qrc,path/to/resources2.qrc] | Sets a custom path to the resources files. By default this option is skipped. Note This path sets releative target folder (sets by TargetDir option). |
+|  -qifArchiveFormat [7z|zip|tar|tar.gz|tar.bz2|tar.xz] | Sets the format used when packaging new component data archives. If you omit this option, the 7z format will be used as a default. |
 
 ### Deb package options
 

diff --git a/md/ru/Options.md b/md/ru/Options.md
@@ -152,6 +152,7 @@ cqtdeployer -option1 value1 -option2 list,of,values flag1 flag2 flag3
 |  -qifConfig [path/to/config.xml] | Устанавливает пользовательский путь к файлу конфигурации установщика qt ifw. По умолчанию это qif/config/config.xml. Важно путь считаеться относительным целевого католога (установленным опцией targetDir).  |
 |  -qifPackages [path/to/packagesFodoler] | Устанавливает пользовательский путь к каталогам пакетов. По умолчанию это qif/packages. Важно путь считаеться относительным целевого католога (установленным опцией targetDir).   |
 |  -qifResources [path/to/resources1.qrc,path/to/resources2.qrc] | Устанавливает пользовательский путь к файлам ресурсов. По умолчанию эта опция пропущена. Важно путь считаеться относительным целевого католога (установленным опцией targetDir).  |
+|  -qifArchiveFormat [7z|zip|tar|tar.gz|tar.bz2|tar.xz] | Задает формат, используемый при упаковке новых архивов данных компонентов. Если вы опустите этот параметр, по умолчанию будет использоваться формат 7z.  |
 
 ### Deb package options:
 

diff --git a/snap/gui/cqtdeployer.desktop b/snap/gui/cqtdeployer.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Version=1.5.4.12
+Version=1.5.4.13
 Name=CQtDeployer
 Comment=CQtDeployer Help.
 Exec=cqtdeployer
@@ -10,6 +10,6 @@ Categories=Application;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=CQtDeployer
 X-GNOME-Bugzilla-Component=General
-X-GNOME-Bugzilla-Version=1.5.4.12
+X-GNOME-Bugzilla-Version=1.5.4.13
 StartupNotify=true
 Name[ru_RU]=CQtDeployer
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -6,7 +6,7 @@
 #
 
 name: cqtdeployer # you probably want to 'snapcraft register <name>'
-version: '1.5.4.12' # just for humans, typically '1.2+git' or '1.3.2'
+version: '1.5.4.13' # just for humans, typically '1.2+git' or '1.3.2'
 summary: deploy your qt projects # 79 char long summary
 description: |
   Console app for deploy qt libs.