Release on 2.5.1.0

Greedysky · Jul 6, 2017 · 0384e47 · 0384e47
1 parent 4c54b1f
commit 0384e47
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 37 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.0.0")
+set(TTK_VERSION "2.5.1.0")
 
 # Find includes in the build directories
 set(CMAKE_INCLUDE_CURRENT_DIR ON)

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

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

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

diff --git a/TTKMobile/android/AndroidManifest.xml b/TTKMobile/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="org.greedysky.ttkmobile" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.5" android:versionCode="0" android:installLocation="auto">
+<manifest package="org.greedysky.ttkmobile" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.5" android:versionCode="1" android:installLocation="auto">
     <application android:hardwareAccelerated="true" android:icon="@drawable/icon" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="天天酷音">
              <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.greedysky.ttkmobile.SplashScreen" android:label="天天酷音" android:screenOrientation="portrait" android:launchMode="singleTop" android:theme="@android:style/Theme.NoTitleBar">
             <intent-filter>

diff --git a/TTKMobile/android/res/values/strings.xml b/TTKMobile/android/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">天天酷音</string>
-    <string name="version_name">V2.5.0.0</string>
+    <string name="version_name">V2.5.1.0</string>
     <string name="copy_right">Copyright (c) 2017 Greedysky Studio</string>
     <string name="setting_about_description">畅享无限音乐</string>
 </resources>
diff --git a/TTKMusicPlayer.pro b/TTKMusicPlayer.pro
@@ -40,7 +40,7 @@ unix:{
     !exists($$output):system(mkdir $$output)
 
     system(find TTKLanguage -name *.ts | xargs $$LRELEASE_EXECUTABLE)
-    system(find TTKLanguage -name *.qm | xargs rename -vf 's/.qm/.ln/' *  )
+    system(find TTKLanguage -name *.qm | xargs rename -v -f 's/.qm/.ln/' *  )
     system(for F in TTKLanguage/*.ln ; do mv $F $$output ;done)
 }
 win32:{

diff --git a/TTKQrc/TTKQrc.rc b/TTKQrc/TTKQrc.rc
@@ -5,8 +5,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
-    FILEVERSION 2,5,0,0
-    PRODUCTVERSION 2,5,0,0
+    FILEVERSION 2,5,1,0
+    PRODUCTVERSION 2,5,1,0
     FILEFLAGSMASK 0x3fL
 
 #ifdef _DEBUG
@@ -25,10 +25,10 @@ BEGIN
             BEGIN
                 VALUE "CompanyName", "Greedysky studio, Ltd."
                 VALUE "FileDescription", "TTKUi"
-                VALUE "FileVersion", "2.5.0.0"
+                VALUE "FileVersion", "2.5.1.0"
                 VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2017"
                 VALUE "ProductName", "TTKUi"
-                VALUE "ProductVersion", "2.5.0.0"
+                VALUE "ProductVersion", "2.5.1.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.0.0"
+#define MyAppVersion "2.5.1.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: "make_cert.bat";Parameters:"D:\Qt\v2.5.0.0.exe" ;Flags: cmdprompt redirectoutput
+Name: "make_cert.bat";Parameters:"D:\Qt\v2.5.1.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,0,0
-    PRODUCTVERSION 2,5,0,0
+    FILEVERSION 2,5,1,0
+    PRODUCTVERSION 2,5,1,0
     FILEFLAGSMASK 0x3fL
 
 #ifdef _DEBUG
@@ -28,12 +28,12 @@ BEGIN
             BEGIN
                 VALUE "CompanyName", "Greedysky studio, Ltd."
                 VALUE "FileDescription", "�������"
-                VALUE "FileVersion", "2.5.0.0"
+                VALUE "FileVersion", "2.5.1.0"
                 VALUE "InternalName", "�������.exe"
                 VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2017"
                 VALUE "OriginalFilename", "�������.exe"
                 VALUE "ProductName", "�������"
-                VALUE "ProductVersion", "2.5.0.0"
+                VALUE "ProductVersion", "2.5.1.0"
             END
     END
     BLOCK "VarFileInfo"

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

diff --git a/TTKVersion.pri b/TTKVersion.pri
@@ -6,5 +6,5 @@
 # * works are strictly forbiden.
 # =================================================
 
-# update time 2017.06.06
-TTKMusicPlayer = 2.5.0.0
+# update time 2017.07.07
+TTKMusicPlayer = 2.5.1.0
diff --git a/musicversion.h b/musicversion.h
@@ -9,16 +9,16 @@
  * works are strictly forbiden.
    =================================================*/
 
-//update time 2017.06.06
-#define TTKMUSIC_VERSION_STR    "2.5.0.0"
-#define TTKMUSIC_VER_TIME_STR   "(2017/06/06)"
+//update time 2017.07.07
+#define TTKMUSIC_VERSION_STR    "2.5.1.0"
+#define TTKMUSIC_VER_TIME_STR   "(2017/07/07)"
 
 #define TTKMUSIC_MAJOR_VERSION 2
 #define TTKMUSIC_MIDLE_VERSION 5
-#define TTKMUSIC_MINOR_VERSION 0
+#define TTKMUSIC_MINOR_VERSION 1
 #define TTKMUSIC_PATCH_VERSION 0
 
-#define TTKMUSIC_VERSION 0x02500
+#define TTKMUSIC_VERSION 0x02510
 
 #define TTKMUSIC_VERSION_CHECK(major, middle, minor, patch) ((major<<12)|(middle<<8)|(minor<<4)|(patch))