q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2025-02-21 03:21:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix adding svn revision to version for newer subversion client (only has .svn directory in top-level)

Browse source
This commit is contained in:
zturtleman 2018-08-08 19:53:46 +00:00
parent 6848f66d73
commit 38590e1acd
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
baseq3r/vm/cgame.qvm
View file

Binary file not shown.

BIN
baseq3r/vm/ui.qvm
View file

Binary file not shown.

14
engine/Makefile
View file

@ -317,17 +317,17 @@ endif
# Add svn version info
USE_SVN=
ifeq ($(wildcard .svn),.svn)
ifeq ($(wildcard ../.svn),../.svn)
SVN_REV=$(shell LANG=C svnversion .)
ifneq ($(SVN_REV),)
VERSION:=$(VERSION)_SVN$(SVN_REV)
VERSION:=$(VERSION)_r$(SVN_REV)
USE_SVN=1
endif
else
ifeq ($(wildcard .git/svn/.metadata),.git/svn/.metadata)
ifeq ($(wildcard ../.git/svn/.metadata),../.git/svn/.metadata)
SVN_REV=$(shell LANG=C git svn info | awk '$$1 == "Revision:" {print $$2; exit 0}')
ifneq ($(SVN_REV),)
VERSION:=$(VERSION)_SVN$(SVN_REV)
VERSION:=$(VERSION)_r$(SVN_REV)
endif
endif
endif
@ -2825,9 +2825,9 @@ $(B)/ded/%.o: $(NDIR)/%.c
# Extra dependencies to ensure the SVN version is incorporated
ifeq ($(USE_SVN),1)
$(B)/client/cl_console.o : .svn/entries
$(B)/client/common.o : .svn/entries
$(B)/ded/common.o : .svn/entries
$(B)/client/cl_console.o : ../.svn/entries
$(B)/client/common.o : ../.svn/entries
$(B)/ded/common.o : ../.svn/entries
endif

2
engine/code/qcommon/q_shared.h
View file

@ -67,7 +67,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define BASETA "missionpack"
#ifndef PRODUCT_VERSION
#define PRODUCT_VERSION "v0.0.1.2 r239"
#define PRODUCT_VERSION "v0.0.1.2_r240"
#endif
#ifndef PRODUCT_DATE