Skip to content

Commit

Permalink
Bump version 3.0.0.0 Final
Browse files Browse the repository at this point in the history
  • Loading branch information
Greedysky committed Nov 11, 2022
1 parent fc4e6df commit 39f79fa
Show file tree
Hide file tree
Showing 14 changed files with 22 additions and 21 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 2.8.11)

set(TTK_MAJOR_VERSION "2.15.12")
set(TTK_MAJOR_VERSION "3.0.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.15.12.0
PROJECT_NUMBER = 3.0.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.15.12.0-blue.svg?style=flat-square)
![Version](https://img.shields.io/badge/Version-3.0.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.15.12.0-blue.svg?style=flat-square)
![版本](https://img.shields.io/badge/Version-3.0.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.15.12.0-blue.svg?style=flat-square)
![版本](https://img.shields.io/badge/Version-3.0.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 TTKCommon/TTKLibrary/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ if(TTK_QT_VERSION VERSION_GREATER "4")
add_library(${PROJECT_NAME} STATIC ${MUSIC_SOURCES} ${MUSIC_MOC_H} ${MUSIC_HEADERS})
endif()

set(QT5_LIBS Qt5::Core Qt5::Gui Qt5::Widgets)
set(QT5_LIBS Qt5::Core Qt5::Xml Qt5::Gui Qt5::Widgets)
target_link_libraries(${PROJECT_NAME} ${QT5_LIBS})
else()
QT4_WRAP_CPP(MUSIC_MOC_H ${MUSIC_HEADERS})
Expand Down
16 changes: 8 additions & 8 deletions TTKCommon/ttkversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -158,19 +158,19 @@
* with this program; If not, see <http://www.gnu.org/licenses/>.
***************************************************************************/

//update time 2022.09.15
#define TTK_VERSION 0x02FC0
#define TTK_VERSION_STR "2.15.12.0"
#define TTK_VERSION_TIME_STR "(2022/09/15)"
//update time 2022.11.11
#define TTK_VERSION 0x03000
#define TTK_VERSION_STR "3.0.0.0"
#define TTK_VERSION_TIME_STR "(2022/11/11)"

#define TTK_MAJOR_VERSION 2
#define TTK_MIDLE_VERSION 15
#define TTK_MINOR_VERSION 12
#define TTK_MAJOR_VERSION 3
#define TTK_MIDLE_VERSION 0
#define TTK_MINOR_VERSION 0
#define TTK_PATCH_VERSION 0

#define TTK_CONFIG_VERSION_STR "1.0.1"

#define TTK_RC_FILEVERSION 2,15,12,0
#define TTK_RC_FILEVERSION 3,0,0,0
#define TTK_RC_PRODUCTVERSION TTK_VERSION_STR
#define TTK_RC_COMPANY "Greedysky Studio, Ltd."
#define TTK_RC_COPYRIGHT "Copyright (C) 2022 Greedysky Studio"
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.12.0:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/3.0.0.0:$LD_LIBRARY_PATH
export QT_PLUGIN_PATH=$dirpath/plugins:$QT_PLUGIN_PATH

$appname "$@"
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.12.0/TTKService.exe"
"C:\Program Files (x86)\Windows Kits\8.1\bin\x86\mt.exe" -manifest "manifest" -outputresource:"3.0.0.0/TTKService.exe"
2 changes: 1 addition & 1 deletion TTKScript/deploy/make_desktop.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ execpath="$PWD/../TTKMusicPlayer"

echo -n "[Desktop Entry]
Type=Application
Version=2.15.12.0
Version=3.0.0.0
Name=TTKMusicPlayer
Comment=天天酷音
Icon=$iconpath
Expand Down
1 change: 1 addition & 0 deletions TTKScript/deploy/share/appdata/ttkmusicplayer.appdata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<url type="homepage">https://github.com/Greedysky/TTKMusicPlayer</url>
<developer_name>Greedysky Studio</developer_name>
<releases>
<release version="3.0.0.0" date="2022-11-11" />
<release version="2.15.12.0" date="2022-09-15" />
<release version="2.15.11.0" date="2022-07-01" />
<release version="2.15.10.0" date="2022-05-28" />
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 "2022-09-15 12:00" {} \;
find . -exec touch -c -m -d "2022-11-11 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.12.0"
#define MyAppVersion "3.0.0.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 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.09.15
TTK_VERSION = 2.15.12.0
# update time 2022.11.11
TTK_VERSION = 3.0.0.0

0 comments on commit 39f79fa

Please sign in to comment.