Add buildnumber to versionstring.

DusteDdk · Feb 8, 2015 · 285e4f6 · 285e4f6
1 parent f8a7e83
commit 285e4f6
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 22 deletions.
diff --git a/Makefile.gcw0 b/Makefile.gcw0
@@ -29,10 +29,6 @@ ifneq ($(BUILD_NUMBER),)
   DEFS +=-DBUILD_NUMBER="\"$(BUILD_NUMBER)\""
 endif
 
-ifneq ($(RELEASE_VERSION),)
-  DEFS +=-DRELEASE_VERSION="\"$(RELEASE_VERSION)\""
-endif
-
 INCS =  -I. -I$(SYSROOT)/usr/include -I$(SYSROOT)/usr/include/SDL
 CFLAGS=-Wall -Wextra
 ifeq ($(DEBUG),)

diff --git a/Makefile.linux b/Makefile.linux
@@ -32,10 +32,6 @@ ifneq ($(BUILD_NUMBER),)
   DEFS +=-DBUILD_NUMBER="\"$(BUILD_NUMBER)\""
 endif
 
-ifneq ($(RELEASE_VERSION),)
-  DEFS +=-DRELEASE_VERSION="\"$(RELEASE_VERSION)\""
-endif
-
 INCS =  -I. -I/usr/include -I/usr/include/SDL
 CFLAGS=-Wall -Wextra -Werror
 ifeq ($(DEBUG),)

diff --git a/Makefile.win b/Makefile.win
@@ -19,10 +19,6 @@ ifneq ($(BUILD_NUMBER),)
   DEFS +=-DBUILD_NUMBER="\"$(BUILD_NUMBER)\""
 endif
 
-ifneq ($(RELEASE_VERSION),)
-  DEFS +=-DRELEASE_VERSION="\"$(RELEASE_VERSION)\""
-endif
-
 INCS =  -I.
 CFLAGS=-O3
 LDFLAGS=$(CFLAGS)

diff --git a/Makefile.wiz b/Makefile.wiz
@@ -17,9 +17,6 @@ ifneq ($(BUILD_NUMBER),)
   DEFS +=-DBUILD_NUMBER="\"$(BUILD_NUMBER)\""
 endif
 
-ifneq ($(RELEASE_VERSION),)
-  DEFS +=-DRELEASE_VERSION="\"$(RELEASE_VERSION)\""
-endif
 
 INCS =  -I. -I$(OPEN2X)/include -I$(OPEN2X)/include/SDL
 CFLAGS=-O3

diff --git a/src/strings.h b/src/strings.h
@@ -147,11 +147,7 @@
 #define CODE_VERSION "1.0-dev"
 
 #ifdef BUILD_NUMBER
-  #ifdef RELEASE_VERSION
-    #define VERSION_STRING RELEASE_VERSION"(B"BUILD_NUMBER")"
-  #else
-    #define VERSION_STRING CODE_VERSION"(B"BUILD_NUMBER")"
-  #endif
+  #define VERSION_STRING CODE_VERSION"(B"BUILD_NUMBER")"
 #else
   #define VERSION_STRING CODE_VERSION
 #endif

diff --git a/tools/contigrator_build.sh b/tools/contigrator_build.sh
@@ -13,7 +13,7 @@ echo "Wizznic build script."
 
 VERSION_LONG=build_$BN_NUM
 VERSION=1.0-dev
-
+BUILD_NUMBER=$BN_NUM
 
 make -f Makefile.win clean
 make -f Makefile.wiz clean
@@ -24,7 +24,7 @@ mv wizznic wizznic_linux_x64_precompiled
 make -j 4 -f Makefile.linux clean
 
 # The chrooted 32 bit linux version.
-sudo -E -P USER=$USER USERNAME=$USER LOGNAME=$LOGNAME -- /usr/sbin/chroot /var/local/32bitDeb/ su -p -l $USER -c "cd /home/contigrator/jobs/Wizznic/workspace/ && make -j 4 -f Makefile.linux CC='ccache gcc'"
+sudo -E -P USER=$USER USERNAME=$USER LOGNAME=$LOGNAME -- /usr/sbin/chroot /var/local/32bitDeb/ su -p -l $USER -c "cd /home/contigrator/jobs/Wizznic/workspace/ && make -j 4 -f Makefile.linux CC='ccache gcc' BUILD_NUMBER=$BN_NUM"
 mv wizznic wizznic_linux_x86_precompiled
 
 #Copy files around and package