Merge pull request #510 from QuasarApp/v1.5

v1.5.0.21 alpha
QuasarApp · Jan 27, 2021 · 338fad0 · 338fad0
2 parents 0247cfa + 02fbba0
commit 338fad0
Show file tree

Hide file tree

Showing 12 changed files with 123 additions and 31 deletions.
diff --git a/Deploy/Deploy.pro b/Deploy/Deploy.pro
@@ -19,7 +19,7 @@ TEMPLATE = lib
 
 DEFINES += DEPLOY_LIBRARY
 
-VERSION = 1.5.0.20
+VERSION = 1.5.0.21
 
 DEFINES += APP_VERSION='\\"$$VERSION\\"'
 

diff --git a/Deploy/metafilemanager.cpp b/Deploy/metafilemanager.cpp
@@ -43,13 +43,15 @@ bool MetaFileManager::createRunScriptWindows(const QString &target) {
                 "SET PATH=%BASE_DIR%" + distro.getLibOutDir() + ";%PATH%\n"
                 "SET CQT_PKG_ROOT=%BASE_DIR%\n"
 
-                "%2\n"
-                "call \"%BASE_DIR%" + distro.getBinOutDir() + "%0\" %1 \n";
+                "%3\n"
+                "start \"%0\" %4 \"%BASE_DIR%" + distro.getBinOutDir() + "%1\" %2 \n";
 
-        content = content.arg(targetInfo.fileName()).arg("%*");
+        content = content.arg(targetInfo.baseName(), targetInfo.fileName(), "%*");
         content = content.arg(generateCustoScriptBlok(true));
 
         content = QDir::toNativeSeparators(content);
+        content = content.arg("/B");
+
     }
 
     QString fname = DeployCore::_config->getTargetDir(target) + QDir::separator() + targetInfo.baseName()+ ".bat";

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.0.20</Version>
+    <Version>1.5.0.21</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.0.20</Version>
+    <Version>1.5.0.21</Version>
     <Title>CQtDeployer</Title>
     <Publisher>QuasarApp</Publisher>
     <StartMenuDir>CQtDeployer</StartMenuDir>

diff --git a/QIFData/packages/cqtdeployer.1_5/meta/package.xml b/QIFData/packages/cqtdeployer.1_5/meta/package.xml
@@ -2,7 +2,7 @@
 <Package>
     <DisplayName>CQtDeployer 1.5 Alpha</DisplayName>
     <Description>CQtDeployer 1.5 Alpha. Do not use this version because it is unstable and may lead to unwanted bugs or consequences. Use this version exclusively for testing new functionality.</Description>
-    <Version>1.5.0.20</Version>
+    <Version>1.5.0.21</Version>
     <Default>true</Default>
     <ForcedInstallation>false</ForcedInstallation>
     <Script>installscript.js</Script>

