Release on 2.6.0.0 Final

Greedysky · Sep 6, 2017 · 1528bf0 · 1528bf0
1 parent 2d2b90d
commit 1528bf0
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 33 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.11)
 
 add_definitions(-DMUSIC_LIBRARY)
 
-set(TTK_VERSION "2.5.3.0")
+set(TTK_VERSION "2.6.0.0")
 
 # Find includes in the build directories
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -180,4 +180,4 @@ add_subdirectory(TTKThirdParty)
 add_subdirectory(TTKCore)
 add_subdirectory(TTKService)
 add_subdirectory(TTKRun)
-add_subdirectory(TTKTest)
+add_subdirectory(TTKTest)
diff --git a/TTKCore/TTKCore.rc b/TTKCore/TTKCore.rc
@@ -5,8 +5,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
-    FILEVERSION 2,5,3,0
-    PRODUCTVERSION 2,5,3,0
+    FILEVERSION 2,6,0,0
+    PRODUCTVERSION 2,6,0,0
     FILEFLAGSMASK 0x3fL
 
 #ifdef _DEBUG
@@ -25,10 +25,10 @@ BEGIN
             BEGIN
                 VALUE "CompanyName", "Greedysky studio, Ltd."
                 VALUE "FileDescription", "TTKCore"
-                VALUE "FileVersion", "2.5.3.0"
+                VALUE "FileVersion", "2.6.0.0"
                 VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2017"
                 VALUE "ProductName", "TTKCore"
-                VALUE "ProductVersion", "2.5.3.0"
+                VALUE "ProductVersion", "2.6.0.0"
             END
     END
     BLOCK "VarFileInfo"

diff --git a/TTKQrc/TTKQrc.rc b/TTKQrc/TTKQrc.rc
@@ -5,8 +5,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
-    FILEVERSION 2,5,3,0
-    PRODUCTVERSION 2,5,3,0
+    FILEVERSION 2,6,0,0
+    PRODUCTVERSION 2,6,0,0
     FILEFLAGSMASK 0x3fL
 
 #ifdef _DEBUG
@@ -25,10 +25,10 @@ BEGIN
             BEGIN
                 VALUE "CompanyName", "Greedysky studio, Ltd."
                 VALUE "FileDescription", "TTKUi"
-                VALUE "FileVersion", "2.5.3.0"
+                VALUE "FileVersion", "2.6.0.0"
                 VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2017"
                 VALUE "ProductName", "TTKUi"
-                VALUE "ProductVersion", "2.5.3.0"
+                VALUE "ProductVersion", "2.6.0.0"
             END
     END
     BLOCK "VarFileInfo"

diff --git a/TTKRun/TTKApp/TTKApp.rc b/TTKRun/TTKApp/TTKApp.rc
@@ -7,8 +7,8 @@
 IDI_ICON1                ICON     DISCARDABLE     "../../TTKResource/lb_player_logo.ico"
 
 VS_VERSION_INFO VERSIONINFO
-    FILEVERSION 2,5,3,0
-    PRODUCTVERSION 2,5,3,0
+    FILEVERSION 2,6,0,0
+    PRODUCTVERSION 2,6,0,0
     FILEFLAGSMASK 0x3fL
 
 #ifdef _DEBUG
@@ -27,12 +27,12 @@ BEGIN
             BEGIN
                 VALUE "CompanyName", "Greedysky studio, Ltd."
                 VALUE "FileDescription", "�������"
-                VALUE "FileVersion", "2.5.3.0"
+                VALUE "FileVersion", "2.6.0.0"
                 VALUE "InternalName", "�������.exe"
                 VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2017"
                 VALUE "OriginalFilename", "�������.exe"
                 VALUE "ProductName", "�������"
-                VALUE "ProductVersion", "2.5.3.0"
+                VALUE "ProductVersion", "2.6.0.0"
             END
     END
     BLOCK "VarFileInfo"

diff --git a/TTKScript/ttk.iss b/TTKScript/ttk.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "ÌìÌì¿áÒô"
-#define MyAppVersion "2.5.3.0"
+#define MyAppVersion "2.6.0.0"
 #define MyAppPublisher "Copyright (c) 2015 - 2017 Greedysky Studio"
 #define MyAppURL "http://download.csdn.net/album/detail/3094"
 #define MyAppExeName "TTKMusicPlayer.exe"
@@ -48,4 +48,4 @@ Filename: "{sys}\cmd.exe"; Parameters:" /c takeown /f ""{app}"" /r /d y & icacls
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
 
 [PostCompile]
