From 52ccd396d54a2ecdec7b08e056a0f386efa3f4a4 Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Sat, 9 Feb 2019 18:44:25 +0100
Subject: [PATCH] 2.6 => 2.7wip

---
 Makefile                 | 7 ++++++-
 install/Makefile         | 9 ++++++++-
 install/WinInstaller.nsi | 2 +-
 src/gfx2.rc              | 8 ++++----
 src/pversion.c           | 2 +-
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index c092c059..34b74cae 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,8 @@ OPT = WIN32CROSS=1 \
 endif
 
 .PHONY:	all tools grafx2 ziprelease 3rdparty win32installer \
-        doc doxygen docarchive doxygenarchive htmldoc
+        doc doxygen docarchive doxygenarchive htmldoc \
+        updateversion
 
 all:	grafx2 tools
 
@@ -40,3 +41,7 @@ htmldoc:
 
 # this C file is generated by the build
 src/version.c:	grafx2
+
+updateversion:	src/version.c
+	$(MAKE) -C src gfx2.rc
+	$(MAKE) -C install/ updateversion
diff --git a/install/Makefile b/install/Makefile
index d223fbaf..8c876484 100644
--- a/install/Makefile
+++ b/install/Makefile
@@ -12,10 +12,13 @@ VERSION := $(subst wip.,wip,$(LABEL).$(GIT_REVISION))
 
 SOURCES = ../src-$(VERSION).tgz
 INSTALLER = grafx2-$(API)-$(VERSION).win32.exe
+NSISCRIPT = WinInstaller.nsi
+
+.PHONY:	all updateversion
 
 all:	$(INSTALLER)
 
-$(INSTALLER):	WinInstaller.nsi $(SOURCES) $(VERSIONTAG)
+$(INSTALLER):	$(NSISCRIPT) $(SOURCES) $(VERSIONTAG)
 ifdef WIN32CROSS
 	for f in ../doc/*.txt; do unix2dos $$f ; done
 endif
@@ -26,3 +29,7 @@ endif
 
 $(SOURCES): $(wildcard ../src/*.c) $(wildcard ../src/*.h)
 	cd ../src && WIN32CROSS=1 $(MAKE) $(SOURCES)
+
+updateversion:
+	$(SED) -e 's/VERSION .*/VERSION $(VERSION)/' $(NSISCRIPT) > $(NSISCRIPT).tmp
+	if ! diff -q -i $(NSISCRIPT) $(NSISCRIPT).tmp ; then mv $(NSISCRIPT).tmp $(NSISCRIPT) ; else rm $(NSISCRIPT).tmp ; fi
diff --git a/install/WinInstaller.nsi b/install/WinInstaller.nsi
index d3b71195..c0acdf5a 100644
--- a/install/WinInstaller.nsi
+++ b/install/WinInstaller.nsi
@@ -1,7 +1,7 @@
 ;NSIS Modern User Interface
 ;Based on the Example Script written by Joost Verburg
 
-!define VERSION 2.6.2472
+!define VERSION 2.7wip2567
 !define API sdl
 
 !define FREETYPEDLL libfreetype-6.dll
diff --git a/src/gfx2.rc b/src/gfx2.rc
index 89402c43..b2b8faf6 100644
--- a/src/gfx2.rc
+++ b/src/gfx2.rc
@@ -5,8 +5,8 @@
 #endif
 
 1 VERSIONINFO
-FILEVERSION     2,6,0,2472
-PRODUCTVERSION  2,6,0,2472
+FILEVERSION     2,6,0,2567
+PRODUCTVERSION  2,6,0,2567
 FILEFLAGSMASK   VS_FF_DEBUG
 #ifdef _DEBUG
 FILEFLAGS       VS_FF_DEBUG
@@ -20,12 +20,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName", "The GrafX2 Team"
       VALUE "FileDescription", "The ultimate 256-color painting programm"
-      VALUE "FileVersion", "2.6.2472"
+      VALUE "FileVersion", "2.6.2567"
       VALUE "InternalName", "grafx2"
       VALUE "LegalCopyright", "(c) 2007-2019 The GrafX2 Team, (c) 1996-2001 Sunset Design"
       VALUE "OriginalFilename", "grafx2.exe"
       VALUE "ProductName", "GrafX2"
-      VALUE "ProductVersion", "2.6.2472"
+      VALUE "ProductVersion", "2.6.2567"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/src/pversion.c b/src/pversion.c
index 6e2411a2..4195bc63 100644
--- a/src/pversion.c
+++ b/src/pversion.c
@@ -1 +1 @@
-const char Program_version[]="2.6";
+const char Program_version[]="2.7wip";