Skip to content

Commit

Permalink
Bump version 2.15.3.0 Final
Browse files Browse the repository at this point in the history
  • Loading branch information
Greedysky committed Sep 27, 2021
1 parent 3e3b8e5 commit aa5bfce
Show file tree
Hide file tree
Showing 20 changed files with 44 additions and 47 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.11)
add_definitions(-DTTK_LIBRARY)
add_definitions(-DQMMP_LIBRARY)

set(TTK_MAJOR_VERSION "2.15.2")
set(TTK_MAJOR_VERSION "2.15.3")
set(TTK_VERSION ${TTK_MAJOR_VERSION}.0)

# Find includes in the build directories
Expand Down
5 changes: 1 addition & 4 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -319,17 +319,14 @@ v2.15.2.0 Final 2021.08.16
性能优化。
Bug修复。

v2.15.3.0 Final 2021.XX.XX
v2.15.3.0 Final 2021.09.27
优化界面提示。
优化搜索模块。
优化桌面歌词。
修复视频退出异常。
移除部分组件。
性能优化。
Bug修复。
......
......
......

v2.15.4.0 Final 2021.XX.XX
优化进度条代理问题。
Expand Down
2 changes: 1 addition & 1 deletion Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = TTKMusicplayer
PROJECT_NUMBER = 2.15.2.0
PROJECT_NUMBER = 2.15.3.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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.0-blue.svg?style=flat-square)
![Version](https://img.shields.io/badge/Version-2.15.3.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)
Expand Down
2 changes: 1 addition & 1 deletion README_cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.0-blue.svg?style=flat-square)
![版本](https://img.shields.io/badge/Version-2.15.3.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)
Expand Down
2 changes: 1 addition & 1 deletion README_tc.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.0-blue.svg?style=flat-square)
![版本](https://img.shields.io/badge/Version-2.15.3.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)
Expand Down
12 changes: 6 additions & 6 deletions TTKCommon/ttkversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -140,17 +140,17 @@
* with this program; If not, see <http://www.gnu.org/licenses/>.
================================================= */

//update time 2021.08.16
#define TTKMUSIC_VERSION_STR "2.15.2.0"
#define TTKMUSIC_VERSION_WSTR L"2.15.2.0"
#define TTKMUSIC_VER_TIME_STR "(2021/08/16)"
//update time 2021.09.27
#define TTKMUSIC_VERSION_STR "2.15.3.0"
#define TTKMUSIC_VERSION_WSTR L"2.15.3.0"
#define TTKMUSIC_VER_TIME_STR "(2021/09/27)"

#define TTKMUSIC_MAJOR_VERSION 2
#define TTKMUSIC_MIDLE_VERSION 15
#define TTKMUSIC_MINOR_VERSION 2
#define TTKMUSIC_MINOR_VERSION 3
#define TTKMUSIC_PATCH_VERSION 0

#define TTKMUSIC_VERSION 0x02F20
#define TTKMUSIC_VERSION 0x02F30

#define TTKCONFIG_VERSION_STR "1.0.0"

Expand Down
8 changes: 4 additions & 4 deletions TTKConfig/TTKConfig.rc
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
IDI_ICON1 ICON DISCARDABLE "../TTKResource/lb_app_logo.ico"

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,15,2,0
PRODUCTVERSION 2,15,2,0
FILEVERSION 2,15,3,0
PRODUCTVERSION 2,15,3,0
FILEFLAGSMASK 0x3fL

#ifdef _DEBUG
Expand All @@ -27,10 +27,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Greedysky Studio, Ltd."
VALUE "FileDescription", "TTKConfig"
VALUE "FileVersion", "2.15.2.0"
VALUE "FileVersion", "2.15.3.0"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2021"
VALUE "ProductName", "TTKConfig"
VALUE "ProductVersion", "2.15.2.0"
VALUE "ProductVersion", "2.15.3.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions TTKModule/TTKCore.rc
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#endif

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,15,2,0
PRODUCTVERSION 2,15,2,0
FILEVERSION 2,15,3,0
PRODUCTVERSION 2,15,3,0
FILEFLAGSMASK 0x3fL

#ifdef _DEBUG
Expand All @@ -25,10 +25,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Greedysky Studio, Ltd."
VALUE "FileDescription", "TTKCore"
VALUE "FileVersion", "2.15.2.0"
VALUE "FileVersion", "2.15.3.0"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2021"
VALUE "ProductName", "TTKCore"
VALUE "ProductVersion", "2.15.2.0"
VALUE "ProductVersion", "2.15.3.0"
END
END
BLOCK "VarFileInfo"
Expand Down
2 changes: 1 addition & 1 deletion TTKResource/A_extras/TTKRoutine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if [ "${dirpath%$tmp}" != "/" ]; then
fi
LD_LIBRARY_PATH=$dirpath

export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/2.15.2.0:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/2.15.3.0:$LD_LIBRARY_PATH
export QT_PLUGIN_PATH=$dirpath/plugins:$QT_PLUGIN_PATH

$appname "$@"
8 changes: 4 additions & 4 deletions TTKRun/TTKApp/TTKApp.rc
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
IDI_ICON1 ICON DISCARDABLE "../../TTKResource/lb_app_logo.ico"

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,15,2,0
PRODUCTVERSION 2,15,2,0
FILEVERSION 2,15,3,0
PRODUCTVERSION 2,15,3,0
FILEFLAGSMASK 0x3fL

#ifdef _DEBUG
Expand All @@ -27,12 +27,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Greedysky Studio, Ltd."
VALUE "FileDescription", "�������"
VALUE "FileVersion", "2.15.2.0"
VALUE "FileVersion", "2.15.3.0"
VALUE "InternalName", "�������.exe"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2021"
VALUE "OriginalFilename", "�������.exe"
VALUE "ProductName", "�������"
VALUE "ProductVersion", "2.15.2.0"
VALUE "ProductVersion", "2.15.3.0"
END
END
BLOCK "VarFileInfo"
Expand Down
2 changes: 1 addition & 1 deletion TTKScript/deploy/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ execpath="$PWD/../TTKMusicPlayer"

echo -n "[Desktop Entry]
Type=Application
Version=2.15.2.0
Version=2.15.3.0
Name=天天酷音
Comment=天天酷音
Icon=$iconpath
Expand Down
2 changes: 1 addition & 1 deletion TTKScript/deploy/share/appdata/ttkmusicplayer.appdata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<developer_name>Greedysky Studio</developer_name>

<releases>
<release version="2.15.2.0" date="2021-08-16">
<release version="2.15.3.0" date="2021-09-27">
</release>
</releases>
</component>
2 changes: 1 addition & 1 deletion TTKScript/linux_time.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
find . -exec touch -c -m -d "2021-08-16 12:00" {} \;
find . -exec touch -c -m -d "2021-09-27 12:00" {} \;
2 changes: 1 addition & 1 deletion TTKScript/make_auc.bat
Original file line number Diff line number Diff line change
@@ -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.2.0/TTKService.exe"
"C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"2.15.3.0/TTKService.exe"
2 changes: 1 addition & 1 deletion TTKScript/ttk.iss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#define MyAppNameZh "天天酷音"
#define MyAppNameEN "TTKMusicPlayer"
#define MyAppVersion "2.15.2.0"
#define MyAppVersion "2.15.3.0"
#define MyAppPublisher "Greedysky Studio"
#define MyAppCopyright "Copyright (c) 2015 - 2021 Greedysky Studio"
#define MyAppURL "http://download.csdn.net/album/detail/3094"
Expand Down
8 changes: 4 additions & 4 deletions TTKService/TTKService.rc
Original file line number Diff line number Diff line change
Expand Up @@ -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,15,2,0
PRODUCTVERSION 2,15,2,0
FILEVERSION 2,15,3,0
PRODUCTVERSION 2,15,3,0
FILEFLAGSMASK 0x3fL

#ifdef _DEBUG
Expand All @@ -28,12 +28,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Greedysky Studio, Ltd."
VALUE "FileDescription", "�������"
VALUE "FileVersion", "2.15.2.0"
VALUE "FileVersion", "2.15.3.0"
VALUE "InternalName", "�������.exe"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2021"
VALUE "OriginalFilename", "�������.exe"
VALUE "ProductName", "�������"
VALUE "ProductVersion", "2.15.2.0"
VALUE "ProductVersion", "2.15.3.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions TTKThirdParty/TTKExtras/TTKExtras.rc
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#endif

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,15,2,0
PRODUCTVERSION 2,15,2,0
FILEVERSION 2,15,3,0
PRODUCTVERSION 2,15,3,0
FILEFLAGSMASK 0x3fL

#ifdef _DEBUG
Expand All @@ -25,10 +25,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Greedysky Studio, Ltd."
VALUE "FileDescription", "TTKExtras"
VALUE "FileVersion", "2.15.2.0"
VALUE "FileVersion", "2.15.3.0"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2021"
VALUE "ProductName", "TTKExtras"
VALUE "ProductVersion", "2.15.2.0"
VALUE "ProductVersion", "2.15.3.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions TTKUi/TTKUi.rc
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#endif

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,15,2,0
PRODUCTVERSION 2,15,2,0
FILEVERSION 2,15,3,0
PRODUCTVERSION 2,15,3,0
FILEFLAGSMASK 0x3fL

#ifdef _DEBUG
Expand All @@ -25,10 +25,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Greedysky Studio, Ltd."
VALUE "FileDescription", "TTKUi"
VALUE "FileVersion", "2.15.2.0"
VALUE "FileVersion", "2.15.3.0"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2021"
VALUE "ProductName", "TTKUi"
VALUE "ProductVersion", "2.15.2.0"
VALUE "ProductVersion", "2.15.3.0"
END
END
BLOCK "VarFileInfo"
Expand Down
4 changes: 2 additions & 2 deletions TTKVersion.pri
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ MOC_DIR = ./.build/moc
OBJECTS_DIR = ./.build/obj
RCC_DIR = ./.build/rcc

# update time 2021.08.16
TTKMusicPlayer = 2.15.2.0
# update time 2021.09.27
TTKMusicPlayer = 2.15.3.0

0 comments on commit aa5bfce

Please sign in to comment.