-Name: "D:\Qt\Workspace\TTKMusicplayer\TTKScript\make_cert.bat";Parameters:"D:\Qt\v2.5.3.0.exe" ;Flags: cmdprompt redirectoutput
+Name: "D:\Qt\Workspace\TTKMusicplayer\TTKScript\make_cert.bat";Parameters:"D:\Qt\v2.6.0.0.exe" ;Flags: cmdprompt redirectoutput
diff --git a/TTKService/TTKService.rc b/TTKService/TTKService.rc
@@ -8,8 +8,8 @@ IDI_ICON1                ICON     DISCARDABLE     "../TTKResource/lb_player_logo
 IDI_ICON2                ICON     DISCARDABLE     "../TTKResource/fileIcon/fileIcon.ico"
 
 VS_VERSION_INFO VERSIONINFO
-    FILEVERSION 2,5,3,0
-    PRODUCTVERSION 2,5,3,0
+    FILEVERSION 2,6,0,0
+    PRODUCTVERSION 2,6,0,0
     FILEFLAGSMASK 0x3fL
 
 #ifdef _DEBUG
@@ -28,12 +28,12 @@ BEGIN
             BEGIN
                 VALUE "CompanyName", "Greedysky studio, Ltd."
                 VALUE "FileDescription", "�������"
-                VALUE "FileVersion", "2.5.3.0"
+                VALUE "FileVersion", "2.6.0.0"
                 VALUE "InternalName", "�������.exe"
                 VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2017"
                 VALUE "OriginalFilename", "�������.exe"
                 VALUE "ProductName", "�������"
-                VALUE "ProductVersion", "2.5.3.0"
+                VALUE "ProductVersion", "2.6.0.0"
             END
     END
     BLOCK "VarFileInfo"

diff --git a/TTKThirdParty/TTKExtras/TTKExtras.rc b/TTKThirdParty/TTKExtras/TTKExtras.rc
@@ -5,8 +5,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
-    FILEVERSION 2,5,3,0
-    PRODUCTVERSION 2,5,3,0
+    FILEVERSION 2,6,0,0
+    PRODUCTVERSION 2,6,0,0
     FILEFLAGSMASK 0x3fL
 
 #ifdef _DEBUG
@@ -25,10 +25,10 @@ BEGIN
             BEGIN
                 VALUE "CompanyName", "Greedysky studio, Ltd."
                 VALUE "FileDescription", "TTKExtras"
-                VALUE "FileVersion", "2.5.3.0"
+                VALUE "FileVersion", "2.6.0.0"
                 VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2017"
                 VALUE "ProductName", "TTKExtras"
-                VALUE "ProductVersion", "2.5.3.0"
+                VALUE "ProductVersion", "2.6.0.0"
             END
     END
     BLOCK "VarFileInfo"

diff --git a/TTKVersion.pri b/TTKVersion.pri
@@ -6,5 +6,5 @@
 # * works are strictly forbiden.
 # =================================================
 
-# update time 2017.08.08
-TTKMusicPlayer = 2.5.3.0
+# update time 2017.09.09
+TTKMusicPlayer = 2.6.0.0
diff --git a/musicversion.h b/musicversion.h
@@ -9,17 +9,17 @@
  * works are strictly forbiden.
    =================================================*/
 
-//update time 2017.08.08
-#define TTKMUSIC_VERSION_STR    "2.5.3.0"
-#define TTKMUSIC_VERSION_STRW   L"2.5.3.0"
-#define TTKMUSIC_VER_TIME_STR   "(2017/08/08)"
+//update time 2017.09.09
+#define TTKMUSIC_VERSION_STR    "2.6.0.0"
+#define TTKMUSIC_VERSION_STRW   L"2.6.0.0"
+#define TTKMUSIC_VER_TIME_STR   "(2017/09/09)"
 
 #define TTKMUSIC_MAJOR_VERSION 2
-#define TTKMUSIC_MIDLE_VERSION 5
-#define TTKMUSIC_MINOR_VERSION 3
+#define TTKMUSIC_MIDLE_VERSION 6
+#define TTKMUSIC_MINOR_VERSION 0
 #define TTKMUSIC_PATCH_VERSION 0
 
-#define TTKMUSIC_VERSION 0x02530
+#define TTKMUSIC_VERSION 0x02600
 
 #define TTKMUSIC_VERSION_CHECK(major, middle, minor, patch) ((major<<12)|(middle<<8)|(minor<<4)|(patch))