Rename Beta to Nightly.

6 files changed, 23 insertions, 23 deletions

diff --git a/build.bat b/build.bat
index ee7c89492..0ed4b9fa4 100644
--- a/build.bat
+++ b/build.bat
@@ -463,8 +463,8 @@ FOR /F "tokens=2,3,4 delims=(" %%A IN ('FINDSTR /L /C:"define MPC_VERSION_REV_FU
   SET "MPC_VERSION_REV=%%A" & SET "MPCHC_HASH=%%B" & SET "MPCHC_BRANCH=%%C"

 )

 

-FOR /F "tokens=3" %%A IN ('FINDSTR /R /C:"define MPC_BETA_RELEASE" "include\version.h"') DO (

-  SET "MPCHC_BETA=%%A"

+FOR /F "tokens=3" %%A IN ('FINDSTR /R /C:"define MPC_NIGHTLY_RELEASE" "include\version.h"') DO (

+  SET "MPCHC_NIGHTLY=%%A"

 )

 

 SET "MPC_VERSION_REV=%MPC_VERSION_REV:~1,-1%"

@@ -475,7 +475,7 @@ IF "%MPCHC_BRANCH%" NEQ "" (
   SET "MPCHC_HASH=%MPCHC_HASH:~0,-3%"

 )

 

-IF "%MPCHC_BETA%" NEQ "0" (

+IF "%MPCHC_NIGHTLY%" NEQ "0" (

   SET "MPCHC_VER=%MPC_VERSION_MAJOR%.%MPC_VERSION_MINOR%.%MPC_VERSION_PATCH%.%MPC_VERSION_REV%"

 ) ELSE (

   SET "MPCHC_VER=%MPC_VERSION_MAJOR%.%MPC_VERSION_MINOR%.%MPC_VERSION_PATCH%"

diff --git a/distrib/mpc-hc_setup.iss b/distrib/mpc-hc_setup.iss
index 5cd6257e1..9bbe5c3b0 100644
--- a/distrib/mpc-hc_setup.iss
+++ b/distrib/mpc-hc_setup.iss
@@ -54,7 +54,7 @@
 

 #define app_ver_full    str(MPC_VERSION_MAJOR) + "." + str(MPC_VERSION_MINOR) + "." + str(MPC_VERSION_PATCH) + "." + str(MPC_VERSION_REV)

 

-#if MPC_BETA_RELEASE

+#if MPC_NIGHTLY_RELEASE

   #define app_ver       app_ver_full

 #else

   #define app_ver       str(MPC_VERSION_MAJOR) + "." + str(MPC_VERSION_MINOR) + "." + str(MPC_VERSION_PATCH)

@@ -99,14 +99,14 @@
   #define OutFilename    = OutFilename + ".VS2010"

 #endif

 

-#if MPC_BETA_RELEASE

+#if MPC_NIGHTLY_RELEASE

   #define FullAppNameVer = app_vername + " " + "(" + str(MPCHC_HASH) + ")"

 #else

   #define FullAppNameVer = app_vername

 #endif

 

-#if MPC_BETA_RELEASE

-  #define FullAppNameVer = FullAppNameVer + " " + "Beta"

+#if MPC_NIGHTLY_RELEASE

+  #define FullAppNameVer = FullAppNameVer + " " + str(MPC_VERSION_NIGHTLY)

 #endif

 #ifdef MPCHC_LITE

   #define FullAppNameVer = FullAppNameVer + " " + "Lite"

diff --git a/docs/Release.txt b/docs/Release.txt
index 906965509..2e94fd0c8 100644
--- a/docs/Release.txt
+++ b/docs/Release.txt
@@ -1,7 +1,7 @@
 Here is a quick how-to release a new stable build:
 
 1) Update "thirdparty/versions.txt" and the release date in "Changelog.txt"
-2) Set the MPC_BETA_RELEASE define to 0 in "include/version.h"
+2) Set the MPC_NIGHTLY_RELEASE define to 0 in "include/version.h"
 3) Commit the changes
 4) Make sure you have a clean source tree, no modified files, or unpushed commits
 5) Compile MPC-HC and the standalone filters:
@@ -15,5 +15,5 @@ Here is a quick how-to release a new stable build:
    the new version number
 
 
-In the next commit, bump the version and set the MPC_BETA_RELEASE define to 1
+In the next commit, bump the version and set the MPC_NIGHTLY_RELEASE define to 1
 in "include/version.h"
