Merge branch 'master' of https://github.com/stepmania/stepmania

.gitignore

@@ -77,6 +77,7 @@ GtkModule.so
 # StepMania Specific
 *.smzip
 ver.cpp
+gitversion.h
 Cache/
 Save/
 Logs/

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT(StepMania 5, beta 0, [https://github.com/stepmania/stepmania], StepMania, [http://stepmania.com])
+AC_INIT(StepMania, 5.0, [https://github.com/stepmania/stepmania], StepMania, [http://stepmania.com])
 AC_CONFIG_SRCDIR([src/StepMania.cpp])
 AC_CONFIG_AUX_DIR(autoconf)
 AC_CANONICAL_TARGET
@@ -349,6 +349,7 @@ AM_CONDITIONAL(HAVE_PTHREAD, test "$have_pthread" = "yes")
 # Always:
 AC_DEFINE(_GNU_SOURCE, 1, [Use GNU extensions])
 AC_DEFINE(__STDC_FORMAT_MACROS, 1, [Use PRId64 and similar])
+AC_DEFINE(USE_GITVERSION, 1, [We are generating gitversion.h])
 
 AM_CONDITIONAL(HAVE_ALSA, test x$alsa != xfalse )
 AM_CONDITIONAL(HAVE_GTK, test "$enable_gtk2" != "no" )

src/Makefile.am

@@ -28,12 +28,10 @@ AM_CXXFLAGS += -finline-limit=300
 
 AM_CXXFLAGS += $(GL_CFLAGS)
 
-.PHONY: increment_version
+.PHONY: increment_version gitversion
-
-all: increment_version
 
 increment_version:
-	if test -e ver.cpp; then \
+	if test -e ver.h; then \
 		build=`sed -rs 's/.*version_num = ([[:digit:]]+);/\1/;q' ver.cpp`; \
 		build=`expr $$build + 1`; \
 	else \
@@ -43,8 +41,17 @@ increment_version:
 	echo "extern const char *const version_time = \"`date +"%X %Z (UTC%:z)"`\";" >> ver.cpp;
 	echo "extern const char *const version_date = \"`date +"%Y%m%d"`\";" >> ver.cpp;
 
-ver.cpp:
+ver.cpp: increment_version
-	$(MAKE) increment_version
+
+gitversion:
+	rm -f gitversion.h
+	touch gitversion.h
+	if git rev-parse --short HEAD; then \
+		echo "#define PRODUCT_VER_BARE 5.0-git-`git rev-parse --short HEAD`" > gitversion.h; \
+	fi
+
+gitversion.h: gitversion
+ProductInfo.h: gitversion.h
 
 PNG = \
 ../extern/libpng/include/png.c ../extern/libpng/include/.png.h \
@@ -737,7 +744,7 @@ main_LDADD = \
 		$(GL_LIBS) \
 		libtomcrypt.a libtommath.a
 
-nodist_stepmania_SOURCES = ver.cpp
+nodist_stepmania_SOURCES = ver.cpp gitversion.h
 
 stepmania_CPPFLAGS = $(main_CPPFLAGS)
 stepmania_SOURCES = $(main_SOURCES)

src/ProductInfo.h

@@ -3,6 +3,12 @@
 #ifndef PRODUCT_INFO_H
 #define PRODUCT_INFO_H
 
+// XXX: VC doesn't generate this yet. Hack around it for now
+#include "config.h"
+#ifdef USE_GITVERSION
+#include "gitversion.h"
+#endif
+
 /**
  * @brief A friendly string to refer to the product in crash dialogs, etc.
  *
@@ -16,7 +22,7 @@
  * As an example, use "StepMania4" here, not "StepMania".
  * It would cause a conflict with older versions such as StepMania 3.X.
  */
-#define PRODUCT_ID_BARE StepMania 5
+#define PRODUCT_ID_BARE StepMania 5.0
 
 /**
  * @brief Version info displayed to the user.
@@ -30,7 +36,7 @@
  * </li></ul>
  */
 #ifndef PRODUCT_VER_BARE
-#define PRODUCT_VER_BARE v5.0 beta 4a
+#define PRODUCT_VER_BARE 5.0-UNKNOWN
 #endif
 
 /**