Релиз 1.6.3.

Aleksoid1978 · Jun 15, 2022 · 791057b · 791057b
1 parent e610cdb
commit 791057b
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 115 deletions.
diff --git a/build.bat b/build.bat
@@ -68,7 +68,7 @@ FOR %%A IN (%ARG%) DO (
 
 REM pre-build checks
 
-IF NOT EXIST "revision.h" CALL "update_version.bat"
+IF NOT EXIST "revision.h" CALL "update_revision.cmd"
 
 IF EXIST "environments.bat" CALL "environments.bat"
 
@@ -485,11 +485,13 @@ FOR /F "tokens=3,4 delims= " %%A IN (
   'FINDSTR /I /L /C:"define REV_HASH" "revision.h"') DO (SET "REVHASH=%%A")
 
 SET MPCBE_VER=%VerMajor%.%VerMinor%.%VerPatch%.%REVNUM%
+SET "SUFFIX_GIT=_git%REVDATE%-%REVHASH%"
 
 IF /I "%VERRELEASE%" == "1" (
+  IF /I "%REVNUM%" == "0" (
+    SET MPCBE_VER=%VerMajor%.%VerMinor%.%VerPatch%
+  )
   SET "SUFFIX_GIT="
-) ELSE (
-  SET "SUFFIX_GIT=_git%REVDATE%-%REVHASH%"
 )
 
 

diff --git a/distrib/mpc-be_setup.iss b/distrib/mpc-be_setup.iss
@@ -46,8 +46,11 @@
 #define app_name         "MPC-BE"
 #define copyright_year   str(MPC_YEAR_COMMENTS)
 #define app_url          str(MPC_VERSION_COMMENTS)
-#define app_version      str(MPC_VERSION_MAJOR) + "." + str(MPC_VERSION_MINOR) + "." + str(MPC_VERSION_PATCH)
-#define app_version_svn  str(MPC_VERSION_MAJOR) + "." + str(MPC_VERSION_MINOR) + "." + str(MPC_VERSION_PATCH) + "." + str(MPC_VERSION_REV)
+#if MPC_VERSION_STATUS == 1 && MPC_VERSION_REV == 0
+  #define app_version    str(MPC_VERSION_MAJOR) + "." + str(MPC_VERSION_MINOR) + "." + str(MPC_VERSION_PATCH)
+#else
+  #define app_version    str(MPC_VERSION_MAJOR) + "." + str(MPC_VERSION_MINOR) + "." + str(MPC_VERSION_PATCH) + "." + str(MPC_VERSION_REV)
+#endif  
 #define quick_launch     "{userappdata}\Microsoft\Internet Explorer\Quick Launch"
 
 #define bin_dir        = "..\_bin"
@@ -61,7 +64,7 @@
   #define mpcbe_ini    = "mpc-be64.ini"
   #define mpcbe_reg    = "mpc-be64"
   #define dxdir        = "DirectX\x64"
-  #define BeveledLabel = app_name + " x64 " + app_version_svn
+  #define BeveledLabel = app_name + " x64 " + app_version
   #define Description  = app_name + " x64 " + app_version
   #define msdk_dll     = "libmfxsw64.dll"
   #define msdk_dll_zip = "libmfxsw64.dll.zip"
@@ -72,7 +75,7 @@
   #define mpcbe_ini    = "mpc-be.ini"
   #define mpcbe_reg    = "mpc-be"
   #define dxdir        = "DirectX\x86"
-  #define BeveledLabel = app_name + " " + app_version_svn
+  #define BeveledLabel = app_name + " " + app_version
   #define Description  = app_name + " " + app_version
   #define msdk_dll     = "libmfxsw32.dll"
   #define msdk_dll_zip = "libmfxsw32.dll.zip"
@@ -83,25 +86,25 @@
 #ifdef x64Build
 AppId={{FE09AF6D-78B2-4093-B012-FCDAF78693CE}
 DefaultGroupName={#app_name} x64
-OutputBaseFilename={#app_name}.{#app_version_svn}.x64
-UninstallDisplayName={#app_name} x64 {#app_version_svn}
+OutputBaseFilename={#app_name}.{#app_version}.x64
+UninstallDisplayName={#app_name} x64 {#app_version}
 ArchitecturesAllowed=x64
 ArchitecturesInstallIn64BitMode=x64 ia64
 AppName={#app_name} x64
-AppVerName={#app_name} x64 {#app_version_svn}
+AppVerName={#app_name} x64 {#app_version}
 VersionInfoDescription={#app_name} x64 Setup
 VersionInfoProductName={#app_name} x64
 #else
 AppId={{903D098F-DD50-4342-AD23-DA868FCA3126}
 DefaultGroupName={#app_name}
-OutputBaseFilename={#app_name}.{#app_version_svn}.x86
-UninstallDisplayName={#app_name} {#app_version_svn}
+OutputBaseFilename={#app_name}.{#app_version}.x86
+UninstallDisplayName={#app_name} {#app_version}
 AppName={#app_name}
-AppVerName={#app_name} {#app_version_svn}
+AppVerName={#app_name} {#app_version}
 VersionInfoDescription={#app_name} Setup
 VersionInfoProductName={#app_name}
 #endif
-AppVersion={#app_version_svn}
+AppVersion={#app_version}
 AppPublisher={#app_name} Team
 AppPublisherURL={#app_url}
 AppSupportURL={#app_url}
@@ -110,10 +113,10 @@ AppContact={#app_url}
 AppCopyright=Copyright © {#copyright_year} all contributors, see Authors.txt
 VersionInfoCompany={#app_name} Team
 VersionInfoCopyright=Copyright © {#copyright_year}, {#app_name} Team
-VersionInfoProductVersion={#app_version_svn}
-VersionInfoProductTextVersion={#app_version_svn}
-VersionInfoTextVersion={#app_version_svn}
-VersionInfoVersion={#app_version_svn}
+VersionInfoProductVersion={#app_version}
+VersionInfoProductTextVersion={#app_version}
+VersionInfoTextVersion={#app_version}
+VersionInfoVersion={#app_version}
 UninstallDisplayIcon={app}\{#mpcbe_exe}
 DefaultDirName={code:GetInstallFolder}
 LicenseFile=..\docs\COPYING.txt

diff --git a/docs/Authors.txt b/docs/Authors.txt
@@ -33,6 +33,7 @@ Italian               : Lord Maius
 Korean                : kuh3h3
 Polish                : Volfield, maxoku
 Portuguese (Brazil)   : SIEGFRIED JANKE
+Spanish               : IPeluchito
 Turkish               : Thingol, cmhrky
 Ukrainian             : arestarh1986
 Japanese              : Gyeong, Socket774

diff --git a/docs/Changelog.Rus.txt b/docs/Changelog.Rus.txt
@@ -1,6 +1,6 @@
 В этом файле отображаются только ключевые изменения между разными версиями Media Player Classic - BE.
 
-1.6.2 alpha
+1.6.3
 =============================
 MpaSplitter
 Исправлена работа с онлайн потоками.

diff --git a/docs/Changelog.txt b/docs/Changelog.txt
@@ -1,6 +1,6 @@
 This file includes only a short list of the changes between Media Player Classic - BE's versions.
 
-1.6.2 alpha
+1.6.3
 =============================
 MpaSplitter
 Fixed working with online streams.

diff --git a/include/Version.h b/include/Version.h
@@ -45,9 +45,9 @@
 
 #define MPC_VERSION_MAJOR       1
 #define MPC_VERSION_MINOR       6
-#define MPC_VERSION_PATCH       2
+#define MPC_VERSION_PATCH       3
 
-#define MPC_VERSION_STATUS      0
+#define MPC_VERSION_STATUS      1
 // MPC_VERSION_STATUS: 0 - alpha/beta; 1 - stable
 
 #define MPC_YEAR_COMMENTS       "2002-2022"

diff --git a/src/apps/mplayerc/AboutDlg.cpp b/src/apps/mplayerc/AboutDlg.cpp
@@ -52,7 +52,7 @@ BOOL CAboutDlg::OnInitDialog()
 
 	m_strVersionNumber.Append(MPC_VERSION_FULL_WSTR);
 #if (MPC_VERSION_STATUS == 0)
-	m_strVersionNumber.Append(L" alpha");
+	m_strVersionNumber.Append(L" beta");
 #endif
 #ifdef _DEBUG
 	m_strVersionNumber.Append(L", Debug");

diff --git a/src/apps/mplayerc/MainFrm.cpp b/src/apps/mplayerc/MainFrm.cpp
@@ -143,9 +143,13 @@ static LPCWSTR s_strPlayerTitle = "MPC-BE "
 	L"x64 "
 #endif
 #if (MPC_VERSION_STATUS == 1)
-	MPC_VERSION_WSTR;
+	#if (MPC_VERSION_REV == 0)
+		MPC_VERSION_WSTR;
+	#else
+		MPC_VERSION_FULL_WSTR;
+	#endif
 #else
-	MPC_VERSION_FULL_WSTR " alpha";
+	MPC_VERSION_FULL_WSTR " beta";
 #endif
 
 /////////////////////////////////////////////////////////////////////////////

diff --git a/src/apps/mplayerc/mpc-be.vcxproj b/src/apps/mplayerc/mpc-be.vcxproj
@@ -49,7 +49,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <PreBuildEvent>
-      <Command>..\..\..\update_version.bat</Command>
+      <Command>..\..\..\update_revision.cmd</Command>
     </PreBuildEvent>
     <ResourceCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

diff --git a/src/filters/filters/Filters.vcxproj b/src/filters/filters/Filters.vcxproj
@@ -45,7 +45,7 @@
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <PreBuildEvent>
-      <Command>..\..\..\update_version.bat</Command>
+      <Command>..\..\..\update_revision.cmd</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>

diff --git a/update_version.bat b/update_version.bat