diff --git a/CMakeLists.txt b/CMakeLists.txt index d11df5b..6a2dc75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,7 +66,6 @@ SET(PRODUCT_VER_Re 0) file(MAKE_DIRECTORY ${TARGET_DIR}) -initAll() addDoc(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf) find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED) @@ -133,6 +132,4 @@ if (HANOI_SERVER) add_subdirectory(HanoiTowers/Server) endif() - - - +initAll() diff --git a/Deploy/Client.json b/Deploy/Client.json index 6b24e38..571ccb2 100755 --- a/Deploy/Client.json +++ b/Deploy/Client.json @@ -21,5 +21,6 @@ "qif": "./../installer", "icon": "./../HanoiTowers/client/res/iconInstall.png", "deb": true, + "zip": true, "targetDir": "./../Distro" } diff --git a/HanoiTowers/client/CMakeLists.txt b/HanoiTowers/client/CMakeLists.txt index 9eb9329..de7101d 100644 --- a/HanoiTowers/client/CMakeLists.txt +++ b/HanoiTowers/client/CMakeLists.txt @@ -67,13 +67,13 @@ else() # Desctop deploying addDeployFromCustomFile("Client" "${CMAKE_SOURCE_DIR}/Deploy/Client.json") -# if (UNIX) -# #addDeployQIF("Client" ${INSTALLER_DIR} ${TARGET_DIR} "${INSTALLER_DIR}/config/configLinux.xml") -# #addDeploySnap("Client" ${TARGET_DIR}) + if (UNIX) + #addDeployQIF("Client" ${INSTALLER_DIR} ${TARGET_DIR} "${INSTALLER_DIR}/config/configLinux.xml") + addDeploySnap("Client" ${TARGET_DIR}) -# #addReleaseSnap("Client") + #addReleaseSnap("Client") -# endif() + endif() endif() #addReleaseQif("Client" ${DATA_DIR} ${TARGET_DIR}) diff --git a/snap/gui/Hanoi-Tower.desktop b/snap/gui/Hanoi-Tower.desktop index e7661f2..64ac115 100755 --- a/snap/gui/Hanoi-Tower.desktop +++ b/snap/gui/Hanoi-Tower.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Version=1.5.2 +Version=1.6.0 Name=Hanoi Towers Comment=Hanoi Towers Game. Exec=hanoi-tower @@ -10,6 +10,6 @@ Categories=Games;Application; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=hanoi-tower X-GNOME-Bugzilla-Component=General -X-GNOME-Bugzilla-Version=1.5.2 +X-GNOME-Bugzilla-Version=1.6.0 StartupNotify=true -Name[ru_RU]=Hanoi-Tower +Name[ru_RU]=Ханойские башни diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 3912adf..6951242 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -9,8 +9,8 @@ description: | grade: stable # must be 'stable' to release into candidate/stable channels confinement: strict # use 'strict' once you have the right plugs and slots -base: core18 -icon: installer/packages/HanoiTowers/data/icons/icon.png +base: core20 +icon: installer/configicon.png apps: hanoi-tower: @@ -31,7 +31,7 @@ parts: qtlib: plugin: dump - source: installer/packages/HanoiTowers/data + source: Distro/packages/HanoiTowers/data libsgl: plugin: nil diff --git a/submodules/Credits b/submodules/Credits index a765010..afb5e5a 160000 --- a/submodules/Credits +++ b/submodules/Credits @@ -1 +1 @@ -Subproject commit a765010efa2b4eafcb6a151e7f56ede04d0a9333 +Subproject commit afb5e5a40501066673c480adeed3314fe2b6b197 diff --git a/submodules/Heart b/submodules/Heart index 239fc7d..7e34171 160000 --- a/submodules/Heart +++ b/submodules/Heart @@ -1 +1 @@ -Subproject commit 239fc7dae74a4e88fc379162428d3ca5217d2a5a +Subproject commit 7e34171d9d8125a4eac896f112688fdb9d6e9630