r1340 - in trunk: . code/qcommon

[DONOTREPLY at icculus.org]

Author: ludwig
Date: 2008-05-06 16:24:32 -0400 (Tue, 06 May 2008)
New Revision: 1340

Modified:
   trunk/Makefile
   trunk/code/qcommon/q_shared.h
Log:
define the product version in the Makefile


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2008-05-03 18:01:30 UTC (rev 1339)
+++ trunk/Makefile	2008-05-06 20:24:32 UTC (rev 1340)
@@ -168,27 +168,17 @@
 SDL_CFLAGS=$(shell pkg-config --cflags sdl|sed 's/-Dmain=SDL_main//')
 SDL_LIBS=$(shell pkg-config --libs sdl)
 
-# extract version info
+# version info
+VERSION=1.35
 
-ifeq ($(BUILD_STANDALONE),1)
-  VERSION=$(shell grep "\#define *PRODUCT_VERSION" $(CMDIR)/q_shared.h | head -n 1 | \
-    sed -e 's/[^"]*"\(.*\)"/\1/')
-else
-  VERSION=$(shell grep "\#define *PRODUCT_VERSION" $(CMDIR)/q_shared.h | tail -n 1 | \
-    sed -e 's/[^"]*"\(.*\)"/\1/')
-endif
-
 USE_SVN=
 ifeq ($(wildcard .svn),.svn)
   SVN_REV=$(shell LANG=C svnversion .)
   ifneq ($(SVN_REV),)
-    SVN_VERSION=$(VERSION)_SVN$(SVN_REV)
+    VERSION:=$(VERSION)_SVN$(SVN_REV)
     USE_SVN=1
   endif
 endif
-ifneq ($(USE_SVN),1)
-    SVN_VERSION=$(VERSION)
-endif
 
 
 #############################################################################
@@ -801,9 +791,7 @@
   DEPEND_CFLAGS =
 endif
 
-ifeq ($(USE_SVN),1)
-  BASE_CFLAGS += -DSVN_VERSION=\\\"$(SVN_VERSION)\\\"
-endif
+BASE_CFLAGS += -DPRODUCT_VERSION=\\\"$(VERSION)\\\"
 
 ifeq ($(V),1)
 echo_cmd=@:
@@ -918,6 +906,7 @@
 	@echo "Building ioquake3 in $(B):"
 	@echo "  PLATFORM: $(PLATFORM)"
 	@echo "  ARCH: $(ARCH)"
+	@echo "  VERSION: $(VERSION)"
 	@echo "  COMPILE_PLATFORM: $(COMPILE_PLATFORM)"
 	@echo "  COMPILE_ARCH: $(COMPILE_ARCH)"
 	@echo "  CC: $(CC)"
@@ -2011,10 +2000,10 @@
 endif
 
 dist:
-	rm -rf ioquake3-$(SVN_VERSION)
-	svn export . ioquake3-$(SVN_VERSION)
-	tar --owner=root --group=root --force-local -cjf ioquake3-$(SVN_VERSION).tar.bz2 ioquake3-$(SVN_VERSION)
-	rm -rf ioquake3-$(SVN_VERSION)
+	rm -rf ioquake3-$(VERSION)
+	svn export . ioquake3-$(VERSION)
+	tar --owner=root --group=root --force-local -cjf ioquake3-$(VERSION).tar.bz2 ioquake3-$(VERSION)
+	rm -rf ioquake3-$(VERSION)
 
 #############################################################################
 # DEPENDENCIES

Modified: trunk/code/qcommon/q_shared.h
===================================================================
--- trunk/code/qcommon/q_shared.h	2008-05-03 18:01:30 UTC (rev 1339)
+++ trunk/code/qcommon/q_shared.h	2008-05-06 20:24:32 UTC (rev 1340)
@@ -28,23 +28,17 @@
 
 #ifdef STANDALONE
   #define PRODUCT_NAME			"iofoo3"
-  #define PRODUCT_VERSION		"-1"
   #define BASEGAME			"foobar"
   #define CLIENT_WINDOW_TITLE     	"changeme"
   #define CLIENT_WINDOW_MIN_TITLE 	"changeme2"
 #else
   #define PRODUCT_NAME			"ioq3"
-  #define PRODUCT_VERSION		"1.35"
   #define BASEGAME			"baseq3"
   #define CLIENT_WINDOW_TITLE     	"ioquake3"
   #define CLIENT_WINDOW_MIN_TITLE 	"ioq3"
 #endif
 
-#ifdef SVN_VERSION
-# define Q3_VERSION PRODUCT_NAME " " SVN_VERSION
-#else
-# define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION
-#endif
+#define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION
 
 #define MAX_TEAMNAME 32