Move branding and version strings for program and installer into ProductInfo.inc/h. This will make it easier to keep version the information up to date.

stepmania/src/ProductInfo.h

@@ -0,0 +1,6 @@
+// Currently, used only by the title screen.
+// Don't forget to also change ProductInfo.nsinc!
+
+#define PRODUCT_NAME "StepMania"
+#define PRODUCT_VER "3.9 alpha 2"
+#define PRODUCT_NAME_VER PRODUCT_NAME " " PRODUCT_VER

stepmania/src/ProductInfo.inc

@@ -0,0 +1,10 @@
+; Included by the NSIS installer script
+; Don't forget to also change ProductInfo.h!
+
+!define PRODUCT_NAME "StepMania"
+!define PRODUCT_VER "3.9 alpha 2"
+!define PRODUCT_NAME_VER "${PRODUCT_NAME} ${PRODUCT_VER}"
+
+; String used for the install directory and registry locations
+; Official releases = "StepMania"; intermediate releases = "StepMania CVS".
+!define PRODUCT_ID "StepMania CVS"

stepmania/src/ScreenTitleMenu.cpp

@@ -29,6 +29,7 @@
 #include "CodeDetector.h"
 #include "RageTextureManager.h"
 #include "UnlockSystem.h"
+#include "ProductInfo.h"
 
 
 #define LOGO_ON_COMMAND				THEME->GetMetric("ScreenTitleMenu","LogoOnCommand")
@@ -79,7 +80,7 @@ ScreenTitleMenu::ScreenTitleMenu() : Screen("ScreenTitleMenu")
 
 	m_textVersion.LoadFromFont( THEME->GetPathToF("Common normal") );
 	m_textVersion.Command( VERSION_ON_COMMAND );
-	m_textVersion.SetText( "CVS" );
+	m_textVersion.SetText( PRODUCT_VER );
 	this->AddChild( &m_textVersion );
 
 

stepmania/stepmania.nsi

@@ -4,19 +4,14 @@
 ; I use the following command to create the installer:
 ; D:\Program Files\NSIS>makensis.exe /v3 /cd "m:\Dev Projects\CVS\stepmania\stepmania.nsi"
 ;
-; NOTE: this .NSI script is designed for NSIS v1.8+
+; NOTE: this .NSI script is designed for NSIS v2.0+
 
-; Don't change this.
-!define PRODUCT_NAME "StepMania"
 
-!define VERSION "CVS"
-; !define VERSION "3.01"
-
-; If this is changed, different versions of SM can be installed
-; in parallel.  Normal releases should be StepMania; CVS releases
-; should be StepMania CVS.
-!define PRODUCT_ID "StepMania CVS"
-!define PRODUCT_NAME_VER "${PRODUCT_NAME} ${VERSION}"
+; Product info is in a separate file so that people will change
+; the version info for the installer and the program at the same time.
+; It's confusing when the installer and shortcut text doesn't match the 
+; title screen version text.
+!include "src\ProductInfo.inc"
 
 !system "echo This may take a moment ..." ignore
 !system "utils\upx StepMania.exe" ignore
@@ -27,9 +22,8 @@
 !system "utils\upx SDL.dll" ignore
 !system "utils\upx SDL_image.dll" ignore
 
-Name "${PRODUCT_NAME}"
-OutFile "StepMania-CVS-20030715a.exe"
-;OutFile "StepMania301.exe"
+Name "${PRODUCT_NAME_VER}"
+OutFile "${PRODUCT_NAME_VER}.exe"
 
 ; Some default compiler settings (uncomment and change at will):
 SetCompress auto ; (can be off or force)