Skip to content

Commit

Permalink
Release on 2.13.0.0 Final
Browse files Browse the repository at this point in the history
  • Loading branch information
Greedysky committed Jun 6, 2020
1 parent 013328b commit beb9ddb
Show file tree
Hide file tree
Showing 20 changed files with 44 additions and 44 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.12.0")
set(TTK_MAJOR_VERSION "2.13.0")
set(TTK_VERSION ${TTK_MAJOR_VERSION}.0)

# Find includes in the build directories
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.12.0.0
PROJECT_NUMBER = 2.13.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
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.12.0.0-blue.svg?style=flat-square)
![Version](https://img.shields.io/badge/Version-2.13.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)
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.12.0.0-blue.svg?style=flat-square)
![版本](https://img.shields.io/badge/Version-2.13.0.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.12.0.0-blue.svg?style=flat-square)
![版本](https://img.shields.io/badge/Version-2.13.0.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
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 1,0,0,0
PRODUCTVERSION 1,0,0,0
FILEVERSION 2,13,0,0
PRODUCTVERSION 2,13,0,0
FILEFLAGSMASK 0x3fL

#ifdef _DEBUG
Expand All @@ -27,10 +27,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Greedysky Studio, Ltd."
VALUE "FileDescription", "TTKConfig"
VALUE "FileVersion", "2.12.0.0"
VALUE "FileVersion", "2.13.0.0"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2020"
VALUE "ProductName", "TTKConfig"
VALUE "ProductVersion", "2.12.0.0"
VALUE "ProductVersion", "2.13.0.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,12,0,0
PRODUCTVERSION 2,12,0,0
FILEVERSION 2,13,0,0
PRODUCTVERSION 2,13,0,0
FILEFLAGSMASK 0x3fL

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

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,12,0,0
PRODUCTVERSION 2,12,0,0
FILEVERSION 2,13,0,0
PRODUCTVERSION 2,13,0,0
FILEFLAGSMASK 0x3fL

#ifdef _DEBUG
Expand All @@ -25,10 +25,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Greedysky Studio, Ltd."
VALUE "FileDescription", "TTKUi"
VALUE "FileVersion", "2.12.0.0"
VALUE "FileVersion", "2.13.0.0"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2020"
VALUE "ProductName", "TTKUi"
VALUE "ProductVersion", "2.12.0.0"
VALUE "ProductVersion", "2.13.0.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.12.0.0:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/2.13.0.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,12,0,0
PRODUCTVERSION 2,12,0,0
FILEVERSION 2,13,0,0
PRODUCTVERSION 2,13,0,0
FILEFLAGSMASK 0x3fL

#ifdef _DEBUG
Expand All @@ -27,12 +27,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Greedysky Studio, Ltd."
VALUE "FileDescription", "�������"
VALUE "FileVersion", "2.12.0.0"
VALUE "FileVersion", "2.13.0.0"
VALUE "InternalName", "�������.exe"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2020"
VALUE "OriginalFilename", "�������.exe"
VALUE "ProductName", "�������"
VALUE "ProductVersion", "2.12.0.0"
VALUE "ProductVersion", "2.13.0.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
@@ -1,6 +1,6 @@
#!/bin/sh
APP="TTKMusicplayer"
APP_VER="2.12.0.0"
APP_VER="2.13.0.0"

DEV_PATH="$1"
PACK_PATH="ttkmusicplayer"
Expand Down
2 changes: 1 addition & 1 deletion TTKScript/deploy/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.12.0.0" date="2020-04-25">
<release version="2.13.0.0" date="2020-06-06">
</release>
</releases>
</component>
2 changes: 1 addition & 1 deletion TTKScript/deploy/ttkmusicplayer.desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Application
Version=2.12.0.0
Version=2.13.0.0
Name=天天酷音
Comment=天天酷音
#Icon=~/ttkmusicplayer/usr/share/pixmaps/ttkmusicplayer.png
Expand Down
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 "2020-04-25 10:30" {} \;
find . -exec touch -c -m -d "2020-06-06 10:30" {} \;
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.12.0.0/TTKService.exe"
"C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"2.13.0.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.12.0.0"
#define MyAppVersion "2.13.0.0"
#define MyAppPublisher "Greedysky Studio"
#define MyAppCopyright "Copyright (c) 2015 - 2020 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,12,0,0
PRODUCTVERSION 2,12,0,0
FILEVERSION 2,13,0,0
PRODUCTVERSION 2,13,0,0
FILEFLAGSMASK 0x3fL

#ifdef _DEBUG
Expand All @@ -28,12 +28,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Greedysky Studio, Ltd."
VALUE "FileDescription", "�������"
VALUE "FileVersion", "2.12.0.0"
VALUE "FileVersion", "2.13.0.0"
VALUE "InternalName", "�������.exe"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2020"
VALUE "OriginalFilename", "�������.exe"
VALUE "ProductName", "�������"
VALUE "ProductVersion", "2.12.0.0"
VALUE "ProductVersion", "2.13.0.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,12,0,0
PRODUCTVERSION 2,12,0,0
FILEVERSION 2,13,0,0
PRODUCTVERSION 2,13,0,0
FILEFLAGSMASK 0x3fL

#ifdef _DEBUG
Expand All @@ -25,10 +25,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Greedysky Studio, Ltd."
VALUE "FileDescription", "TTKExtras"
VALUE "FileVersion", "2.12.0.0"
VALUE "FileVersion", "2.13.0.0"
VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2020"
VALUE "ProductName", "TTKExtras"
VALUE "ProductVersion", "2.12.0.0"
VALUE "ProductVersion", "2.13.0.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 2020.04.25
TTKMusicPlayer = 2.12.0.0
# update time 2020.06.06
TTKMusicPlayer = 2.13.0.0
12 changes: 6 additions & 6 deletions ttkversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -136,17 +136,17 @@
* with this program; If not, see <http://www.gnu.org/licenses/>.
================================================= */

//update time 2020.04.25
#define TTKMUSIC_VERSION_STR "2.12.0.0"
#define TTKMUSIC_VERSION_WSTR L"2.12.0.0"
#define TTKMUSIC_VER_TIME_STR "(2020/04/25)"
//update time 2020.06.06
#define TTKMUSIC_VERSION_STR "2.13.0.0"
#define TTKMUSIC_VERSION_WSTR L"2.13.0.0"
#define TTKMUSIC_VER_TIME_STR "(2020/06/06)"

#define TTKMUSIC_MAJOR_VERSION 2
#define TTKMUSIC_MIDLE_VERSION 12
#define TTKMUSIC_MIDLE_VERSION 13
#define TTKMUSIC_MINOR_VERSION 0
#define TTKMUSIC_PATCH_VERSION 0

#define TTKMUSIC_VERSION 0x02C00
#define TTKMUSIC_VERSION 0x02D00

#define TTKMUSIC_VERSION_CHECK(major, middle, minor, patch) ((major<<12)|(middle<<8)|(minor<<4)|(patch))

Expand Down

0 comments on commit beb9ddb

Please sign in to comment.