Skip to content

Commit

Permalink
Bump version 2.15.9.0 Final
Browse files Browse the repository at this point in the history
  • Loading branch information
Greedysky committed Apr 29, 2022
1 parent 9803d1a commit df8e532
Show file tree
Hide file tree
Showing 20 changed files with 30 additions and 31 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.8")
set(TTK_MAJOR_VERSION "2.15.9")
set(TTK_VERSION ${TTK_MAJOR_VERSION}.0)

# Find includes in the build directories
Expand Down
1 change: 0 additions & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -403,4 +403,3 @@ v2.15.10.0 Final 2022.06.XX
支持多通道视觉效果。
修复相似搜索错误。
优化其他一些细节。

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.8.0
PROJECT_NUMBER = 2.15.9.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.8.0-blue.svg?style=flat-square)
![Version](https://img.shields.io/badge/Version-2.15.9.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.8.0-blue.svg?style=flat-square)
![版本](https://img.shields.io/badge/Version-2.15.9.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.8.0-blue.svg?style=flat-square)
![版本](https://img.shields.io/badge/Version-2.15.9.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
10 changes: 5 additions & 5 deletions TTKCommon/ttkversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -152,16 +152,16 @@
* with this program; If not, see <http://www.gnu.org/licenses/>.
***************************************************************************/

//update time 2022.03.05
#define TTK_VERSION_STR "2.15.8.0"
#define TTK_VER_TIME_STR "(2022/03/05)"
//update time 2022.04.30
#define TTK_VERSION_STR "2.15.9.0"
#define TTK_VER_TIME_STR "(2022/04/30)"

#define TTK_MAJOR_VERSION 2
#define TTK_MIDLE_VERSION 15
#define TTK_MINOR_VERSION 8
#define TTK_MINOR_VERSION 9
#define TTK_PATCH_VERSION 0

#define TTK_VERSION 0x02F80
#define TTK_VERSION 0x02F90

#define TTK_CONFIG_VERSION_STR "1.0.1"

Expand Down
4 changes: 2 additions & 2 deletions TTKConfig/TTKConfig.rc
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

IDI_ICON1 ICON DISCARDABLE "../TTKResource/lb_app_logo.ico"

#define TTK_FILEVERSION 2,15,8,0
#define TTK_PRODUCTVERSION "2.15.8.0"
#define TTK_FILEVERSION 2,15,9,0
#define TTK_PRODUCTVERSION "2.15.9.0"

VS_VERSION_INFO VERSIONINFO
FILEVERSION TTK_FILEVERSION
Expand Down
4 changes: 2 additions & 2 deletions TTKModule/TTKCore.rc
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#include <winver.h>
#endif

#define TTK_FILEVERSION 2,15,8,0
#define TTK_PRODUCTVERSION "2.15.8.0"
#define TTK_FILEVERSION 2,15,9,0
#define TTK_PRODUCTVERSION "2.15.9.0"

VS_VERSION_INFO VERSIONINFO
FILEVERSION TTK_FILEVERSION
Expand Down
2 changes: 1 addition & 1 deletion TTKResource/_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.8.0:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/2.15.9.0:$LD_LIBRARY_PATH
export QT_PLUGIN_PATH=$dirpath/plugins:$QT_PLUGIN_PATH

$appname "$@"
4 changes: 2 additions & 2 deletions TTKRun/TTKApp/TTKApp.rc
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

IDI_ICON1 ICON DISCARDABLE "../../TTKResource/lb_app_logo.ico"

#define TTK_FILEVERSION 2,15,8,0
#define TTK_PRODUCTVERSION "2.15.8.0"
#define TTK_FILEVERSION 2,15,9,0
#define TTK_PRODUCTVERSION "2.15.9.0"

VS_VERSION_INFO VERSIONINFO
FILEVERSION TTK_FILEVERSION
Expand Down
2 changes: 1 addition & 1 deletion TTKScript/auc/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.8.0/TTKService.exe"
"C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"2.15.9.0/TTKService.exe"
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.8.0
Version=2.15.9.0
Name=TTKMusicPlayer
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.8.0" date="2022-03-05">
<release version="2.15.9.0" date="2022-04-30">
</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 "2022-03-05 12:00" {} \;
find . -exec touch -c -m -d "2022-04-30 12:00" {} \;
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.8.0"
#define MyAppVersion "2.15.9.0"
#define MyAppPublisher "Greedysky Studio"
#define MyAppCopyright "Copyright (C) 2015 - 2022 Greedysky Studio"
#define MyAppURL "http://download.csdn.net/album/detail/3094"
Expand Down
4 changes: 2 additions & 2 deletions TTKService/TTKService.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"
IDI_ICON2 ICON DISCARDABLE "../TTKResource/fileIcon/fileIcon.ico"

#define TTK_FILEVERSION 2,15,8,0
#define TTK_PRODUCTVERSION "2.15.8.0"
#define TTK_FILEVERSION 2,15,9,0
#define TTK_PRODUCTVERSION "2.15.9.0"

VS_VERSION_INFO VERSIONINFO
FILEVERSION TTK_FILEVERSION
Expand Down
4 changes: 2 additions & 2 deletions TTKThirdParty/TTKExtras/TTKExtras.rc
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#include <winver.h>
#endif

#define TTK_FILEVERSION 2,15,8,0
#define TTK_PRODUCTVERSION "2.15.8.0"
#define TTK_FILEVERSION 2,15,9,0
#define TTK_PRODUCTVERSION "2.15.9.0"

VS_VERSION_INFO VERSIONINFO
FILEVERSION TTK_FILEVERSION
Expand Down
4 changes: 2 additions & 2 deletions TTKUi/TTKUi.rc
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#include <winver.h>
#endif

#define TTK_FILEVERSION 2,15,8,0
#define TTK_PRODUCTVERSION "2.15.8.0"
#define TTK_FILEVERSION 2,15,9,0
#define TTK_PRODUCTVERSION "2.15.9.0"

VS_VERSION_INFO VERSIONINFO
FILEVERSION TTK_FILEVERSION
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 2022.03.05
TTKMusicPlayer = 2.15.8.0
# update time 2022.04.30
TTKMusicPlayer = 2.15.9.0

0 comments on commit df8e532

Please sign in to comment.