alpha 1.4

2025-05-08 23:49:34 +00:00 · 2019-11-16 15:11:38 +03:00 · 2019-11-16 15:11:38 +03:00 · 69f73ce789
commit 69f73ce789
parent dd780788fe
17 changed files with 433 additions and 6 deletions
--- a/.gitignore
+++ b/.gitignore
@ -61,7 +61,7 @@ sharedQtWin64/
 distro/
 Distro/
 deployTests/
-installer/packages/cqtdeployer/data/
+QIFData/packages/cqtdeployer*/data/

 staticQt/
 staticQtWin32/
--- a/CQtDeployer.pro
+++ b/CQtDeployer.pro
@ -37,7 +37,7 @@ CQtDeployer.depends=Deploy
 QuasarAppLib.file = $$PWD/QuasarAppLib/QuasarApp.pro
 Pe.file = $$PWD/pe/pe-parser-library/pe-parser-library.pro

-include('$$PWD/installer/installerCQtDeployer.pri')
+include('$$PWD/QIFData/installerCQtDeployer.pri')
 include($$PWD/test.pri)

 DISTFILES += \
--- a/Deploy/Deploy.pro
+++ b/Deploy/Deploy.pro
@ -19,7 +19,7 @@ TEMPLATE = lib

 DEFINES += DEPLOY_LIBRARY

-VERSION = 1.3.1.1
+VERSION = 1.4.0.0

 DEFINES += APP_VERSION='\\"$$VERSION\\"'