diff --git a/include/version.h b/include/version.h
index c5bd4935b..66c33d81f 100644
--- a/include/version.h
+++ b/include/version.h
@@ -55,7 +55,7 @@
 #define MPC_VERSION_MINOR   7

 #define MPC_VERSION_PATCH   0

 

-#define MPC_BETA_RELEASE    1

+#define MPC_NIGHTLY_RELEASE 1

 

 #define MPC_COMP_NAME_STR       _T("MPC-HC Team")

 #define MPC_COPYRIGHT_STR       _T("Copyright © 2002-2013 all contributors, see Authors.txt")

@@ -76,7 +76,7 @@
 

 #define MPC_VERSION_NUM         MPC_VERSION_MAJOR,MPC_VERSION_MINOR,MPC_VERSION_PATCH,MPC_VERSION_REV

 

-#if MPC_BETA_RELEASE

+#if MPC_NIGHTLY_RELEASE

 

 #define MPC_VERSION_STR         MAKE_STR(MPC_VERSION_MAJOR) _T(".") \

                                 MAKE_STR(MPC_VERSION_MINOR) _T(".") \

@@ -88,7 +88,7 @@
                                 MAKE_STR(MPC_VERSION_REV) \

                                 MPC_VERSION_ADDITIONAL

 

-#else // !MPC_BETA_RELEASE

+#else // !MPC_NIGHTLY_RELEASE

 

 #define MPC_VERSION_STR         MAKE_STR(MPC_VERSION_MAJOR) _T(".") \

                                 MAKE_STR(MPC_VERSION_MINOR) _T(".") \

@@ -98,15 +98,15 @@
                                 MAKE_STR(MPC_VERSION_PATCH) \

                                 MPC_VERSION_ADDITIONAL

 

-#endif // MPC_BETA_RELEASE

+#endif // MPC_NIGHTLY_RELEASE

 

 #endif // NO_VERSION_REV_NEEDED

 

 #endif // ISPP_INVOKED

 

 

-#if MPC_BETA_RELEASE

-#define MPC_VERSION_BETA        _T("Beta")

+#if MPC_NIGHTLY_RELEASE

+#define MPC_VERSION_NIGHTLY     _T("Nightly")

 #endif

 

 #ifdef _WIN64

diff --git a/src/filters/transform/VSFilter/installer/vsfilter_setup.iss b/src/filters/transform/VSFilter/installer/vsfilter_setup.iss
index 96c12b31b..2b56587ed 100644
--- a/src/filters/transform/VSFilter/installer/vsfilter_setup.iss
+++ b/src/filters/transform/VSFilter/installer/vsfilter_setup.iss
@@ -66,14 +66,14 @@
   #define OutFilename   = OutFilename + ".VS2010"

 #endif

 

-#if MPC_BETA_RELEASE

+#if MPC_NIGHTLY_RELEASE

   #define FullAppNameVer = app_vername + " " + "(" + str(MPCHC_HASH) + ")"

 #else

   #define FullAppNameVer = app_vername

 #endif

 

-#if MPC_BETA_RELEASE

-  #define FullAppNameVer = FullAppNameVer + " " + str(MPC_VERSION_BETA)

+#if MPC_NIGHTLY_RELEASE

+  #define FullAppNameVer = FullAppNameVer + " " + str(MPC_VERSION_NIGHTLY)

 #endif

 #ifdef x64Build

   #define FullAppNameVer = FullAppNameVer + " " + "(64-bit)"

diff --git a/src/mpc-hc/AboutDlg.cpp b/src/mpc-hc/AboutDlg.cpp
index bfc883423..aee245253 100644
--- a/src/mpc-hc/AboutDlg.cpp
+++ b/src/mpc-hc/AboutDlg.cpp
@@ -60,15 +60,15 @@ 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, 48, 48, LR_SHARED));

 

-#if MPC_BETA_RELEASE || _WIN64

+#if MPC_NIGHTLY_RELEASE || _WIN64

     m_appname += _T(" (");

 #endif

 

-#if MPC_BETA_RELEASE

-    m_appname += MPC_VERSION_BETA;

+#if MPC_NIGHTLY_RELEASE

+    m_appname += MPC_VERSION_NIGHTLY;

 #endif

 

-#if MPC_BETA_RELEASE && _WIN64

+#if MPC_NIGHTLY_RELEASE && _WIN64

     m_appname += _T(", ");

 #endif

 

@@ -76,7 +76,7 @@ BOOL CAboutDlg::OnInitDialog()
     m_appname += _T("64-bit");

 #endif

 

-#if MPC_BETA_RELEASE || _WIN64

+#if MPC_NIGHTLY_RELEASE || _WIN64

     m_appname += _T(")");

 #endif