Update version for 3.5 release

This commit is contained in:
Vincent Sanders 2016-04-06 11:39:35 +01:00
parent 281fe7674c
commit b2a32c3ea2
5 changed files with 6 additions and 13 deletions

View File

@ -663,7 +663,7 @@ ifeq ($(TARGET),beos)
$(Q)$(BEOS_SETVER) $(EXETARGET) \ $(Q)$(BEOS_SETVER) $(EXETARGET) \
-app $(VERSION_MAJ) $(VERSION_MIN) 0 d 0 \ -app $(VERSION_MAJ) $(VERSION_MIN) 0 d 0 \
-short "NetSurf $(VERSION_FULL)" \ -short "NetSurf $(VERSION_FULL)" \
-long "NetSurf $(VERSION_FULL) © 2003 - 2014 The NetSurf Developers" -long "NetSurf $(VERSION_FULL) © 2003 - 2016 The NetSurf Developers"
$(VQ)echo " MIMESET: $(EXETARGET)" $(VQ)echo " MIMESET: $(EXETARGET)"
$(Q)$(BEOS_MIMESET) $(EXETARGET) $(Q)$(BEOS_MIMESET) $(EXETARGET)
endif endif

View File

@ -24,7 +24,7 @@ BEOS_RC := rc
BEOS_XRES := xres BEOS_XRES := xres
BEOS_SETVER := setversion BEOS_SETVER := setversion
BEOS_MIMESET := mimeset BEOS_MIMESET := mimeset
VERSION_FULL := $(shell sed -n '/"/{s/.*"\(.*\)".*/\1/;p;}' desktop/version.c) VERSION_FULL := $(shell sed -n '/_version.*"/{s/.*"\(.*\)".*/\1/;p;}' desktop/version.c)
VERSION_MAJ := $(shell sed -n '/_major/{s/.* = \([0-9]*\).*/\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) VERSION_MIN := $(shell sed -n '/_minor/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c)

View File

@ -40,9 +40,7 @@ CFLAGS += -Dnscocoa -D_BSD_SOURCE -D_POSIX_C_SOURCE -std=c99 -g -Os
CFLAGS += -I/usr/X11/include CFLAGS += -I/usr/X11/include
CFLAGS += -include cocoa/Prefix.pch CFLAGS += -include cocoa/Prefix.pch
# VERSION_FULL := $(shell sed -n '/\"/{s/.*"\(.*\)\".*/\1/;p;}' desktop/version.c) VERSION_FULL := $(shell sed -n '/_version.*"/{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_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) VERSION_MIN := $(shell sed -n '/_minor/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c)

View File

@ -20,11 +20,6 @@
#include "desktop/version.h" #include "desktop/version.h"
const char * const netsurf_version = "3.5 (Dev" const char * const netsurf_version = "3.5 (6th April 1016)";
#if defined(CI_BUILD)
" CI #" CI_BUILD
#endif
")"
;
const int netsurf_version_major = 3; const int netsurf_version_major = 3;
const int netsurf_version_minor = 4; const int netsurf_version_minor = 5;

View File

@ -8,7 +8,7 @@
!define DESCRIPTION "Web Browser" !define DESCRIPTION "Web Browser"
# These three must be integers # These three must be integers
!define VERSIONMAJOR 3 !define VERSIONMAJOR 3
!define VERSIONMINOR 4 !define VERSIONMINOR 5
!define VERSIONBUILD 1 !define VERSIONBUILD 1
# These will be displayed by the "Click here for support information" link in "Add/Remove Programs" # 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 # It is possible to use "mailto:" links in here to open the email client