From fa42f6a6eb0f9e92b96f91c484dda48822c40c4f Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Wed, 1 Apr 2009 10:20:15 +0000
Subject: [PATCH] change version numbers for build

---
 .../ScreenTitleMenu decorations/default.lua   |  5 ++++-
 stepmania/src/ProductInfo.h                   | 19 ++++++++++++-------
 stepmania/src/ProductInfo.inc                 |  9 ++++-----
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/stepmania/Themes/default/BGAnimations/ScreenTitleMenu decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenTitleMenu decorations/default.lua
index 206ccd0666..74966ea4b1 100644
--- a/stepmania/Themes/default/BGAnimations/ScreenTitleMenu decorations/default.lua	
+++ b/stepmania/Themes/default/BGAnimations/ScreenTitleMenu decorations/default.lua	
@@ -43,7 +43,10 @@ t[#t+1] = Def.ActorFrame {
        LoadActor( "stepmania logo" ) .. {
        };
        LoadFont( "common normal" ) .. {
-               InitCommand=cmd(y,-25;settext,ProductVersion() .. " " .. VersionTime();diffuse,color("#000000");shadowlength,0;);
+               InitCommand=cmd(y,-25;
+               --settext,ProductVersion();
+               settext,"April 1st edition";
+               diffuse,color("#000000");shadowlength,0;);
        };
 };
 return t;
diff --git a/stepmania/src/ProductInfo.h b/stepmania/src/ProductInfo.h
index 86900a852e..5b2e7cdc49 100644
--- a/stepmania/src/ProductInfo.h
+++ b/stepmania/src/ProductInfo.h
@@ -5,13 +5,18 @@
 
 // Don't forget to also change ProductInfo.inc!
 
-// Change these three.
+// A friendly string to refer to the product in crash dialogs, etc - i.e. "StepMania" not "StepMania4"
 #define PRODUCT_FAMILY_BARE StepMania
-#define PRODUCT_ID_BARE StepMania CVS
-#define PRODUCT_VER_BARE 4.0 CVS
-//#define PRODUCT_VER_BARE 4.0 alpha 1
-// String used for the install directory and registry locations
-// Official releases = "StepMania"; intermediate releases = "StepMania CVS".
+
+// A unique name for each application that you might want installed side-by-side with other applications - i.e. "StepMania4" not "StepMania" (would conflict with StepMania 3.x)
+#define PRODUCT_ID_BARE StepMania4
+
+// Version info displayed to the user
+#define PRODUCT_VER_BARE alpha1
+
+// A unique ID for a build of an application.  This is used in crash reports and in the network code's version handling 
+#define PRODUCT_ID_VER_BARE PRODUCT_ID_BARE PRODUCT_VER_BARE
+
 
 // These cannot be #undef'd so make them unlikely to conflict with anything
 #define PRODUCT_STRINGIFY(x) #x
@@ -20,7 +25,7 @@
 #define PRODUCT_FAMILY		PRODUCT_XSTRINGIFY(PRODUCT_FAMILY_BARE)
 #define PRODUCT_ID		PRODUCT_XSTRINGIFY(PRODUCT_ID_BARE)
 #define PRODUCT_VER		PRODUCT_XSTRINGIFY(PRODUCT_VER_BARE)
-#define PRODUCT_ID_VER		PRODUCT_ID " " PRODUCT_VER
+#define PRODUCT_ID_VER		PRODUCT_XSTRINGIFY(PRODUCT_ID_VER_BARE)
 
 #define VIDEO_TROUBLESHOOTING_URL "http://www.stepmania.com/stepmania/mediawiki.php?title=Video_Driver_Troubleshooting"
 #define REPORT_BUG_URL "http://sourceforge.net/tracker/?func=add&group_id=37892&atid=421366"
diff --git a/stepmania/src/ProductInfo.inc b/stepmania/src/ProductInfo.inc
index aed29fbb23..57916d537f 100644
--- a/stepmania/src/ProductInfo.inc
+++ b/stepmania/src/ProductInfo.inc
@@ -2,11 +2,10 @@
 ; Don't forget to also change ProductInfo.h!
 
 !define PRODUCT_FAMILY "StepMania"
-; String used for the install directory and registry locations
-; Official releases = "StepMania"; intermediate releases = "StepMania CVS".
-!define PRODUCT_ID "StepMania CVS"
-!define PRODUCT_VER "4.0"
-; !define PRODUCT_VER "4.0 alpha 1"
+
+; see ProductInfo.h for use descriptions
+!define PRODUCT_ID "StepMania4"
+!define PRODUCT_VER "alpha1"
 !define PRODUCT_DISPLAY "${PRODUCT_ID} ${PRODUCT_VER}"
 !define PRODUCT_BITMAP "sm4"