[iortcw] 01/95: All: Bump git version to 1.5b

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51
in repository iortcw.

commit 6cf213fa4f4e1cda50a867978f71dbdab8a4981f
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date:   Sat Nov 19 04:44:34 2016 -0500

    All: Bump git version to 1.5b
---
 MP/Makefile                | 18 +++++++++++++++---
 MP/code/qcommon/q_shared.h |  2 +-
 SP/Makefile                | 16 ++++++++++++++--
 SP/code/qcommon/q_shared.h |  2 +-
 4 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/MP/Makefile b/MP/Makefile
index 6bb0174..ab4050f 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -126,7 +126,7 @@ endif
 export CROSS_COMPILING
 
 ifndef VERSION
-VERSION=1.5a
+VERSION=1.5b
 endif
 
 ifndef CLIENTBIN
@@ -198,7 +198,7 @@ ifndef USE_CURL_DLOPEN
 endif
 
 ifndef USE_CODEC_VORBIS
-USE_CODEC_VORBIS=1
+USE_CODEC_VORBIS=0
 endif
 
 ifndef USE_CODEC_OPUS
@@ -266,7 +266,7 @@ DEBUG_CFLAGS=-g -O0
 endif
 
 ifndef USE_ANTIWALLHACK
-USE_ANTIWALLHACK=1
+USE_ANTIWALLHACK=0
 endif
 
 ifndef USE_BLOOM
@@ -350,6 +350,16 @@ ifneq ($(BUILD_CLIENT),0)
   endif
 endif
 
+# Add git version info
+USE_GIT=
+ifeq ($(wildcard ../.git),../.git)
+  GIT_REV=$(shell git show -s --pretty=format:%h-%ad --date=short)
+  ifneq ($(GIT_REV),)
+    VERSION:=$(VERSION)_GIT_$(GIT_REV)
+    USE_GIT=1
+  endif
+endif
+
 
 #############################################################################
 # SETUP AND BUILD -- LINUX
@@ -2692,9 +2702,11 @@ $(B)/ded/%.o: $(NDIR)/%.c
 	$(DO_DED_CC)
 
 # Extra dependencies to ensure the git version is incorporated
+ifeq ($(USE_GIT),1)
   $(B)/client/cl_console.o : ../.git/index
   $(B)/client/common.o : ../.git/index
   $(B)/ded/common.o : ../.git/index
+endif
 
 
 #############################################################################
diff --git a/MP/code/qcommon/q_shared.h b/MP/code/qcommon/q_shared.h
index 7db38ac..bac8148 100644
--- a/MP/code/qcommon/q_shared.h
+++ b/MP/code/qcommon/q_shared.h
@@ -87,7 +87,7 @@ If you have questions concerning this license or the applicable additional terms
 #define LEGACY_HEARTBEAT_FOR_MASTER	"Wolfenstein-1"
 
 #ifndef PRODUCT_VERSION
-  #define PRODUCT_VERSION "1.5a"
+  #define PRODUCT_VERSION "1.5b"
 #endif
 
 #ifndef OLD_PRODUCT_VERSION
diff --git a/SP/Makefile b/SP/Makefile
index fd2a6ea..bd92c84 100644
--- a/SP/Makefile
+++ b/SP/Makefile
@@ -123,7 +123,7 @@ endif
 export CROSS_COMPILING
 
 ifndef VERSION
-VERSION=1.5a
+VERSION=1.5b
 endif
 
 ifndef CLIENTBIN
@@ -195,7 +195,7 @@ ifndef USE_CURL_DLOPEN
 endif
 
 ifndef USE_CODEC_VORBIS
-USE_CODEC_VORBIS=1
+USE_CODEC_VORBIS=0
 endif
 
 ifndef USE_CODEC_OPUS
@@ -339,6 +339,16 @@ ifneq ($(BUILD_CLIENT),0)
   endif
 endif
 
+# Add git version info
+USE_GIT=
+ifeq ($(wildcard ../.git),../.git)
+  GIT_REV=$(shell git show -s --pretty=format:%h-%ad --date=short)
+  ifneq ($(GIT_REV),)
+    VERSION:=$(VERSION)_GIT_$(GIT_REV)
+    USE_GIT=1
+  endif
+endif
+
 
 #############################################################################
 # SETUP AND BUILD -- LINUX
@@ -2658,9 +2668,11 @@ $(B)/ded/%.o: $(NDIR)/%.c
 	$(DO_DED_CC)
 
 # Extra dependencies to ensure the git version is incorporated
+ifeq ($(USE_GIT),1)
   $(B)/client/cl_console.o : ../.git/index
   $(B)/client/common.o : ../.git/index
   $(B)/ded/common.o : ../.git/index
+endif
 
 
 #############################################################################
diff --git a/SP/code/qcommon/q_shared.h b/SP/code/qcommon/q_shared.h
index dbd8990..053d955 100644
--- a/SP/code/qcommon/q_shared.h
+++ b/SP/code/qcommon/q_shared.h
@@ -84,7 +84,7 @@ If you have questions concerning this license or the applicable additional terms
 #define LEGACY_HEARTBEAT_FOR_MASTER	"Wolfenstein-1"
 
 #ifndef PRODUCT_VERSION
-  #define PRODUCT_VERSION "1.5a"
+  #define PRODUCT_VERSION "1.5b"
 #endif
 
 #ifndef PRODUCT_DATE

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git