updated cmake extra targets

2025-04-26 09:44:32 +00:00 · 2020-04-08 18:31:26 +03:00 · 2020-04-08 18:31:26 +03:00 · 86ac6ecda5
commit 86ac6ecda5
parent 19d1534c49
16 changed files with 455 additions and 3 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 8bdda1b30ebac26be74aba7c5bf60ef319955de7
+Subproject commit 6e1761eceea15cc11564318d2eaa815baffd20b1
--- a/hanoi_towers/CMakeLists.txt
+++ b/hanoi_towers/CMakeLists.txt
@ -34,9 +34,12 @@ setVersion(1 6 0)

 include(../QtNetworkProtocol/QuasarAppLib/CMake/QuasarAppCITargets.cmake)

+SET(DATA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/installer/packages/HanoiTowers/data")
+
 if (WIN32)
-    initDeployQML(${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${PROJECT_NAME}.exe ${CMAKE_CURRENT_SOURCE_DIR})
+    initDeployQML(${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${PROJECT_NAME}.exe ${DATA_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 else (WIN32)
-    initDeployQML(${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR})
+    initDeployQML(${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${PROJECT_NAME} ${DATA_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+    initDeploySnap(${DATA_DIR})

 endif(WIN32)
--- a/installer/LICENSE
+++ b/installer/LICENSE
@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
--- a/installer/README.md
+++ b/installer/README.md
@ -0,0 +1,2 @@
+# DesktopInstaller
+Desktop Installer of QuasaApp projects
--- a/installer/config/banner.png
+++ b/installer/config/banner.png
--- a/installer/config/configLinux.xml
+++ b/installer/config/configLinux.xml
@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Installer>
+    <WizardDefaultWidth>640px</WizardDefaultWidth>
+    <WizardDefaultHeight>400px</WizardDefaultHeight>
+    <Name>App</Name>
+    <Version>1.2.3.1</Version>
+    <Title>App</Title>
+    <Publisher>QuasarApp</Publisher>
+    <StartMenuDir>App</StartMenuDir>
+    <TargetDir>@HomeDir@/App</TargetDir>
+    <InstallActionColumnVisible>true</InstallActionColumnVisible>
+    <RemoveTargetDir>true</RemoveTargetDir>
+    <ControlScript>controlScript.js</ControlScript>
+    <MaintenanceToolName>AppTool</MaintenanceToolName>
+    <WizardStyle>Classic</WizardStyle>
+    <StyleSheet>style.css</StyleSheet>
+    <Banner>banner.png</Banner>
+    <Logo>logo.png</Logo>
+
+    <RemoteRepositories>
+        <Repository>
+            <Url>http://quasarapp.ddns.net:3030/HanoiTowers/Linux</Url>
+            <Enabled>1</Enabled>
+            <DisplayName>QuasarApp</DisplayName>
+        </Repository>
+    </RemoteRepositories>
+</Installer>
--- a/installer/config/configWin.xml
+++ b/installer/config/configWin.xml
@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Installer>
+    <WizardDefaultWidth>640px</WizardDefaultWidth>
+    <WizardDefaultHeight>400px</WizardDefaultHeight>
+    <Name>App</Name>
+    <Version>1.2.3.1</Version>
+    <Title>App</Title>
+    <Publisher>App</Publisher>
+    <StartMenuDir>App</StartMenuDir>
+    <TargetDir>@HomeDir@/App</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/HanoiTowers/Windows</Url>
+            <Enabled>1</Enabled>
+            <DisplayName>QuasarApp</DisplayName>
+        </Repository>
+    </RemoteRepositories>
+</Installer>
--- a/installer/config/controlScript.js
+++ b/installer/config/controlScript.js
@ -0,0 +1,23 @@
+function Controller()
+{
+    installer.uninstallationFinished.connect(this, Controller.prototype.uninstallationFinished);
+    installer.installationFinished.connect(this, Controller.prototype.installationFinished);
+}
+
+
+function runProgramControl() {
+    if (systemInfo.kernelType === "winnt") {
+        installer.setValue("RunProgram", "@TargetDir@/HanoiTowers.exe");
+    } else {
+        installer.setValue("RunProgram", "@TargetDir@/HanoiTowers.sh");
+    }
+}
+
+Controller.prototype.uninstallationFinished = function() {
+
+}
+
+Controller.prototype.installationFinished = function() {
+    runProgramControl();
+}
+
--- a/installer/config/logo.png
+++ b/installer/config/logo.png
--- a/installer/config/ru.qm
+++ b/installer/config/ru.qm
@ -0,0 +1 @@
+<ｸdﾊ<>箆!ｿ`｡ｽﾝ
--- a/installer/config/ru.ts
+++ b/installer/config/ru.ts
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+</TS>
--- a/installer/config/style.css
+++ b/installer/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/installer/packages/HanoiTowers/meta/installscript.js
+++ b/installer/packages/HanoiTowers/meta/installscript.js
@ -0,0 +1,74 @@
+// Constructor
+function Component()
+{
+
+    generateTr();
+}
+
+Component.prototype.createOperations = function()
+{
+    // call default implementation to actually install README.txt!
+    component.createOperations();
+
+    if (!component.isUninstalled()) {
+        console.log("remove icons!!!");
+
+        if (systemInfo.kernelType === "winnt") {
+            console.log("create icons!!! on Windows");
+            component.addOperation("Delete",
+                                   "@DesktopDir@/@Name@.lnk");
+        }
+
+        console.log("remove icons!!!");
+
+        if (systemInfo.kernelType === "linux") {
+
+            console.log("create icons!!! on LINUX");
+            component.addOperation("Delete",
+                                   "@HomeDir@/.local/share/applications/@Name@.desktop");
+            component.addOperation("Delete",
+                                   "@HomeDir@/Desktop/@Name@.desktop");
+
+            console.log("remove icons!!! on LINUX done");
+        }
+
+    } else {
+        console.log("create icons!!!");
+
+        if (systemInfo.kernelType === "winnt") {
+
+            console.log("create icons!!! on Windows");
+            component.addOperation("CreateShortcut",
+                                   "@TargetDir@/@Name@.exe",
+                                   "@DesktopDir@/@Name@.lnk");
+        }
+
+        console.log("create icons!!!");
+
+        if (systemInfo.kernelType === "linux") {
+            console.log("create icons!!! on LINUX");
+            component.addOperation("CreateDesktopEntry",
+                                   "@HomeDir@/.local/share/applications/@Name@.desktop",
+                                   "Version=@Version@\n
+                                    Type=Application\n
+                                    Terminal=false\n
+                                    Exec=@TargetDir@/AppRun.sh\n
+                                    Name=@Name@\n
+                                    Icon=@TargetDir@/icons/icon.png\n
+                                    Name[en_US]=@Name@");
+
+            console.log("create icons!!! on LINUX done");
+        }
+    }
+}
+
+function generateTr() {
+    component.setValue("DisplayName", qsTr("HanoiTowers"));
+    component.setValue("Description", qsTr("Install HanoiTowers"));
+
+}
+
+function isNoEmpty(dir){
+    var libsArray = installer.findPath("*", [dir]);
+    return Boolean(libsArray.length);
+}
--- a/installer/packages/HanoiTowers/meta/package.xml
+++ b/installer/packages/HanoiTowers/meta/package.xml
@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<Package>
+    <DisplayName>from script</DisplayName>
+    <Description>from script</Description>
+    <Version>1.5.3.1</Version>
+    <Default>true</Default>
+    <Script>installscript.js</Script>
+    <ReleaseDate>2018-08-25</ReleaseDate>
+    <SortingPriority>200</SortingPriority>
+    <ForcedInstallation>true</ForcedInstallation>
+
+    <Translations>
+        <Translation>ru.qm</Translation>
+    </Translations>
+</Package>
--- a/installer/packages/HanoiTowers/meta/ru.qm
+++ b/installer/packages/HanoiTowers/meta/ru.qm
--- a/installer/packages/HanoiTowers/meta/ru.ts
+++ b/installer/packages/HanoiTowers/meta/ru.ts
@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ru_RU">
+<context>
+    <name>TargetWidget</name>
+    <message>
+        <source>Install dir</source>
+        <translation type="vanished">Папка установки</translation>
+    </message>
+    <message>
+        <source>Select the Installation directory</source>
+        <translation type="vanished">Выберите директорию установки</translation>
+    </message>
+</context>
+<context>
+    <name>installscript</name>
+    <message>
+        <source>Virtus Rlo Images</source>
+        <translation type="vanished">Изображения Virtus ИВС</translation>
+    </message>
+    <message>
+        <source>This package contains images for the sidebar of the rolo mode</source>
+        <translation type="vanished">Этот пакет содержит изображения для боковой панели режима ИВС</translation>
+    </message>
+    <message>
+        <source>Choose your target directory.</source>
+        <translation type="vanished">Выберите целевой каталог.</translation>
+    </message>
+    <message>
+        <source>Attention! This directory is already taken, to continue the installation, select another directory!</source>
+        <translation type="vanished">Внимание! Этот каталог уже создан, чтобы продолжить установку выберите другой каталог!</translation>
+    </message>
+    <message>
+        <source>App</source>
+        <translation type="vanished">Основные компоненнты</translation>
+    </message>
+    <message>
+        <location filename="installscript.js" line="66"/>
+        <source>HanoiTowers</source>
+        <translation>Ханойские башни</translation>
+    </message>
+    <message>
+        <location filename="installscript.js" line="67"/>
+        <source>Install HanoiTowers</source>
+        <oldsource>Install SoundBand</oldsource>
+        <translation>установка основного компонента</translation>
+    </message>
+</context>
+</TS>