diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2013-05-04 12:45:09 +0400 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2013-05-04 12:45:09 +0400 |
commit | c655b1c482f0acc47d4fdc4674bdf4af7d1c45f9 (patch) | |
tree | 987b8e76983ec4f703d169aeda02e5dafacdc18d | |
parent | 7afe8ce3ce5bb988b21a2e3a4b27edf7d7d81830 (diff) |
Distinguish the stable from the beta builds.
-rw-r--r-- | distrib/mpc-hc_setup.iss | 91 | ||||
-rw-r--r-- | include/version.h | 4 | ||||
-rw-r--r-- | src/mpc-hc/AboutDlg.cpp | 18 |
3 files changed, 74 insertions, 39 deletions
diff --git a/distrib/mpc-hc_setup.iss b/distrib/mpc-hc_setup.iss index 58a9fc90f..eccc9a18e 100644 --- a/distrib/mpc-hc_setup.iss +++ b/distrib/mpc-hc_setup.iss @@ -49,29 +49,48 @@ #include "..\include\mpc-hc_config.h"
#include "..\include\version.h"
-#define copyright_year "2002-2013"
-#define app_name "MPC-HC"
-#define app_version str(MPC_VERSION_MAJOR) + "." + str(MPC_VERSION_MINOR) + "." + str(MPC_VERSION_PATCH) + "." + str(MPC_VERSION_REV)
-#define app_vername = app_name + " " + app_version
-#define app_verhash = "(" + str(MPCHC_HASH) + ")"
-#define quick_launch "{userappdata}\Microsoft\Internet Explorer\Quick Launch"
+#define copyright_year "2002-2013"
+#define app_name "MPC-HC"
+
+#define app_ver_full str(MPC_VERSION_MAJOR) + "." + str(MPC_VERSION_MINOR) + "." + str(MPC_VERSION_PATCH) + "." + str(MPC_VERSION_REV)
+
+#if MPC_BETA_RELEASE
+ #define app_ver app_ver_full
+#else
+ #define app_ver str(MPC_VERSION_MAJOR) + "." + str(MPC_VERSION_MINOR) + "." + str(MPC_VERSION_PATCH)
+#endif
+
+#define app_vername = app_name + " " + app_ver
+#define quick_launch "{userappdata}\Microsoft\Internet Explorer\Quick Launch"
+
+#if MPC_BETA_RELEASE
+ #define ver_suffix str(MPC_VERSION_BETA)
+#endif
#if defined(VS2012)
- #define base_bindir = "..\bin12"
+ #define base_bindir = "..\bin12"
#else
- #define base_bindir = "..\bin"
+ #define base_bindir = "..\bin"
#endif
#ifdef x64Build
- #define bindir = base_bindir + "\mpc-hc_x64"
- #define mpchc_exe = "mpc-hc64.exe"
- #define mpchc_ini = "mpc-hc64.ini"
- #define OutFilename = app_name + "." + app_version + ".x64"
+ #define bindir = base_bindir + "\mpc-hc_x64"
+ #define mpchc_exe = "mpc-hc64.exe"
+ #define mpchc_ini = "mpc-hc64.ini"
+ #define OutFilename = app_name + "." + app_ver + ".x64"
#else
- #define bindir = base_bindir + "\mpc-hc_x86"
- #define mpchc_exe = "mpc-hc.exe"
- #define mpchc_ini = "mpc-hc.ini"
- #define OutFilename = app_name + "." + app_version + ".x86"
+ #define bindir = base_bindir + "\mpc-hc_x86"
+ #define mpchc_exe = "mpc-hc.exe"
+ #define mpchc_ini = "mpc-hc.ini"
+ #define OutFilename = app_name + "." + app_ver + ".x86"
+#endif
+
+#ifnexist bindir + "\" + mpchc_exe
+ #error Compile MPC-HC first
+#endif
+
+#if MPC_BETA_RELEASE
+ #define OutFilename = OutFilename + "." + ver_suffix
#endif
#if localize != "true"
@@ -83,26 +102,23 @@ #endif
#if defined(VS2012)
- #define OutFilename = OutFilename + ".VS2012"
+ #define OutFilename = OutFilename + ".VS2012"
#endif
-#ifnexist bindir + "\" + mpchc_exe
- #error Compile MPC-HC first
+#if MPC_BETA_RELEASE
+ #define FullAppNameVer = app_vername + " " + "(" + str(MPCHC_HASH) + ")"
+#else
+ #define FullAppNameVer = app_vername
#endif
-
+#if MPC_BETA_RELEASE
+ #define FullAppNameVer = FullAppNameVer + " " + "Beta"
+#endif
+#ifdef MPCHC_LITE
+ #define FullAppNameVer = FullAppNameVer + " " + "Lite"
+#endif
#ifdef x64Build
- #ifdef MPCHC_LITE
- #define FullAppNameVer = app_vername + " " + app_verhash + "Lite (64-bit)"
- #else
- #define FullAppNameVer = app_vername + " " + app_verhash + " (64-bit)"
- #endif
-#else
- #ifdef MPCHC_LITE
- #define FullAppNameVer = app_vername + " " + app_verhash + " Lite"
- #else
- #define FullAppNameVer = app_vername + " " + app_verhash
- #endif
+ #define FullAppNameVer = FullAppNameVer + " " + "(64-bit)"
#endif
@@ -110,17 +126,15 @@ #ifdef x64Build
AppId={{2ACBF1FA-F5C3-4B19-A774-B22A31F231B9}
DefaultGroupName={#app_name} x64
-UninstallDisplayName={#FullAppNameVer}
ArchitecturesAllowed=x64
ArchitecturesInstallIn64BitMode=x64
#else
AppId={{2624B969-7135-4EB1-B0F6-2D8C397B45F7}
DefaultGroupName={#app_name}
-UninstallDisplayName={#FullAppNameVer}
#endif
AppName={#app_name}
-AppVersion={#app_version}
+AppVersion={#app_ver_full}
AppVerName={#app_vername}
AppPublisher=MPC-HC Team
AppPublisherURL={#WEBSITE_URL}
@@ -132,11 +146,12 @@ VersionInfoCompany=MPC-HC Team VersionInfoCopyright=Copyright © {#copyright_year}, MPC-HC Team
VersionInfoDescription={#app_name} Setup
VersionInfoProductName={#app_name}
-VersionInfoProductVersion={#app_version}
-VersionInfoProductTextVersion={#app_version}
-VersionInfoTextVersion={#app_version}
-VersionInfoVersion={#app_version}
+VersionInfoProductVersion={#app_ver_full}
+VersionInfoProductTextVersion={#app_ver_full}
+VersionInfoTextVersion={#app_ver_full}
+VersionInfoVersion={#app_ver_full}
UninstallDisplayIcon={app}\{#mpchc_exe}
+UninstallDisplayName={#FullAppNameVer}
OutputBaseFilename={#OutFilename}
DefaultDirName={code:GetInstallFolder}
LicenseFile=..\COPYING.txt
diff --git a/include/version.h b/include/version.h index 5cf763f60..e2c5cb2a3 100644 --- a/include/version.h +++ b/include/version.h @@ -55,6 +55,7 @@ #define MPC_VERSION_MINOR 6
#define MPC_VERSION_PATCH 8
+#define MPC_BETA_RELEASE 1
#define MPC_COMP_NAME_STR _T("MPC-HC Team")
#define MPC_COPYRIGHT_STR _T("Copyright © 2002-2013 all contributors, see Authors.txt")
@@ -74,6 +75,9 @@ #endif // ISPP_INVOKED
+#if MPC_BETA_RELEASE
+#define MPC_VERSION_BETA _T("Beta")
+#endif
#ifdef _WIN64
#define MPC_VERSION_ARCH _T("x64")
diff --git a/src/mpc-hc/AboutDlg.cpp b/src/mpc-hc/AboutDlg.cpp index 6f567f333..54c4e8a4a 100644 --- a/src/mpc-hc/AboutDlg.cpp +++ b/src/mpc-hc/AboutDlg.cpp @@ -58,8 +58,24 @@ BOOL CAboutDlg::OnInitDialog() // Because we set LR_SHARED, there is no need to explicitly destroy the icon
m_icon.SetIcon((HICON)LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDR_MAINFRAME), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE | LR_SHARED));
+#if MPC_BETA_RELEASE || _WIN64
+ m_appname += _T(" (");
+#endif
+
+#if MPC_BETA_RELEASE
+ m_appname += MPC_VERSION_BETA;
+#endif
+
+#if MPC_BETA_RELEASE && _WIN64
+ m_appname += _T(", ");
+#endif
+
#ifdef _WIN64
- m_appname += _T(" (64-bit)");
+ m_appname += _T("64-bit");
+#endif
+
+#if MPC_BETA_RELEASE || _WIN64
+ m_appname += _T(")");
#endif
#ifdef MPCHC_LITE
|