diff --git a/UnitTests/tst_deploytest.cpp b/UnitTests/tst_deploytest.cpp
@@ -2634,9 +2634,11 @@ void deploytest::testOutDirs() {
     runScript = file.readAll();
     file.close();
 
+    qDebug() << "runScript =" << runScript;
+
     QVERIFY(runScript.contains("SET BASE_DIR=%~dp0"));
     QVERIFY(runScript.contains("SET PATH=%BASE_DIR%\\lolLib\\;%PATH%"));
-    QVERIFY(runScript.contains("call \"%BASE_DIR%\\lol\\TestQMLWidgets.exe\" %*"));
+    QVERIFY(runScript.contains("start \"TestQMLWidgets\" /B \"%BASE_DIR%\\lol\\TestQMLWidgets.exe\" %*"));
 
 
 #endif

diff --git a/docs/en/EnvironmentVariables.md b/docs/en/EnvironmentVariables.md
@@ -0,0 +1,44 @@
+# Environment variables of the CQtDeployer
+This page contains information about environment variables of the default launcher script.
+
+## Initialization 
+All environment variables initialized in the default launcher script. So if you use the runScript option then you must be reunited all needed variables manually.
+
+
+## Variables list
+
+| Variable name  | Description  |
+|---|---|
+| CQT_PKG_ROOT  | This variable contains path to root of the current package.|
+
+## Description of definitions
+
+**Root of the current package** - This root is local root for any separate packages.
+
+
+Example :
+``` bash
+.
+├── pakcage1 << This is local root of the package1 
+│   ├── bin
+│   ├── lib
+│   ├── plugins
+│   ├── qml
+│   └── translations
+├── package2 << This is local root of the package2 
+│   ├── bin
+│   ├── lib
+│   ├── plugins
+│   ├── qml
+│   └── translations
+└── pakcage3 << This is local root of the package3
+    ├── bin
+    ├── lib
+    ├── plugins
+    ├── qml
+    └── translations
+
+```
+
+
+
diff --git a/docs/en/Home.md b/docs/en/Home.md
@@ -5,18 +5,19 @@
 
 # Main sections
 
-* [Description CQtDeployer](Description)
-* [Options](Options)
-* [Guide](Guide)
-* [Quick guide](QuickGuide)
-* [Build and Install](Build-and-Install)
-* [Deploy file](DeployConfigFile)
-* [Packing](Packing)
-* [Change log page](Changelog)
-* [Reviews](ReleaseReviews)
-* [Compare Features](CompareFeatures)
+* [Description CQtDeployer](Description.md)
+* [Options](Options.md)
+* [Guide](Guide.md)
+* [Quick guide](QuickGuide.md)
+* [Build and Install](Build-and-Install.md)
+* [Deploy file](DeployConfigFile.md)
+* [Packing](Packing.md)
+* [Change log page](Changelog.md)
+* [Reviews](ReleaseReviews.md)
+* [Compare Features](CompareFeatures.md)
 * [Adding extra files](ExtraFiles.md)
 * [Retrieving packaging templates](ExtractDefaultsTemplates.md)
+* [Default Environment Variables](EnvironmentVariables.md)
 
 
 ## Support the project

diff --git a/docs/ru/EnvironmentVariables.md b/docs/ru/EnvironmentVariables.md
@@ -0,0 +1,42 @@
+# Переменные окружения CQtDeployer
+Эта страница содержит информацию о переменных содержащихся в скрипте запуска по умолчанию.
+
+## Инициализация
+Все переменные окружения инициализируются в скрипте запуска по умолчанию. Поэтому, если вы используете опцию runScript, вам необходимо вручную воссоздать все необходимые переменные.
+
+
+## Список стандартных переменных
+
+| Имя переменной | Описание |
+| --- | --- |
+| CQT_PKG_ROOT | Эта переменная содержит путь к корню текущего пакета. 
+
+
+## Описания определений
+
+**корень текущего пакета** - Этот корень является локальным корнем для любых отдельных пакетов. 
+
+
+Пример :
+``` bash
+.
+├── pakcage1 << Это локальный корень пакета package1 
+│   ├── bin
+│   ├── lib
+│   ├── plugins
+│   ├── qml
+│   └── translations
+├── package2 << Это локальный корень пакета package2 
+│   ├── bin
+│   ├── lib
+│   ├── plugins
+│   ├── qml
+│   └── translations
+└── pakcage3 << Это локальный корень пакета package3
+    ├── bin
+    ├── lib
+    ├── plugins
+    ├── qml
+    └── translations
+
+```
diff --git a/docs/ru/Home.md b/docs/ru/Home.md
@@ -5,18 +5,19 @@
 
 # Основные разделы
 
-* [Описание CQtDeployer](Description)
-* [Параметры](Options)
-* [Руководство](Guide)
-* [Краткое Руководство](QuickGuide)
-* [Сборка и установка](Build-and-Install)
-* [Файл развертывания](DeployConfigFile)
-* [Упаковка](Packing)
-* [Список изменений](Changelog)
-* [Обзоры](ReleaseReviews)
-* [Сравнение возможностей](CompareFeatures)
+* [Описание CQtDeployer](Description.md)
+* [Параметры](Options.md)
+* [Руководство](Guide.md)
+* [Краткое Руководство](QuickGuide.md)
+* [Сборка и установка](Build-and-Install.md)
+* [Файл развертывания](DeployConfigFile.md)
+* [Упаковка](Packing.md)
+* [Список изменений](Changelog.md)
+* [Обзоры](ReleaseReviews.md)
+* [Сравнение возможностей](CompareFeatures.md)
 * [Добавление дополнительных файлов](ExtraFiles.md)
 * [Получение шаблонов упаковки](ExtractDefaultsTemplates.md)
+* [Стандартные переменные окружения](EnvironmentVariables.md)
 
 
 ## Поддержите проект

diff --git a/snap/gui/cqtdeployer.desktop b/snap/gui/cqtdeployer.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Version=1.5.0.20
+Version=1.5.0.21
 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.0.20
+X-GNOME-Bugzilla-Version=1.5.0.21
 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.0.20' # just for humans, typically '1.2+git' or '1.3.2'
+version: '1.5.0.21' # 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.