summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2016-04-06 12:01:07 +0100
committerVincent Sanders <vince@kyllikki.org>2016-04-06 12:01:07 +0100
commit3a5b4571b419087f8adfeb1dfe6b0c3f32dd9985 (patch)
tree5bf35156a18eb968029c9602b12a8c19e57b2ded
parentd6ad20a2c466daf5deee402100ef217497fc555e (diff)
downloadnetsurf-3a5b4571b419087f8adfeb1dfe6b0c3f32dd9985.tar.gz
netsurf-3a5b4571b419087f8adfeb1dfe6b0c3f32dd9985.tar.bz2
update version info for next development cycle
-rw-r--r--Makefile2
-rwxr-xr-xamiga/pkg/netsurf.readme4
-rw-r--r--amiga/pkg/netsurf_os3.readme4
-rw-r--r--beos/Makefile.target3
-rw-r--r--cocoa/Makefile.target4
-rw-r--r--desktop/version.c4
-rw-r--r--windows/res/installer.nsi2
7 files changed, 11 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 2f71c026b..d0c072372 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/amiga/pkg/netsurf.readme b/amiga/pkg/netsurf.readme
index 61b8899d0..e686548d6 100755
--- a/amiga/pkg/netsurf.readme
+++ b/amiga/pkg/netsurf.readme
@@ -2,10 +2,10 @@ Short: Fast CSS capable web browser
Uploader: chris@unsatisfactorysoftware.co.uk (Chris Young)
Author: NetSurf contributors (OS4 port by Chris Young)
Type: comm/www
-Version: 3.5
+Version: 3.6
Architecture: ppc-amigaos >= 4.0.0
-This is NetSurf 3.5 for AmigaOS 4 (native frontend).
+This is NetSurf 3.6 for AmigaOS 4 (native frontend).
For the latest version, visit http://www.netsurf-browser.org
*******************************************
diff --git a/amiga/pkg/netsurf_os3.readme b/amiga/pkg/netsurf_os3.readme
index 62cf8f22b..de8734e43 100644
--- a/amiga/pkg/netsurf_os3.readme
+++ b/amiga/pkg/netsurf_os3.readme
@@ -2,10 +2,10 @@ Short: Fast CSS capable web browser
Uploader: chris@unsatisfactorysoftware.co.uk (Chris Young)
Author: NetSurf contributors (OS4 port by Chris Young)
Type: comm/www
-Version: 3.5 BETA
+Version: 3.6 BETA
Architecture: m68k-amigaos >= 3.5.0
-This is NetSurf 3.5 BETA for AmigaOS 3.
+This is NetSurf 3.6 BETA for AmigaOS 3.
It is built off of the OS4 (Reaction) frontend.
Requirements are AmigaOS 3.5 or 3.9, 32MB RAM.
diff --git a/beos/Makefile.target b/beos/Makefile.target
index 38ec27919..382b32736 100644
--- a/beos/Makefile.target
+++ b/beos/Makefile.target
@@ -24,7 +24,8 @@ 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 ad2d9172e..af354d768 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 e456aac44..6828f82ca 100644
--- a/desktop/version.c
+++ b/desktop/version.c
@@ -20,11 +20,11 @@
#include "desktop/version.h"
-const char * const netsurf_version = "3.5 (Dev"
+const char * const netsurf_version = "3.6 (Dev"
#if defined(CI_BUILD)
" CI #" CI_BUILD
#endif
")"
;
const int netsurf_version_major = 3;
-const int netsurf_version_minor = 4;
+const int netsurf_version_minor = 6;
diff --git a/windows/res/installer.nsi b/windows/res/installer.nsi
index 25e7e95a7..df726c8f8 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 6
!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