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

Merge pull request #401 from QuasarApp/v1.5

Browse Source 
V1.5
This commit is contained in:
Andrei Yankovich 2020-07-22 18:27:30 +03:00 committed by GitHub
commit 1ac22c604c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Deploy/Deploy.pro
View File

@ -19,7 +19,7 @@ TEMPLATE = lib
DEFINES += DEPLOY_LIBRARY
VERSION = 1.4.5.0
VERSION = 1.4.5.1
DEFINES += APP_VERSION='\\"$$VERSION\\"'

23
Deploy/extracter.cpp
View File

@ -53,16 +53,24 @@ bool Extracter::extractWebEngine() {
const auto &package = i.key();
if (isWebEngine(package)) {
auto webEngeneBin = cnf->qtDir.getLibexecs();
if (cnf->qtDir.getQtPlatform() & Platform::Unix) {
webEngeneBin += "/QtWebEngineProcess";
} else {
webEngeneBin += "/QtWebEngineProcess.exe";
}
auto destWebEngine = cnf->getTargetDir() + "/" + package + cnf->packages()[package].getBinOutDir();
auto resOut = cnf->getTargetDir() + "/" + package + cnf->packages()[package].getResOutDir();
auto libOut = cnf->getTargetDir() + "/" + package + cnf->packages()[package].getLibOutDir();
auto res = cnf->qtDir.getResources();
if (!_fileManager->copyFiles(angleGLLibs(), libOut)) {
return false;
}
if (!_fileManager->copyFile(webEngeneBin, destWebEngine)) {
return false;
}
@ -76,6 +84,21 @@ bool Extracter::extractWebEngine() {
return true;
}
QList<QString> Extracter::angleGLLibs() {
auto cnf = DeployCore::_config;
if (cnf->qtDir.getQtPlatform() & Platform::Win) {
return {
cnf->qtDir.getBins() + "/d3dcompiler_47.dll",
cnf->qtDir.getBins() + "/libEGL.dll",
cnf->qtDir.getBins() + "/libGLESv2.dll",
};
}
return {};
}
void Extracter::extractAllTargets() {
auto cfg = DeployCore::_config;
for (auto i = cfg->packages().cbegin(); i != cfg->packages().cend(); ++i) {

8
Deploy/extracter.h
View File

@ -54,6 +54,14 @@ private:
bool deployMSVC();
bool extractWebEngine();
/**
* @brief angleGLLibs -
* @note see task 398 (https://github.com/QuasarApp/CQtDeployer/issues/398)
* @return
*/
QList<QString> angleGLLibs();
/**
* @brief compress - this function join all target dependecies in to one struct
*/

2
QIFData/config/configLinux.xml
View File

@ -3,7 +3,7 @@
<WizardDefaultWidth>640px</WizardDefaultWidth>
<WizardDefaultHeight>400px</WizardDefaultHeight>
<Name>CQtDeployer</Name>
<Version>1.4.5.0</Version>
<Version>1.4.5.1</Version>
<Title>CQtDeployer</Title>
<Publisher>QuasarApp</Publisher>
<StartMenuDir>CQtDeployer</StartMenuDir>

2
QIFData/config/configWin.xml
View File

@ -3,7 +3,7 @@
<WizardDefaultWidth>640px</WizardDefaultWidth>
<WizardDefaultHeight>400px</WizardDefaultHeight>
<Name>CQtDeployer</Name>
<Version>1.4.5.0</Version>
<Version>1.4.5.1</Version>
<Title>CQtDeployer</Title>
<Publisher>QuasarApp</Publisher>
<StartMenuDir>CQtDeployer</StartMenuDir>

4
QIFData/packages/cqtdeployer.1_4/meta/package.xml
View File

@ -2,11 +2,11 @@
<Package>
<DisplayName>CQtDeployer 1.4</DisplayName>
<Description>CQtDeployer 1.4</Description>
<Version>1.4.5.0</Version>
<Version>1.4.5.1</Version>
<Default>true</Default>
<ForcedInstallation>false</ForcedInstallation>
<Script>installscript.js</Script>
<ReleaseDate>2020-07-09</ReleaseDate>
<ReleaseDate>2020-08-22</ReleaseDate>
<SortingPriority>201</SortingPriority>
<Translations>
<Translation>ru.qm</Translation>

4
snap/gui/cqtdeployer.desktop
View File

@ -1,5 +1,5 @@
[Desktop Entry]
Version=1.4.5.0
Version=1.4.5.1
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.4.5.0
X-GNOME-Bugzilla-Version=1.4.5.1
StartupNotify=true
Name[ru_RU]=CQtDeployer

2
snap/snapcraft.yaml
View File

@ -6,7 +6,7 @@
#
name: cqtdeployer # you probably want to 'snapcraft register <name>'
version: '1.4.5.0' # just for humans, typically '1.2+git' or '1.3.2'
version: '1.4.5.1' # 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.