diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | beos/Makefile.target | 2 | ||||
| -rw-r--r-- | cocoa/Makefile.target | 4 | ||||
| -rw-r--r-- | desktop/version.c | 9 | ||||
| -rw-r--r-- | windows/res/installer.nsi | 2 |
5 files changed, 13 insertions, 6 deletions
@@ -663,7 +663,7 @@ ifeq ($(TARGET),beos) $(Q)$(BEOS_SETVER) $(EXETARGET) \ -app $(VERSION_MAJ) $(VERSION_MIN) 0 d 0 \ -short "NetSurf $(VERSION_FULL)" \ - -long "NetSurf $(VERSION_FULL) © 2003 - 2016 The NetSurf Developers" + -long "NetSurf $(VERSION_FULL) © 2003 - 2014 The NetSurf Developers" $(VQ)echo " MIMESET: $(EXETARGET)" $(Q)$(BEOS_MIMESET) $(EXETARGET) endif diff --git a/beos/Makefile.target b/beos/Makefile.target index f296b40a0..38ec27919 100644 --- a/beos/Makefile.target +++ b/beos/Makefile.target @@ -24,7 +24,7 @@ BEOS_RC := rc BEOS_XRES := xres BEOS_SETVER := setversion BEOS_MIMESET := mimeset -VERSION_FULL := $(shell sed -n '/_version.*"/{s/.*"\(.*\)".*/\1/;p;}' desktop/version.c) +VERSION_FULL := $(shell sed -n '/"/{s/.*"\(.*\)".*/\1/;p;}' desktop/version.c) VERSION_MAJ := $(shell sed -n '/_major/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c) VERSION_MIN := $(shell sed -n '/_minor/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c) diff --git a/cocoa/Makefile.target b/cocoa/Makefile.target index ecf9220a4..ad2d9172e 100644 --- a/cocoa/Makefile.target +++ b/cocoa/Makefile.target @@ -40,7 +40,9 @@ CFLAGS += -Dnscocoa -D_BSD_SOURCE -D_POSIX_C_SOURCE -std=c99 -g -Os CFLAGS += -I/usr/X11/include CFLAGS += -include cocoa/Prefix.pch -VERSION_FULL := $(shell sed -n '/_version.*"/{s/.*"\(.*\)".*/\1/;p;}' desktop/version.c) +# VERSION_FULL := $(shell sed -n '/\"/{s/.*"\(.*\)\".*/\1/;p;}' desktop/version.c) +# TODO: this needs fixing properly everywhere +VERSION_FULL := "3.4 (Dev)" VERSION_MAJ := $(shell sed -n '/_major/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c) VERSION_MIN := $(shell sed -n '/_minor/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c) diff --git a/desktop/version.c b/desktop/version.c index ad9bbd75b..e456aac44 100644 --- a/desktop/version.c +++ b/desktop/version.c @@ -20,6 +20,11 @@ #include "desktop/version.h" -const char * const netsurf_version = "3.5 (6th April 1016)"; +const char * const netsurf_version = "3.5 (Dev" +#if defined(CI_BUILD) + " CI #" CI_BUILD +#endif + ")" + ; const int netsurf_version_major = 3; -const int netsurf_version_minor = 5; +const int netsurf_version_minor = 4; diff --git a/windows/res/installer.nsi b/windows/res/installer.nsi index b19996f8b..25e7e95a7 100644 --- a/windows/res/installer.nsi +++ b/windows/res/installer.nsi @@ -8,7 +8,7 @@ !define DESCRIPTION "Web Browser" # These three must be integers !define VERSIONMAJOR 3 -!define VERSIONMINOR 5 +!define VERSIONMINOR 4 !define VERSIONBUILD 1 # These will be displayed by the "Click here for support information" link in "Add/Remove Programs" # It is possible to use "mailto:" links in here to open the email client |