From 0285f37fc2fb3c7ac052eb682812ddb22404bae4 Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Wed, 4 Jul 2018 19:07:15 +0200
Subject: [PATCH] update version in gfx2.rc when building with MSVC

---
 project/msvc/generateversion.vbs | 45 ++++++++++++++++++++++++++++++++
 src/gfx2.rc                      |  8 +++---
 2 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/project/msvc/generateversion.vbs b/project/msvc/generateversion.vbs
index d5d334a3..b925e133 100644
--- a/project/msvc/generateversion.vbs
+++ b/project/msvc/generateversion.vbs
@@ -3,6 +3,8 @@
 Set WshShell = CreateObject("WScript.Shell")
 Set FSO = CreateObject("Scripting.FileSystemObject")
 versionfile = "..\..\src\version.c"
+pversionfile = "..\..\src\pversion.c"
+ressourcefile = "..\..\src\gfx2.rc"
 
 On Error Resume Next
 
@@ -57,8 +59,51 @@ If Err.Number = 0 Then
 	f.Close
 End If
 
+Err.Clear
+Set f = FSO.OpenTextFile(pversionfile, 1, False) ' 1 = Read
+If Err.Number = 0 Then
+	line = f.ReadLine
+	i = InStr(line, Chr(34)) + 1
+	j = InStr(i, line, Chr(34))
+	label = Mid(line, i, j - i)
+	f.Close
+End If
+
 If NeedWrite Then
 	Set f = FSO.OpenTextFile(versionfile, 2, True) ' 2 = Write
 	f.WriteLine "char SVN_revision[]=" & Chr(34) & revision & Chr(34) & ";"
 	f.Close
+	' rewrite ressourcefile
+	Dim lines()
+	i = 0
+	Err.Clear
+	Set f = FSO.OpenTextFile(ressourcefile, 1, False)
+	If Err.Number = 0 Then
+		While Not f.AtEndOfStream
+			line = f.ReadLine
+			k = InStr(line, "VERSION ")
+			l = InStr(line, "Version" & Chr(34))
+			If k <> 0 Then
+				'Wscript.Echo "* i=" & i & " k=" & k & " l=" & l & " : " & line
+				k = InStrRev(line, ",")
+				line = Mid(line, 1, k) & GIT_REVISION
+			End If
+			If l <> 0 Then
+				'Wscript.Echo "_ i=" & i & " k=" & k & " l=" & l & " : " & line
+				k = InStr(InStr(line, ","), line, Chr(34))
+				line = Mid(line, 1, k) & label & revision & Chr(34)
+			End If
+			Redim preserve lines(i)
+			lines(i) = line
+			i = i + 1
+		Wend
+		f.Close
+		' Write lines back to the file
+		Set f = FSO.OpenTextFile(ressourcefile, 2, True) ' 2 = Write
+		For i = 0 To UBound(lines)
+			'Wscript.Echo lines(i)
+			f.WriteLine lines(i)
+		Next
+		f.Close
+	End If
 End If
\ No newline at end of file
diff --git a/src/gfx2.rc b/src/gfx2.rc
index ce68cc54..e1976ed3 100644
--- a/src/gfx2.rc
+++ b/src/gfx2.rc
@@ -5,8 +5,8 @@
 #endif
 
 1 VERSIONINFO
-FILEVERSION     2,6,0,2058
-PRODUCTVERSION  2,6,0,2058
+FILEVERSION     2,6,0,2100
+PRODUCTVERSION  2,6,0,2100
 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.6wip2058-rc"
+      VALUE "FileVersion", "2.6wip2100"
       VALUE "InternalName", "grafx2"
       VALUE "LegalCopyright", "(c) 2007-2018 The GrafX2 Team, (c) 1996-2001 Sunset Design"
       VALUE "OriginalFilename", "grafx2.exe"
       VALUE "ProductName", "GrafX2"
-      VALUE "ProductVersion", "2.6wip2058-rc"
+      VALUE "ProductVersion", "2.6wip2100"
     END
   END
   BLOCK "VarFileInfo"