--- a/QIFData/config/banner.png
+++ b/QIFData/config/banner.png
--- a/QIFData/config/configLinux.xml
+++ b/QIFData/config/configLinux.xml
@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Installer>
+    <WizardDefaultWidth>640px</WizardDefaultWidth>
+    <WizardDefaultHeight>400px</WizardDefaultHeight>
+    <Name>CQtDeployer</Name>
+    <Version>1.4.0.0</Version>
+    <Title>CQtDeployer</Title>
+    <Publisher>QuasarApp</Publisher>
+    <StartMenuDir>CQtDeployer</StartMenuDir>
+    <TargetDir>@HomeDir@/CQtDeployer</TargetDir>
+    <InstallActionColumnVisible>true</InstallActionColumnVisible>
+    <RemoveTargetDir>true</RemoveTargetDir>
+    <ControlScript>controlScript.js</ControlScript>
+    <MaintenanceToolName>CQtDeployerTool</MaintenanceToolName>
+    <WizardStyle>Classic</WizardStyle>
+    <StyleSheet>style.css</StyleSheet>
+    <Banner>banner.png</Banner>
+    <Logo>logo.png</Logo>
+
+    <RemoteRepositories>
+        <Repository>
+            <Url>http://quasarapp.ddns.net:3030/CQtDeployer/Linux</Url>
+            <Enabled>1</Enabled>
+            <DisplayName>QuasarApp</DisplayName>
+        </Repository>
+    </RemoteRepositories>
+</Installer>
--- a/QIFData/config/configWin.xml
+++ b/QIFData/config/configWin.xml
@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Installer>
+    <WizardDefaultWidth>640px</WizardDefaultWidth>
+    <WizardDefaultHeight>400px</WizardDefaultHeight>
+    <Name>CQtDeployer</Name>
+    <Version>1.4.0.0</Version>
+    <Title>CQtDeployer</Title>
+    <Publisher>QuasarApp</Publisher>
+    <StartMenuDir>CQtDeployer</StartMenuDir>
+    <TargetDir>@ApplicationsDir@/CQtDeployer</TargetDir>
+    <InstallActionColumnVisible>true</InstallActionColumnVisible>
+    <RemoveTargetDir>true</RemoveTargetDir>
+    <ControlScript>controlScript.js</ControlScript>
+    <MaintenanceToolName>CQtDeployerTool</MaintenanceToolName>
+    <WizardStyle>Classic</WizardStyle>
+    <StyleSheet>style.css</StyleSheet>
+    <Banner>banner.png</Banner>
+    <Logo>logo.png</Logo>
+
+    <RemoteRepositories>
+        <Repository>
+            <Url>http://quasarapp.ddns.net:3030/CQtDeployer/Windows</Url>
+            <Enabled>1</Enabled>
+            <DisplayName>QuasarApp</DisplayName>
+        </Repository>
+    </RemoteRepositories>
+</Installer>
--- a/QIFData/config/controlScript.js
+++ b/QIFData/config/controlScript.js
@ -0,0 +1,51 @@
+function Controller()
+{
+    generateTr();
+
+    installer.setMessageBoxAutomaticAnswer("OverwriteTargetDirectory", QMessageBox.Yes);
+    installer.uninstallationFinished.connect(this, Controller.prototype.uninstallationFinished);
+    installer.installationFinished.connect(this, Controller.prototype.installationFinished);
+
+
+}
+
+Controller.prototype.ComponentSelectionPageCallback = function()
+{
+    var widget = gui.currentPageWidget(); // get the current wizard page
+    if (widget !== null && installer.isInstaller()) {
+        widget.deselectAll();
+        widget.selectComponent('cqtdeployer_1_4');
+    }
+}
+
+function generateTr() {
+    console.log("generate tr start ")
+
+    installer.setValue("Name", qsTr("CQtDeployer"));
+    installer.setValue("Title", qsTr("Install CQtDeployer"));
+}
+
+Controller.prototype.uninstallationFinished = function()
+{
+
+}
+
+
+Controller.prototype.installationFinished = function()
+{
+
+    if (systemInfo.kernelType === "winnt") {
+
+        QMessageBox["information"](qsTr("install in system"), qsTr("Installer"),
+            qsTr("CQtDeployer successfully installed on your computer to use the call \"%cqtdeployer%\"."),
+                 QMessageBox.Ok);
+
+    } else {
+
+        QMessageBox["information"](qsTr("install in system"), qsTr("Installer"),
+            qsTr("CQtDeployer successfully installed on your computer to use the call \"cqtdeployer\"."),
+                 QMessageBox.Ok);
+    }
+
+
+}
--- a/QIFData/config/icon.ico
+++ b/QIFData/config/icon.ico
--- a/QIFData/config/logo.png
+++ b/QIFData/config/logo.png
--- a/QIFData/config/ru.ts
+++ b/QIFData/config/ru.ts
@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ru_RU">
+<context>
+    <name>controlScript</name>
+    <message>
+        <location filename="controlScript.js" line="24"/>
+        <source>CQtDeployer</source>
+        <translation>CQtDeployer</translation>
+    </message>
+    <message>
+        <location filename="controlScript.js" line="25"/>
+        <source>Install CQtDeployer</source>
+        <oldsource>Install Snake</oldsource>
+        <translation>Установка CQtDeployer</translation>
+    </message>
+    <message>
+        <location filename="controlScript.js" line="39"/>
+        <location filename="controlScript.js" line="45"/>
+        <source>install in system</source>
+        <translation>Установка в систему</translation>
+    </message>
+    <message>
+        <location filename="controlScript.js" line="39"/>
+        <location filename="controlScript.js" line="45"/>
+        <source>Installer</source>
+        <translation>Установщик</translation>
+    </message>
+    <message>
+        <location filename="controlScript.js" line="46"/>
+        <source>CQtDeployer successfully installed on your computer to use the call &quot;cqtdeployer&quot;.</source>
+        <oldsource>To uninstall cqtdeployer on your system, you need administrator rights!. </oldsource>
+        <translation type="unfinished">Чтобы удалить cqtdeployer в вашей системе, вам нужны права администратора !. </translation>
+    </message>
+    <message>
+        <source>To install cqtdeployer on your system, you need administrator rights!. </source>
+        <translation type="vanished">Чтобы установить cqtdeployer в вашей системе, вам нужны права администратора!. </translation>
+    </message>
+    <message>
+        <source>The installation was successful, but cqtdeployer will not be available from the console. </source>
+        <translation type="vanished">Установка прошла успешно, но cqtdeployer не будет доступен из консоли. </translation>
+    </message>
+    <message>
+        <location filename="controlScript.js" line="40"/>
+        <source>CQtDeployer successfully installed on your computer to use the call &quot;%cqtdeployer%&quot;.</source>
+        <oldsource>To take advantage of this program you will need to enter the full path to it. </oldsource>
+        <translation type="unfinished">Чтобы воспользоваться этой программой, вам нужно будет ввести полный путь к ней. </translation>
+    </message>
+    <message>
+        <source>Example: </source>
+        <translation type="vanished">Пример: </translation>
+    </message>
+</context>
+</TS>
--- a/QIFData/config/style.css
+++ b/QIFData/config/style.css
@ -0,0 +1,62 @@
+.QWidget {
+    background-color: rgb(255, 255, 255);
+    min-width: 640px;
+}
+
+.QLabel {
+    color: #000000;
+}
+
+.QPushButton {
+    background-color: transparent;
+    border: 2px solid #ffffff;
+    border-radius: 3px;
+    height: 30px;
+    min-width: 100px;
+    padding: 0 15px;
+}
+
+.QPushButton:pressed,
+.QPushButton:checked {
+    background-color: #2ed3ed;
+}
+
+.QPushButton:focus {
+    background-color: #aaf2ff;
+}
+
+.QPushButton:hover {
+    border: 2px solid #2ed3ed;
+}
+
+
+.QProgressBar {
+    background: #b1dbcc;
+    border: 1px solid #cdcdcd;
+    border-radius: 2px;
+    padding: 0;
+    margin: 0;
+    color: #ffffff;
+    height: 30px;
+    text-align: center;
+}
+
+.QProgressBar::chunk {
+    background: #16dbcc;
+    border-radius: 2px;
+    margin: 0;
+}
+
+.QProgressBar:hover {
+    border-color: #2ed3ed;
+}
+
+.QLineEdit {
+    background-color: transparent;
+    border-color: #cdcdcd;
+    height: 30px;
+}
+
+.QLineEdit:hover {
+    border-color: #2ed3ed;
+}
--- a/QIFData/installerCQtDeployer.pri
+++ b/QIFData/installerCQtDeployer.pri
@ -0,0 +1,84 @@
+include($$PWD/../installer/InstallerBase.pri);
+mkpath( $$PWD/../Distro)
+win32:OUT_FILE = CQtDeployerInstaller.exe
+unix:OUT_FILE = CQtDeployerInstaller.run
+
+win32:OUT_FILE_OFF = CQtDeployerOfflineInstaller.exe
+unix:OUT_FILE_OFF = CQtDeployerOfflineInstaller.run
+
+DEPLOY_TARGET = $$PWD/../CQtDeployer/build/release
+
+DATA_DIR = $$PWD/packages/cqtdeployer_1_4/data/1.4
+META_DIR = $$PWD/packages/cqtdeployer_1_4/meta/
+
+win32:OUT_LIB= -libOut .
+win32:OUT_BIN= -binOut .
+
+BASE_DEPLOY_FLAGS = clear -qmake $$QMAKE_BIN -libDir $$PWD/../ -recursiveDepth 4 -ignoreEnv $$DEPLOY_TARGET
+BASE_DEPLOY_FLAGS_CQT = $$BASE_DEPLOY_FLAGS -targetDir $$DATA_DIR $$OUT_LIB $$OUT_BIN
+
+deploy_dep.commands += $$DEPLOYER -bin $$DEPLOY_TARGET $$BASE_DEPLOY_FLAGS_CQT
+
+mkpath( $$PWD/../Distro)
+
+win32:CONFIG_FILE = $$PWD/config/configWin.xml
+unix:CONFIG_FILE = $$PWD/config/configLinux.xml
+
+deployOffline.commands = $$EXEC \
+                       --offline-only \
+                       -c $$CONFIG_FILE \
+                       -p $$PWD/packages \
+                       $$PWD/../Distro/$$OUT_FILE_OFF
+
+deploy.depends = deploy_dep
+deploy.depends += deployOffline
+
+win32:ONLINE_REPO_DIR = $$ONLINE/CQtDeployer/Windows
+unix:ONLINE_REPO_DIR = $$ONLINE/CQtDeployer/Linux
+
+create_repo.commands = $$REPOGEN \
+                        --update-new-components \
+                        -p $$PWD/packages \
+                        $$ONLINE_REPO_DIR
+
+chmodSnap.commands = chmod 777 -R $$DATA_DIR
+unix:release.depends += chmodSnap
+
+
+message( ONLINE_REPO_DIR $$ONLINE_REPO_DIR)
+!isEmpty( ONLINE ) {
+
+    message(online)
+
+    release.depends = create_repo
+
+    deploy.commands = $$EXEC \
+                           --online-only \
+                           -c $$CONFIG_FILE \
+                           -p $$PWD/packages \
+                           $$PWD/../Distro/$$OUT_FILE
+}
+
+releaseSnap.commands = rm *.snap -rdf && chmod 777 -R $$PWD/../prime && snapcraft && snapcraft push *.snap # bad patern
+buildSnap.commands = snapcraft
+clearSnap.commands = rm parts prime stage *.snap -rdf
+
+unix:release.depends += clearSnap
+unix:release.depends += buildSnap
+unix:release.depends += releaseSnap
+
+OTHER_FILES += \
+    $$META_DIR/* \
+    $$PWD/config/*.*
+
+
+QMAKE_EXTRA_TARGETS += \
+    deploy_dep \
+    deployOffline \
+    deploy \
+    create_repo \
+    release \
+    clearSnap \
+    releaseSnap \
+    buildSnap \
+    chmodSnap
--- a/QIFData/packages/cqtdeployer_1_3/meta/installscript.js
+++ b/QIFData/packages/cqtdeployer_1_3/meta/installscript.js
@ -0,0 +1,52 @@
+var VERSION = "1.4"
+
+function Component()
+{
+    generateTr();
+}
+
+function generateTr() {
+    component.setValue("DisplayName", qsTr("CQtDeployer " + VERSION));
+    component.setValue("Description", qsTr("This package contains CQtDeployer version " + VERSION));
+}
+
+
+Component.prototype.createOperations = function()
+{
+//    // call default implementation to actually install README.txt!
+    component.createOperations();
+    systemIntegration();
+
+}
+
+function systemIntegration() {
+    targetDir = installer.value("TargetDir", "");
+    homeDir = installer.value("HomeDir", "");
+
+    console.log("install component")
+    console.log("targetDir "  + targetDir)
+    console.log("hometDir "  + homeDir)
+
+    if (systemInfo.kernelType === "winnt") {
+
+        component.addOperation('Execute', ["SETX", "cqtdeployer", "\"" + targetDir + "/" + VERSION + "/cqtdeployer.exe\""])
+
+
+    } else {
+
+        if (!installer.fileExists(homeDir + "/.local/bin")) {
+
+            component.addOperation('Execute', ["mkpath", "-p", homeDir + "/.local/bin"])
+
+            QMessageBox["warning"](qsTr("install in system"), qsTr("Installer"),
+                qsTr("The \"~/local/bin\" folder was not initialized, you may need to reboot to work correctly!"),
+                                   QMessageBox.Ok);
+
+        }
+        component.addOperation('Execute', ["ln", "-sf", targetDir + "/" + VERSION + "/cqtdeployer.sh",
+                                           homeDir + "/.local/bin/cqtdeployer"],
+                               "UNDOEXECUTE", ["rm", "-f", homeDir + "/.local/bin/cqtdeployer"] )
+
+    }
+
+}
--- a/QIFData/packages/cqtdeployer_1_3/meta/package.xml
+++ b/QIFData/packages/cqtdeployer_1_3/meta/package.xml
@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<Package>
+    <DisplayName>CQtDeployer 1.4</DisplayName>
+    <Description>CQtDeployer 1.4</Description>
+    <Version>1.4.0.0</Version>
+    <Default>true</Default>
+    <ForcedInstallation>false</ForcedInstallation>
+    <Script>installscript.js</Script>
+    <ReleaseDate>2019-09-30</ReleaseDate>
+    <SortingPriority>201</SortingPriority>
+    <Translations>
+        <Translation>ru.qm</Translation>
+    </Translations>
+</Package>
--- a/QIFData/packages/cqtdeployer_1_3/meta/ru.ts
+++ b/QIFData/packages/cqtdeployer_1_3/meta/ru.ts
@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ru_RU">
+<context>
+    <name>installscript</name>
+    <message>
+        <source>CQtDeployer 1.3</source>
+        <oldsource>CQtDeployer</oldsource>
+        <translation type="obsolete">CQtDeployer</translation>
+    </message>
+    <message>
+        <source>This package contains CQtDeployer version 1.3</source>
+        <oldsource>This package contains CQtDeployer</oldsource>
+        <translation type="obsolete">Этот пакет содержит CQtDeployer</translation>
+    </message>
+    <message>
+        <location filename="installscript.js" line="41"/>
+        <source>install in system</source>
+        <translation>Установка в систему</translation>
+    </message>
+    <message>
+        <location filename="installscript.js" line="41"/>
+        <source>Installer</source>
+        <translation>Установщик</translation>
+    </message>
+    <message>
+        <location filename="installscript.js" line="42"/>
+        <source>The &quot;~/local/bin&quot; folder was not initialized, you may need to reboot to work correctly!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To uninstall cqtdeployer on your system, you need administrator rights!. </source>
+        <translation type="vanished">Чтобы удалить cqtdeployer в вашей системе, вам нужны права администратора !. </translation>
+    </message>
+    <message>
+        <source>To install cqtdeployer on your system, you need administrator rights!. </source>
+        <translation type="vanished">Чтобы установить cqtdeployer в вашей системе, вам нужны права администратора!. </translation>
+    </message>
+    <message>
+        <source>The installation was successful, but cqtdeployer will not be available from the console. </source>
+        <translation type="vanished">Установка прошла успешно, но cqtdeployer не будет доступен из консоли. </translation>
+    </message>
+    <message>
+        <source>To take advantage of this program you will need to enter the full path to it. </source>
+        <translation type="vanished">Чтобы воспользоваться этой программой, вам нужно будет ввести полный путь к ней. </translation>
+    </message>
+    <message>
+        <source>Example: </source>
+        <translation type="vanished">Пример: </translation>
+    </message>
+    <message>
+        <source>CQtDeployer successfully installed on your computer to use the call &quot;cqtdeployer&quot;.</source>
+        <translation type="vanished">CQtDeployer успешно установлен на вашем компьютере, чтобы использоваться введите в консоле &quot;cqtdeployer&quot;.</translation>
+    </message>
+</context>
+</TS>
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 7f33ec1794a96001d81a9ab9e9d966609987d50c
+Subproject commit 47af873542c9fc5cc56e624fdd9dbd3606ecd9c0
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@ -6,7 +6,7 @@
 #

 name: cqtdeployer # you probably want to 'snapcraft register <name>'
-version: '1.3.1.1' # just for humans, typically '1.2+git' or '1.3.2'
+version: '1.4.0.0' # 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.
@ -29,7 +29,7 @@ parts:
    # See 'snapcraft plugins'

    plugin: dump
-    source: installer/packages/cqtdeployer_1_3/data/1.3
+    source: installer/packages/cqtdeployer_1_4/data/1.4

    after: [cqtdeployer-wrapper]
  cqtdeployer-wrapper: