QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-05-09 07:59:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'v1.2'

Browse Source
This commit is contained in:
Andrei Yankovich 2019-05-22 09:44:37 +03:00
commit b5723bea7f
4 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Deploy/deployutils.cpp
View File

@ -108,10 +108,10 @@ void DeployUtils::help() {
qInfo() << " | WARNING: this flag supports 'so', 'dll' and 'exe' files only."; qInfo() << " | WARNING: this flag supports 'so', 'dll' and 'exe' files only.";
qInfo() << " | Use '-bin' flag if you want to deploy linux binary files"; qInfo() << " | Use '-bin' flag if you want to deploy linux binary files";
qInfo() << " -qmlDir [params] : Qml data dir. For example -qmlDir ~/my/project/qml"; qInfo() << " -qmlDir [params] : Qml data dir. For example -qmlDir ~/my/project/qml";
qInfo() << " deploy-not-qt : Deploys all the libs"; qInfo() << " deploySystem : Deploys all libs";
qInfo() << " -qmake [params] : Qmake path."; qInfo() << " -qmake [params] : Qmake path.";
qInfo() << " | For example -qmake ~/Qt/5.11.1/gcc_64/bin/qmake"; qInfo() << " | For example -qmake ~/Qt/5.11.1/gcc_64/bin/qmake";
qInfo() << " -ignore [list,params] : The list of the libs to ignore."; qInfo() << " -ignore [list,params] : The list of libs to ignore.";
qInfo() << " | For example -ignore libicudata.so.56,libicudata2.so.56"; qInfo() << " | For example -ignore libicudata.so.56,libicudata2.so.56";
qInfo() << " -ignoreEnv [list,params] : The list of the environment to ignore"; qInfo() << " -ignoreEnv [list,params] : The list of the environment to ignore";
qInfo() << " | For example -ignoreEnv /bad/dir,/my/bad/Dir"; qInfo() << " | For example -ignoreEnv /bad/dir,/my/bad/Dir";
@ -121,7 +121,7 @@ void DeployUtils::help() {
qInfo() << " -libDir [list,params] : Sets additional paths for extra libs of an app."; qInfo() << " -libDir [list,params] : Sets additional paths for extra libs of an app.";
qInfo() << " | For example -libDir /myLib,/newLibs "; qInfo() << " | For example -libDir /myLib,/newLibs ";
qInfo() << " -extraPlugin[list,params]: Sets an additional path to extraPlugin of an app"; qInfo() << " -extraPlugin[list,params]: Sets an additional path to extraPlugin of an app";
qInfo() << " -recursiveDepth [params] : Sets the Depth of recursive search of the libs (default 0)"; qInfo() << " -recursiveDepth [params] : Sets the Depth of recursive search of libs (default 0)";
qInfo() << " -targetDir [params] : Sets target directory(by default it is the path to the first deployable file)"; qInfo() << " -targetDir [params] : Sets target directory(by default it is the path to the first deployable file)";
qInfo() << " noStrip : Skips strip step"; qInfo() << " noStrip : Skips strip step";
qInfo() << " noTranslations : Skips the translations files."; qInfo() << " noTranslations : Skips the translations files.";

6
README.md
View File

@ -24,10 +24,10 @@ Key differences of this program:
| -bin [list, params] | Deployable file or folder. For example -bin ~/my/project/bin/,~/my/project/bin.exe| | -bin [list, params] | Deployable file or folder. For example -bin ~/my/project/bin/,~/my/project/bin.exe|
| -binDir [params] | A folder which includes deployable files (recursive search). WARNING: this flag supports 'so', 'dll' and 'exe' files only. Use '-bin' flag if you want to deploy linux binary files | | -binDir [params] | A folder which includes deployable files (recursive search). WARNING: this flag supports 'so', 'dll' and 'exe' files only. Use '-bin' flag if you want to deploy linux binary files |
| -qmlDir [params] | Qml data dir. For example -qmlDir ~/my/project/qml | | -qmlDir [params] | Qml data dir. For example -qmlDir ~/my/project/qml |
| deploySystem | Deploys all the libs | | deploySystem | Deploys all libs |
| -qmake [params] | Qmake path. For example | | -qmake [params] | Qmake path. For example |
| | -qmake ~/Qt/5.11.1/gcc_64/bin/qmake | | | -qmake ~/Qt/5.11.1/gcc_64/bin/qmake |
| -ignore [list,params] | The list of the libs to ignore. | | -ignore [list,params] | The list of libs to ignore. |
| | For example -ignore libicudata.so.56,libicudata2.so.56 | | | For example -ignore libicudata.so.56,libicudata2.so.56 |
| -ignoreEnv [list,params] | The list of the environment to ignore. | | -ignoreEnv [list,params] | The list of the environment to ignore. |
| | For example -ignoreEnv /bad/dir,/my/bad/Dir | | | For example -ignoreEnv /bad/dir,/my/bad/Dir |
@ -38,7 +38,7 @@ Key differences of this program:
| -libDir [list,params] | Sets additional paths for extra libs of an app. | | -libDir [list,params] | Sets additional paths for extra libs of an app. |
| | For example -libDir ~/myLib,~/newLibs | | | For example -libDir ~/myLib,~/newLibs |
| -extraPlugin [list,params] | Sets an additional path to extraPlugin of an app | | -extraPlugin [list,params] | Sets an additional path to extraPlugin of an app |
| -recursiveDepth [params] | Sets the Depth of recursive search of the libs (default 0) | | -recursiveDepth [params] | Sets the Depth of recursive search of libs (default 0) |
| -targetDir [params] | Sets target directory(by default it is the path to the first deployable file)| | -targetDir [params] | Sets target directory(by default it is the path to the first deployable file)|
| noStrip | Skips strip step | | noStrip | Skips strip step |
| noTranslations | Skips the translations files. | | noTranslations | Skips the translations files. |

33
installer/config/ru.ts
View File

@ -16,15 +16,17 @@
</message> </message>
<message> <message>
<location filename="controlScript.js" line="25"/> <location filename="controlScript.js" line="25"/>
<location filename="controlScript.js" line="53"/> <location filename="controlScript.js" line="55"/>
<location filename="controlScript.js" line="72"/> <location filename="controlScript.js" line="64"/>
<location filename="controlScript.js" line="73"/>
<source>install in system</source> <source>install in system</source>
<translation>Установка в систему</translation> <translation>Установка в систему</translation>
</message> </message>
<message> <message>
<location filename="controlScript.js" line="25"/> <location filename="controlScript.js" line="25"/>
<location filename="controlScript.js" line="53"/> <location filename="controlScript.js" line="55"/>
<location filename="controlScript.js" line="72"/> <location filename="controlScript.js" line="64"/>
<location filename="controlScript.js" line="73"/>
<source>Installer</source> <source>Installer</source>
<translation>Установщик</translation> <translation>Установщик</translation>
</message> </message>
@ -34,27 +36,30 @@
<translation>Чтобы удалить cqtdeployer в вашей системе, вам нужны права администратора !. </translation> <translation>Чтобы удалить cqtdeployer в вашей системе, вам нужны права администратора !. </translation>
</message> </message>
<message> <message>
<location filename="controlScript.js" line="54"/> <location filename="controlScript.js" line="65"/>
<source>To install cqtdeployer on your system, you need administrator rights!. </source> <source>The &quot;~/local/bin&quot; folder was not initialized, you may need to reboot to work correctly!</source>
<translation>Чтобы установить cqtdeployer в вашей системе, вам нужны права администратора!. </translation> <translation type="unfinished"></translation>
</message>
<message>
<source>To install cqtdeployer on your system, you need administrator rights!. </source>
<translation type="vanished">Чтобы установить cqtdeployer в вашей системе, вам нужны права администратора!. </translation>
</message> </message>
<message> <message>
<location filename="controlScript.js" line="55"/>
<source>The installation was successful, but cqtdeployer will not be available from the console. </source> <source>The installation was successful, but cqtdeployer will not be available from the console. </source>
<translation>Установка прошла успешно, но cqtdeployer не будет доступен из консоли. </translation> <translation type="vanished">Установка прошла успешно, но cqtdeployer не будет доступен из консоли. </translation>
</message> </message>
<message> <message>
<location filename="controlScript.js" line="56"/> <location filename="controlScript.js" line="56"/>
<source>To take advantage of this program you will need to enter the full path to it. </source> <source>CQtDeployer successfully installed on your computer to use the call &quot;%cqtdeployer%&quot;.</source>
<translation>Чтобы воспользоваться этой программой, вам нужно будет ввести полный путь к ней. </translation> <oldsource>To take advantage of this program you will need to enter the full path to it. </oldsource>
<translation type="unfinished">Чтобы воспользоваться этой программой, вам нужно будет ввести полный путь к ней. </translation>
</message> </message>
<message> <message>
<location filename="controlScript.js" line="57"/>
<source>Example: </source> <source>Example: </source>
<translation>Пример: </translation> <translation type="vanished">Пример: </translation>
</message> </message>
<message> <message>
<location filename="controlScript.js" line="73"/> <location filename="controlScript.js" line="74"/>
<source>CQtDeployer successfully installed on your computer to use the call &quot;cqtdeployer&quot;.</source> <source>CQtDeployer successfully installed on your computer to use the call &quot;cqtdeployer&quot;.</source>
<translation>CQtDeployer успешно установлен на вашем компьютере, чтобы запустить напишите &quot;cqtdeployer&quot; в консоли.</translation> <translation>CQtDeployer успешно установлен на вашем компьютере, чтобы запустить напишите &quot;cqtdeployer&quot; в консоли.</translation>
</message> </message>

2
installer/packages/cqtdeployer/meta/package.xml
View File

@ -2,7 +2,7 @@
<Package> <Package>
<DisplayName>CQtDeployer</DisplayName> <DisplayName>CQtDeployer</DisplayName>
<Description>CQtDeployer</Description> <Description>CQtDeployer</Description>
<Version>1.2.1.5</Version> <Version>1.2.1.6</Version>
<Default>true</Default> <Default>true</Default>
<ForcedInstallation>false</ForcedInstallation> <ForcedInstallation>false</ForcedInstallation>
<Script>installscript.js</Script> <Script>installscript.js</Script>