This is an automated email from the git hooks/post-receive script. smcv pushed a commit to tag 1.51b in repository iortcw.
commit 4b2a1f9ad2ec9cea641ce8858fc38716742cf69e Author: MAN-AT-ARMS <[email protected]> Date: Thu Jun 8 11:26:46 2017 -0400 All: Bump version to 1.51b --- MP/Makefile | 19 ++++++++++++++++++- MP/code/qcommon/q_shared.h | 2 +- SP/Makefile | 19 ++++++++++++++++++- SP/code/qcommon/q_shared.h | 2 +- 4 files changed, 38 insertions(+), 4 deletions(-) diff --git a/MP/Makefile b/MP/Makefile index 530f3bd..146eb3a 100644 --- a/MP/Makefile +++ b/MP/Makefile @@ -126,7 +126,7 @@ endif export CROSS_COMPILING ifndef VERSION -VERSION=1.51-MP +VERSION=1.51b-MP endif ifndef CLIENTBIN @@ -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 @@ -2693,6 +2703,13 @@ $(B)/ded/%.o: $(SYSDIR)/%.rc $(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 + $(B)/client/common.o : ../.git + $(B)/ded/common.o : ../.git +endif + ############################################################################# ## GAME MODULE RULES diff --git a/MP/code/qcommon/q_shared.h b/MP/code/qcommon/q_shared.h index f1fca4d..1aeb853 100644 --- a/MP/code/qcommon/q_shared.h +++ b/MP/code/qcommon/q_shared.h @@ -88,7 +88,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.51-MP" + #define PRODUCT_VERSION "1.51b-MP" #endif #ifndef OLD_PRODUCT_VERSION diff --git a/SP/Makefile b/SP/Makefile index 3da48dd..2fc5e6f 100644 --- a/SP/Makefile +++ b/SP/Makefile @@ -123,7 +123,7 @@ endif export CROSS_COMPILING ifndef VERSION -VERSION=1.51-SP +VERSION=1.51b-SP endif ifndef CLIENTBIN @@ -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 @@ -2659,6 +2669,13 @@ $(B)/ded/%.o: $(SYSDIR)/%.rc $(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 + $(B)/client/common.o : ../.git + $(B)/ded/common.o : ../.git +endif + ############################################################################# ## GAME MODULE RULES diff --git a/SP/code/qcommon/q_shared.h b/SP/code/qcommon/q_shared.h index a35a19f..4678f84 100644 --- a/SP/code/qcommon/q_shared.h +++ b/SP/code/qcommon/q_shared.h @@ -85,7 +85,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.51-SP" + #define PRODUCT_VERSION "1.51b-SP" #endif #ifndef PRODUCT_DATE -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
