From 0c3a92b4a28ef4bf965e8a2bbe73d60fbc2ade3d Mon Sep 17 00:00:00 2001 From: greedysky Date: Fri, 16 Sep 2022 19:33:42 +0800 Subject: [PATCH] Bump version 2.15.12.0 Final --- CMakeLists.txt | 2 +- Doxyfile | 2 +- README.md | 2 +- README_cn.md | 2 +- README_tc.md | 2 +- TTKCommon/ttkversion.h | 12 ++++++------ TTKResource/_extras/TTKRoutine.sh | 2 +- TTKScript/auc/make_auc.bat | 2 +- TTKScript/deploy/make_desktop.sh | 2 +- .../deploy/share/appdata/ttkmusicplayer.appdata.xml | 1 + TTKScript/linux_time.sh | 2 +- TTKScript/ttk.iss | 2 +- TTKVersion.pri | 4 ++-- 13 files changed, 19 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 29ccadfecb..5dc2d5541b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.8.11) -set(TTK_MAJOR_VERSION "2.15.11") +set(TTK_MAJOR_VERSION "2.15.12") set(TTK_VERSION ${TTK_MAJOR_VERSION}.0) # Find includes in the build directories diff --git a/Doxyfile b/Doxyfile index 731dab8e10..f9f90e24ce 100644 --- a/Doxyfile +++ b/Doxyfile @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = TTKMusicplayer -PROJECT_NUMBER = 2.15.11.0 +PROJECT_NUMBER = 2.15.12.0 PROJECT_BRIEF = "TTKMusicPlayer that imitation Kugou music, the music player use of qmmp core library based on Qt for windows and linux" PROJECT_LOGO = TTKResource/lb_app_logo.png OUTPUT_DIRECTORY = TTKDocs diff --git a/README.md b/README.md index 27e176b5e6..556dbf4d63 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [简体中文 Chinese](./README_cn.md) | [繁体中文 Chinese](./README_tc.md) ![TTKMusicplayer](https://img.shields.io/badge/Greedysky-TTKMusicPlayer-green.svg?style=flat-square) -![Version](https://img.shields.io/badge/Version-2.15.11.0-blue.svg?style=flat-square) +![Version](https://img.shields.io/badge/Version-2.15.12.0-blue.svg?style=flat-square) ![License](https://img.shields.io/badge/License-GPL%20V3-yellowgreen.svg?style=flat-square) ![LOGO](https://github.com/Greedysky/Resource/blob/master/Screen/logo_pic.png?raw=true) diff --git a/README_cn.md b/README_cn.md index 4204500c05..6dd89648f0 100644 --- a/README_cn.md +++ b/README_cn.md @@ -2,7 +2,7 @@ [英文 English](./README.md) | [繁体中文 Chinese](./README_tc.md) ![TTKMusicplayer](https://img.shields.io/badge/Greedysky-TTKMusicPlayer-green.svg?style=flat-square) -![版本](https://img.shields.io/badge/Version-2.15.11.0-blue.svg?style=flat-square) +![版本](https://img.shields.io/badge/Version-2.15.12.0-blue.svg?style=flat-square) ![许可](https://img.shields.io/badge/License-GPL%20V3-yellowgreen.svg?style=flat-square) ![徽标](https://github.com/Greedysky/Resource/blob/master/Screen/logo_pic.png?raw=true) diff --git a/README_tc.md b/README_tc.md index 57705d0418..7c30a6892b 100644 --- a/README_tc.md +++ b/README_tc.md @@ -2,7 +2,7 @@ [简体中文 Chinese](./README_cn.md) | [英文 English](./README.md) ![TTKMusicplayer](https://img.shields.io/badge/Greedysky-TTKMusicPlayer-green.svg?style=flat-square) -![版本](https://img.shields.io/badge/Version-2.15.11.0-blue.svg?style=flat-square) +![版本](https://img.shields.io/badge/Version-2.15.12.0-blue.svg?style=flat-square) ![許可](https://img.shields.io/badge/License-GPL%20V3-yellowgreen.svg?style=flat-square) ![徽標](https://github.com/Greedysky/Resource/blob/master/Screen/logo_pic.png?raw=true) diff --git a/TTKCommon/ttkversion.h b/TTKCommon/ttkversion.h index feac01ce6a..ca0a6cdec4 100644 --- a/TTKCommon/ttkversion.h +++ b/TTKCommon/ttkversion.h @@ -158,19 +158,19 @@ * with this program; If not, see . ***************************************************************************/ -//update time 2022.07.01 -#define TTK_VERSION 0x02FB0 -#define TTK_VERSION_STR "2.15.11.0" -#define TTK_VERSION_TIME_STR "(2022/07/01)" +//update time 2022.09.15 +#define TTK_VERSION 0x02FC0 +#define TTK_VERSION_STR "2.15.12.0" +#define TTK_VERSION_TIME_STR "(2022/09/15)" #define TTK_MAJOR_VERSION 2 #define TTK_MIDLE_VERSION 15 -#define TTK_MINOR_VERSION 11 +#define TTK_MINOR_VERSION 12 #define TTK_PATCH_VERSION 0 #define TTK_CONFIG_VERSION_STR "1.0.1" -#define TTK_RC_FILEVERSION 2,15,11,0 +#define TTK_RC_FILEVERSION 2,15,12,0 #define TTK_RC_PRODUCTVERSION TTK_VERSION_STR #define TTK_RC_COMPANY "Greedysky Studio, Ltd." #define TTK_RC_COPYRIGHT "Copyright (C) 2022 Greedysky Studio" diff --git a/TTKResource/_extras/TTKRoutine.sh b/TTKResource/_extras/TTKRoutine.sh index 131b8f5298..3fa0348d47 100644 --- a/TTKResource/_extras/TTKRoutine.sh +++ b/TTKResource/_extras/TTKRoutine.sh @@ -15,7 +15,7 @@ if [ "${dirpath%$tmp}" != "/" ]; then fi LD_LIBRARY_PATH=$dirpath -export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/2.15.11.0:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/2.15.12.0:$LD_LIBRARY_PATH export QT_PLUGIN_PATH=$dirpath/plugins:$QT_PLUGIN_PATH $appname "$@" diff --git a/TTKScript/auc/make_auc.bat b/TTKScript/auc/make_auc.bat index 46616ac740..724befc935 100644 --- a/TTKScript/auc/make_auc.bat +++ b/TTKScript/auc/make_auc.bat @@ -1,4 +1,4 @@ "C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"TTKInit.exe" "C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"TTKMusicPlayer.exe" "C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"TKConsole.exe" -"C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"2.15.11.0/TTKService.exe" \ No newline at end of file +"C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"2.15.12.0/TTKService.exe" \ No newline at end of file diff --git a/TTKScript/deploy/make_desktop.sh b/TTKScript/deploy/make_desktop.sh index 7d240d7436..4a31a34ea8 100755 --- a/TTKScript/deploy/make_desktop.sh +++ b/TTKScript/deploy/make_desktop.sh @@ -11,7 +11,7 @@ execpath="$PWD/../TTKMusicPlayer" echo -n "[Desktop Entry] Type=Application -Version=2.15.11.0 +Version=2.15.12.0 Name=TTKMusicPlayer Comment=天天酷音 Icon=$iconpath diff --git a/TTKScript/deploy/share/appdata/ttkmusicplayer.appdata.xml b/TTKScript/deploy/share/appdata/ttkmusicplayer.appdata.xml index 415b0dedea..1ab8cf2637 100644 --- a/TTKScript/deploy/share/appdata/ttkmusicplayer.appdata.xml +++ b/TTKScript/deploy/share/appdata/ttkmusicplayer.appdata.xml @@ -24,6 +24,7 @@ https://github.com/Greedysky/TTKMusicplayer Greedysky Studio + diff --git a/TTKScript/linux_time.sh b/TTKScript/linux_time.sh index 7e529f673b..2b2da44711 100755 --- a/TTKScript/linux_time.sh +++ b/TTKScript/linux_time.sh @@ -1,2 +1,2 @@ #!/bin/sh -find . -exec touch -c -m -d "2022-07-01 12:00" {} \; +find . -exec touch -c -m -d "2022-09-15 12:00" {} \; diff --git a/TTKScript/ttk.iss b/TTKScript/ttk.iss index 1d19962b6e..d67081bcbc 100755 --- a/TTKScript/ttk.iss +++ b/TTKScript/ttk.iss @@ -2,7 +2,7 @@ #define MyAppNameZh "" #define MyAppNameEN "TTKMusicPlayer" -#define MyAppVersion "2.15.11.0" +#define MyAppVersion "2.15.12.0" #define MyAppPublisher "Greedysky Studio" #define MyAppCopyright "Copyright (C) 2015 - 2022 Greedysky Studio" #define MyAppURL "http://download.csdn.net/album/detail/3094" diff --git a/TTKVersion.pri b/TTKVersion.pri index fe7341cd70..805e0ee4a1 100644 --- a/TTKVersion.pri +++ b/TTKVersion.pri @@ -21,5 +21,5 @@ MOC_DIR = ./.build/moc OBJECTS_DIR = ./.build/obj RCC_DIR = ./.build/rcc -# update time 2022.07.01 -TTKMusicPlayer = 2.15.11.0 +# update time 2022.09.15 +TTKMusicPlayer = 2.15.12.0