From b877df1bafd24c40d426b45ec71b8161a7c124d8 Mon Sep 17 00:00:00 2001 From: Greedysky Date: Sat, 29 Jun 2019 13:04:02 +0800 Subject: [PATCH] Release on 2.9.0.0 Final --- CMakeLists.txt | 2 +- ChangeLog | 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/time.sh | 2 +- TTKScript/ttk.iss | 4 ++-- TTKService/TTKService.rc | 8 ++++---- TTKThirdParty/TTKExtras/TTKExtras.rc | 8 ++++---- TTKVersion.pri | 4 ++-- ttkversion.h | 12 ++++++------ 17 files changed, 39 insertions(+), 39 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3831d0385..a397ed7b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.11) add_definitions(-DTTK_LIBRARY) -set(TTK_VERSION "2.8.0.0") +set(TTK_VERSION "2.9.0.0") # Find includes in the build directories set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/ChangeLog b/ChangeLog index aa24e6684..d7ae7160b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -195,7 +195,7 @@ v2.8.0.0 Final 2019.01.11 云模块优化。 其他优化。 -v2.8.1.0 Final 2019.07.12 +v2.9.0.0 Final 2019.06.29 歌词批量下载。 搜索优化。 界面优化。 diff --git a/Doxyfile b/Doxyfile index 861acf7db..985aee5a0 100644 --- a/Doxyfile +++ b/Doxyfile @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = TTKMusicplayer -PROJECT_NUMBER = 2.8.0.0 +PROJECT_NUMBER = 2.9.0.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 3cffafdcd..c99d711f4 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.8.0.0-blue.svg?style=flat-square) +![Version](https://img.shields.io/badge/Version-2.9.0.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 217cc0e3d..c763ee39e 100644 --- a/TTKModule/TTKCore.rc +++ b/TTKModule/TTKCore.rc @@ -5,8 +5,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,8,0,0 - PRODUCTVERSION 2,8,0,0 + FILEVERSION 2,9,0,0 + PRODUCTVERSION 2,9,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -25,10 +25,10 @@ BEGIN BEGIN VALUE "CompanyName", "Greedysky Studio, Ltd." VALUE "FileDescription", "TTKCore" - VALUE "FileVersion", "2.8.0.0" + VALUE "FileVersion", "2.9.0.0" VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2019" VALUE "ProductName", "TTKCore" - VALUE "ProductVersion", "2.8.0.0" + VALUE "ProductVersion", "2.9.0.0" END END BLOCK "VarFileInfo" diff --git a/TTKQrc/TTKQrc.rc b/TTKQrc/TTKQrc.rc index c7695df66..a68bb8698 100644 --- a/TTKQrc/TTKQrc.rc +++ b/TTKQrc/TTKQrc.rc @@ -5,8 +5,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,8,0,0 - PRODUCTVERSION 2,8,0,0 + FILEVERSION 2,9,0,0 + PRODUCTVERSION 2,9,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -25,10 +25,10 @@ BEGIN BEGIN VALUE "CompanyName", "Greedysky Studio, Ltd." VALUE "FileDescription", "TTKUi" - VALUE "FileVersion", "2.8.0.0" + VALUE "FileVersion", "2.9.0.0" VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2019" VALUE "ProductName", "TTKUi" - VALUE "ProductVersion", "2.8.0.0" + VALUE "ProductVersion", "2.9.0.0" END END BLOCK "VarFileInfo" diff --git a/TTKResource/A_extras/TTKRoutine.sh b/TTKResource/A_extras/TTKRoutine.sh index 871aacac7..8956008bb 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.8.0.0:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/2.9.0.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 dbc2ed7da..d9e8fffdd 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,8,0,0 - PRODUCTVERSION 2,8,0,0 + FILEVERSION 2,9,0,0 + PRODUCTVERSION 2,9,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -27,12 +27,12 @@ BEGIN BEGIN VALUE "CompanyName", "Greedysky Studio, Ltd." VALUE "FileDescription", "" - VALUE "FileVersion", "2.8.0.0" + VALUE "FileVersion", "2.9.0.0" VALUE "InternalName", ".exe" VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2019" VALUE "OriginalFilename", ".exe" VALUE "ProductName", "" - VALUE "ProductVersion", "2.8.0.0" + VALUE "ProductVersion", "2.9.0.0" END END BLOCK "VarFileInfo" diff --git a/TTKScript/deploy/package.sh b/TTKScript/deploy/package.sh index d38e19dc5..aefa5abc3 100755 --- a/TTKScript/deploy/package.sh +++ b/TTKScript/deploy/package.sh @@ -1,6 +1,6 @@ #!/bin/sh APP="TTKMusicplayer" -APP_VER="2.8.0.0" +APP_VER="2.9.0.0" DEV_PATH="$1" PACK_PATH="ttkmusicplayer" diff --git a/TTKScript/deploy/ttkmusicplayer.appdata.xml b/TTKScript/deploy/ttkmusicplayer.appdata.xml index 756b81796..8c5a659ce 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 7be15e9a9..2be702add 100644 --- a/TTKScript/deploy/ttkmusicplayer.desktop +++ b/TTKScript/deploy/ttkmusicplayer.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Version=2.8.0.0 +Version=2.9.0.0 Name= Comment= #Icon=~/ttkmusicplayer/usr/share/pixmaps/ttkmusicplayer.png diff --git a/TTKScript/time.sh b/TTKScript/time.sh index f29441c5a..3aeb25acb 100755 --- a/TTKScript/time.sh +++ b/TTKScript/time.sh @@ -1,2 +1,2 @@ #!/bin/sh -find . -exec touch -c -m -t 201901110111 {} \; +find . -exec touch -c -m -t 201906290852 {} \; diff --git a/TTKScript/ttk.iss b/TTKScript/ttk.iss index c4ad9839c..0fccb2728 100644 --- 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.8.0.0" +#define MyAppVersion "2.9.0.0" #define MyAppPublisher "Greedysky Studio" #define MyAppCopyright "Copyright (c) 2015 - 2019 Greedysky Studio" #define MyAppURL "http://download.csdn.net/album/detail/3094" @@ -58,7 +58,7 @@ Name: "{group}\ж ; Name: "chinese"; MessagesFile: "_resourcesPath_\ChineseSimp.isl" [PostCompile] -Name: "makeCert.bat";Parameters:"D:\Qt\v2.8.0.0.exe" ;Flags: cmdprompt redirectoutput +Name: "makeCert.bat";Parameters:"D:\Qt\v2.9.0.0.exe" ;Flags: cmdprompt redirectoutput [Code] // for dll diff --git a/TTKService/TTKService.rc b/TTKService/TTKService.rc index 5d4cfc20a..05310dc36 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,8,0,0 - PRODUCTVERSION 2,8,0,0 + FILEVERSION 2,9,0,0 + PRODUCTVERSION 2,9,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -28,12 +28,12 @@ BEGIN BEGIN VALUE "CompanyName", "Greedysky Studio, Ltd." VALUE "FileDescription", "" - VALUE "FileVersion", "2.8.0.0" + VALUE "FileVersion", "2.9.0.0" VALUE "InternalName", ".exe" VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2019" VALUE "OriginalFilename", ".exe" VALUE "ProductName", "" - VALUE "ProductVersion", "2.8.0.0" + VALUE "ProductVersion", "2.9.0.0" END END BLOCK "VarFileInfo" diff --git a/TTKThirdParty/TTKExtras/TTKExtras.rc b/TTKThirdParty/TTKExtras/TTKExtras.rc index 683f33c55..bdc8c0748 100644 --- a/TTKThirdParty/TTKExtras/TTKExtras.rc +++ b/TTKThirdParty/TTKExtras/TTKExtras.rc @@ -5,8 +5,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,8,0,0 - PRODUCTVERSION 2,8,0,0 + FILEVERSION 2,9,0,0 + PRODUCTVERSION 2,9,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -25,10 +25,10 @@ BEGIN BEGIN VALUE "CompanyName", "Greedysky Studio, Ltd." VALUE "FileDescription", "TTKExtras" - VALUE "FileVersion", "2.8.0.0" + VALUE "FileVersion", "2.9.0.0" VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2019" VALUE "ProductName", "TTKExtras" - VALUE "ProductVersion", "2.8.0.0" + VALUE "ProductVersion", "2.9.0.0" END END BLOCK "VarFileInfo" diff --git a/TTKVersion.pri b/TTKVersion.pri index d2911cd00..d915c23b7 100644 --- a/TTKVersion.pri +++ b/TTKVersion.pri @@ -16,5 +16,5 @@ # * with this program; If not, see . # ================================================= -# update time 2019.01.11 -TTKMusicPlayer = 2.8.0.0 +# update time 2019.06.29 +TTKMusicPlayer = 2.9.0.0 diff --git a/ttkversion.h b/ttkversion.h index 5e599e6c6..478fc7300 100644 --- a/ttkversion.h +++ b/ttkversion.h @@ -105,17 +105,17 @@ * with this program; If not, see . ================================================= */ -//update time 2019.01.11 -#define TTKMUSIC_VERSION_STR "2.8.0.0" -#define TTKMUSIC_VERSION_WSTR L"2.8.0.0" -#define TTKMUSIC_VER_TIME_STR "(2019/01/11)" +//update time 2019.06.29 +#define TTKMUSIC_VERSION_STR "2.9.0.0" +#define TTKMUSIC_VERSION_WSTR L"2.9.0.0" +#define TTKMUSIC_VER_TIME_STR "(2019/06/29)" #define TTKMUSIC_MAJOR_VERSION 2 -#define TTKMUSIC_MIDLE_VERSION 8 +#define TTKMUSIC_MIDLE_VERSION 9 #define TTKMUSIC_MINOR_VERSION 0 #define TTKMUSIC_PATCH_VERSION 0 -#define TTKMUSIC_VERSION 0x02800 +#define TTKMUSIC_VERSION 0x02900 #define TTKMUSIC_VERSION_CHECK(major, middle, minor, patch) ((major<<12)|(middle<<8)|(minor<<4)|(patch))