summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2016-04-06 10:39:35 (GMT)
committer Vincent Sanders <vince@kyllikki.org>2016-04-06 10:39:35 (GMT)
commitb2a32c3ea27aec8345d4d579cc85654cdecad6c0 (patch)
tree8ab3a4e8d62562e33666000cdb77c613e0048585
parent281fe7674c04cc9b5216a405a104abb14c9d1778 (diff)
downloadnetsurf-b2a32c3ea27aec8345d4d579cc85654cdecad6c0.tar.gz
netsurf-b2a32c3ea27aec8345d4d579cc85654cdecad6c0.tar.bz2
Update version for 3.5 releaserelease/3.5release/3.5
-rw-r--r--Makefile2
-rw-r--r--beos/Makefile.target2
-rw-r--r--cocoa/Makefile.target4
-rw-r--r--desktop/version.c9
-rw-r--r--windows/res/installer.nsi2
5 files changed, 6 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index 2f71c02..d0c0723 100644
--- a/Makefile
+++ b/Makefile
@@ -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 - 2014 The NetSurf Developers"
+ -long "NetSurf $(VERSION_FULL) © 2003 - 2016 The NetSurf Developers"
$(VQ)echo " MIMESET: $(EXETARGET)"
$(Q)$(BEOS_MIMESET) $(EXETARGET)
endif
diff --git a/beos/Makefile.target b/beos/Makefile.target
index 38ec279..f296b40 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 '/"/{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_MIN := $(shell sed -n '/_minor/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c)
diff --git a/cocoa/Makefile.target b/cocoa/Makefile.target
index ad2d917..ecf9220 100644
--- a/cocoa/Makefile.target
+++ b/cocoa/Makefile.target
@@ -40,9 +40,7 @@ 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 '/\"/{s/.*"\(.*\)\".*/\1/;p;}' desktop/version.c)
-# TODO: this needs fixing properly everywhere
-VERSION_FULL := "3.4 (Dev)"
+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_MIN := $(shell sed -n '/_minor/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c)
diff --git a/desktop/version.c b/desktop/version.c
index e456aac..ad9bbd7 100644
--- a/desktop/version.c
+++ b/desktop/version.c
@@ -20,11 +20,6 @@
#include "desktop/version.h"
-const char * const netsurf_version = "3.5 (Dev"
-#if defined(CI_BUILD)
- " CI #" CI_BUILD
-#endif
- ")"
- ;
+const char * const netsurf_version = "3.5 (6th April 1016)";
const int netsurf_version_major = 3;
-const int netsurf_version_minor = 4;
+const int netsurf_version_minor = 5;
diff --git a/windows/res/installer.nsi b/windows/res/installer.nsi
index 25e7e95..b19996f 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 4
+!define VERSIONMINOR 5
!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