From 8b1025eec997c95489f76599587f8e5aedbcd0f0 Mon Sep 17 00:00:00 2001 From: Greedysky Date: Sat, 8 Feb 2020 13:40:22 +0800 Subject: [PATCH] Release on 2.11.1.0 Final --- CMakeLists.txt | 2 +- Doxyfile | 2 +- README.md | 2 +- TTKModule/TTKCore.rc | 8 ++++---- TTKQrc/TTKQrc.rc | 8 ++++---- TTKResource/A_extras/TTKRoutine.sh | 2 +- TTKRun/TTKApp/TTKApp.rc | 8 ++++---- TTKScript/deploy/package.sh | 2 +- TTKScript/deploy/ttkmusicplayer.appdata.xml | 2 +- TTKScript/deploy/ttkmusicplayer.desktop | 2 +- TTKScript/linux_time.sh | 2 +- TTKScript/ttk.iss | 2 +- TTKService/TTKService.rc | 8 ++++---- TTKThirdParty/TTKExtras/TTKExtras.rc | 8 ++++---- TTKVersion.pri | 4 ++-- ttkversion.h | 14 +++++++------- 16 files changed, 38 insertions(+), 38 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ce1b7a1b0..a5460ce58c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.11) add_definitions(-DTTK_LIBRARY) -set(TTK_MAJOR_VERSION "2.11.0") +set(TTK_MAJOR_VERSION "2.11.1") set(TTK_VERSION ${TTK_MAJOR_VERSION}.0) # Find includes in the build directories diff --git a/Doxyfile b/Doxyfile index 8cb1841200..24f282cacb 100644 --- a/Doxyfile +++ b/Doxyfile @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = TTKMusicplayer -PROJECT_NUMBER = 2.11.0.0 +PROJECT_NUMBER = 2.11.1.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 a13e53c103..b1b498d33a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # TTKMusicPlayer ![TTKMusicplayer](https://img.shields.io/badge/Greedysky-TTKMusicPlayer-green.svg?style=flat-square) -![Version](https://img.shields.io/badge/Version-2.11.0.0-blue.svg?style=flat-square) +![Version](https://img.shields.io/badge/Version-2.11.1.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/TTKModule/TTKCore.rc b/TTKModule/TTKCore.rc index d7c72a5c49..240ae3015a 100644 --- a/TTKModule/TTKCore.rc +++ b/TTKModule/TTKCore.rc @@ -5,8 +5,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,11,0,0 - PRODUCTVERSION 2,11,0,0 + FILEVERSION 2,11,1,0 + PRODUCTVERSION 2,11,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -25,10 +25,10 @@ BEGIN BEGIN VALUE "CompanyName", "Greedysky Studio, Ltd." VALUE "FileDescription", "TTKCore" - VALUE "FileVersion", "2.11.0.0" + VALUE "FileVersion", "2.11.1.0" VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2020" VALUE "ProductName", "TTKCore" - VALUE "ProductVersion", "2.11.0.0" + VALUE "ProductVersion", "2.11.1.0" END END BLOCK "VarFileInfo" diff --git a/TTKQrc/TTKQrc.rc b/TTKQrc/TTKQrc.rc index e1ca120ad0..c152c24bbf 100644 --- a/TTKQrc/TTKQrc.rc +++ b/TTKQrc/TTKQrc.rc @@ -5,8 +5,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,11,0,0 - PRODUCTVERSION 2,11,0,0 + FILEVERSION 2,11,1,0 + PRODUCTVERSION 2,11,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -25,10 +25,10 @@ BEGIN BEGIN VALUE "CompanyName", "Greedysky Studio, Ltd." VALUE "FileDescription", "TTKUi" - VALUE "FileVersion", "2.11.0.0" + VALUE "FileVersion", "2.11.1.0" VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2020" VALUE "ProductName", "TTKUi" - VALUE "ProductVersion", "2.11.0.0" + VALUE "ProductVersion", "2.11.1.0" END END BLOCK "VarFileInfo" diff --git a/TTKResource/A_extras/TTKRoutine.sh b/TTKResource/A_extras/TTKRoutine.sh index bb8ee5a550..c6b2de0320 100755 --- a/TTKResource/A_extras/TTKRoutine.sh +++ b/TTKResource/A_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.11.0.0:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/2.11.1.0:$LD_LIBRARY_PATH export QT_PLUGIN_PATH=$dirpath/plugins:$QT_PLUGIN_PATH $appname "$@" diff --git a/TTKRun/TTKApp/TTKApp.rc b/TTKRun/TTKApp/TTKApp.rc index fc9f783c50..6152f02974 100644 --- a/TTKRun/TTKApp/TTKApp.rc +++ b/TTKRun/TTKApp/TTKApp.rc @@ -7,8 +7,8 @@ IDI_ICON1 ICON DISCARDABLE "../../TTKResource/lb_app_logo.ico" VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,11,0,0 - PRODUCTVERSION 2,11,0,0 + FILEVERSION 2,11,1,0 + PRODUCTVERSION 2,11,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -27,12 +27,12 @@ BEGIN BEGIN VALUE "CompanyName", "Greedysky Studio, Ltd." VALUE "FileDescription", "天天酷音" - VALUE "FileVersion", "2.11.0.0" + VALUE "FileVersion", "2.11.1.0" VALUE "InternalName", "天天酷音.exe" VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2020" VALUE "OriginalFilename", "天天酷音.exe" VALUE "ProductName", "天天酷音" - VALUE "ProductVersion", "2.11.0.0" + VALUE "ProductVersion", "2.11.1.0" END END BLOCK "VarFileInfo" diff --git a/TTKScript/deploy/package.sh b/TTKScript/deploy/package.sh index d2414a1840..918c9d97e3 100755 --- a/TTKScript/deploy/package.sh +++ b/TTKScript/deploy/package.sh @@ -1,6 +1,6 @@ #!/bin/sh APP="TTKMusicplayer" -APP_VER="2.11.0.0" +APP_VER="2.11.1.0" DEV_PATH="$1" PACK_PATH="ttkmusicplayer" diff --git a/TTKScript/deploy/ttkmusicplayer.appdata.xml b/TTKScript/deploy/ttkmusicplayer.appdata.xml index efbd2aec6c..0b0ae6575a 100644 --- a/TTKScript/deploy/ttkmusicplayer.appdata.xml +++ b/TTKScript/deploy/ttkmusicplayer.appdata.xml @@ -18,7 +18,7 @@ Greedysky Studio - + diff --git a/TTKScript/deploy/ttkmusicplayer.desktop b/TTKScript/deploy/ttkmusicplayer.desktop index f578865c33..f42c3b1e43 100644 --- a/TTKScript/deploy/ttkmusicplayer.desktop +++ b/TTKScript/deploy/ttkmusicplayer.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Version=2.11.0.0 +Version=2.11.1.0 Name=澶╁ぉ閰烽煶 Comment=澶╁ぉ閰烽煶 #Icon=~/ttkmusicplayer/usr/share/pixmaps/ttkmusicplayer.png diff --git a/TTKScript/linux_time.sh b/TTKScript/linux_time.sh index 2360b6a99c..b3c5190c91 100755 --- a/TTKScript/linux_time.sh +++ b/TTKScript/linux_time.sh @@ -1,2 +1,2 @@ #!/bin/sh -find . -exec touch -c -m -d "2020-01-18 14:56" {} \; +find . -exec touch -c -m -d "2020-02-08 13:08" {} \; diff --git a/TTKScript/ttk.iss b/TTKScript/ttk.iss index 54995f7196..ea94b0d923 100755 --- a/TTKScript/ttk.iss +++ b/TTKScript/ttk.iss @@ -1,7 +1,7 @@ ; Script generated by the Inno Setup Script Wizard. #define MyAppNameZh "天天酷音" -#define MyAppVersion "2.11.0.0" +#define MyAppVersion "2.11.1.0" #define MyAppPublisher "Greedysky Studio" #define MyAppCopyright "Copyright (c) 2015 - 2020 Greedysky Studio" #define MyAppURL "http://download.csdn.net/album/detail/3094" diff --git a/TTKService/TTKService.rc b/TTKService/TTKService.rc index 120b326716..5567e7d085 100644 --- a/TTKService/TTKService.rc +++ b/TTKService/TTKService.rc @@ -8,8 +8,8 @@ IDI_ICON1 ICON DISCARDABLE "../TTKResource/lb_app_logo.ic IDI_ICON2 ICON DISCARDABLE "../TTKResource/fileIcon/fileIcon.ico" VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,11,0,0 - PRODUCTVERSION 2,11,0,0 + FILEVERSION 2,11,1,0 + PRODUCTVERSION 2,11,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -28,12 +28,12 @@ BEGIN BEGIN VALUE "CompanyName", "Greedysky Studio, Ltd." VALUE "FileDescription", "天天酷音" - VALUE "FileVersion", "2.11.0.0" + VALUE "FileVersion", "2.11.1.0" VALUE "InternalName", "天天酷音.exe" VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2020" VALUE "OriginalFilename", "天天酷音.exe" VALUE "ProductName", "天天酷音" - VALUE "ProductVersion", "2.11.0.0" + VALUE "ProductVersion", "2.11.1.0" END END BLOCK "VarFileInfo" diff --git a/TTKThirdParty/TTKExtras/TTKExtras.rc b/TTKThirdParty/TTKExtras/TTKExtras.rc index dca03580e7..4502386aac 100644 --- a/TTKThirdParty/TTKExtras/TTKExtras.rc +++ b/TTKThirdParty/TTKExtras/TTKExtras.rc @@ -5,8 +5,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,11,0,0 - PRODUCTVERSION 2,11,0,0 + FILEVERSION 2,11,1,0 + PRODUCTVERSION 2,11,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -25,10 +25,10 @@ BEGIN BEGIN VALUE "CompanyName", "Greedysky Studio, Ltd." VALUE "FileDescription", "TTKExtras" - VALUE "FileVersion", "2.11.0.0" + VALUE "FileVersion", "2.11.1.0" VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2020" VALUE "ProductName", "TTKExtras" - VALUE "ProductVersion", "2.11.0.0" + VALUE "ProductVersion", "2.11.1.0" END END BLOCK "VarFileInfo" diff --git a/TTKVersion.pri b/TTKVersion.pri index cd5f514adc..5292fb43c6 100644 --- a/TTKVersion.pri +++ b/TTKVersion.pri @@ -16,5 +16,5 @@ # * with this program; If not, see . # ================================================= -# update time 2020.01.18 -TTKMusicPlayer = 2.11.0.0 +# update time 2020.02.08 +TTKMusicPlayer = 2.11.1.0 diff --git a/ttkversion.h b/ttkversion.h index 328ec66dee..bd2d61f9de 100644 --- a/ttkversion.h +++ b/ttkversion.h @@ -112,17 +112,17 @@ * with this program; If not, see . ================================================= */ -//update time 2020.01.18 -#define TTKMUSIC_VERSION_STR "2.11.0.0" -#define TTKMUSIC_VERSION_WSTR L"2.11.0.0" -#define TTKMUSIC_VER_TIME_STR "(2020/01/18)" +//update time 2020.02.08 +#define TTKMUSIC_VERSION_STR "2.11.1.0" +#define TTKMUSIC_VERSION_WSTR L"2.11.1.0" +#define TTKMUSIC_VER_TIME_STR "(2020/02/08)" #define TTKMUSIC_MAJOR_VERSION 2 -#define TTKMUSIC_MIDLE_VERSION 1 -#define TTKMUSIC_MINOR_VERSION 0 +#define TTKMUSIC_MIDLE_VERSION 11 +#define TTKMUSIC_MINOR_VERSION 1 #define TTKMUSIC_PATCH_VERSION 0 -#define TTKMUSIC_VERSION 0x02B00 +#define TTKMUSIC_VERSION 0x02B10 #define TTKMUSIC_VERSION_CHECK(major, middle, minor, patch) ((major<<12)|(middle<<8)|(minor<<4)|(patch))