From 8e85d9ac0073e7238f60503c931f4c5ba89fa01d Mon Sep 17 00:00:00 2001
From: Mikhail Titov <mlt@gmx.us>
Date: Sun, 6 Dec 2015 15:46:42 -0600
Subject: [PATCH] Sync Windows VERSIONINFO resource with version.h

---
 Win32/Resource.rc  | 39 +-------------------------------------
 Win32/Resource.rc2 | 47 ++++++++++++++++++++++++++++++++++++++++++++++
 version.h          | 18 ++++++++++++++++--
 3 files changed, 64 insertions(+), 40 deletions(-)
 create mode 100644 Win32/Resource.rc2

diff --git a/Win32/Resource.rc b/Win32/Resource.rc
index e8b77bef..c8643e8d 100644
--- a/Win32/Resource.rc
+++ b/Win32/Resource.rc
@@ -54,44 +54,6 @@ END
 // remains consistent on all systems.
 MAINICON                ICON                    "ictoopie.ico"
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,1,0,0
- PRODUCTVERSION 0,9,23,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", "Purple I2P"
-            VALUE "FileDescription", "C++ I2P daemon"
-            VALUE "FileVersion", "2.1.0.0"
-            VALUE "InternalName", "Resource.rc"
-            VALUE "LegalCopyright", "Copyright (C) 2013-2015, The PurpleI2P Project"
-            VALUE "OriginalFilename", "i2pd"
-            VALUE "ProductName", "Purple I2P"
-            VALUE "ProductVersion", "0.9.23.0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
 #endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////
 
@@ -103,6 +65,7 @@ END
 // Generated from the TEXTINCLUDE 3 resource.
 //
 
+#include "Resource.rc2"
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
diff --git a/Win32/Resource.rc2 b/Win32/Resource.rc2
new file mode 100644
index 00000000..6b9e4aa7
--- /dev/null
+++ b/Win32/Resource.rc2
@@ -0,0 +1,47 @@
+//
+// Resource.RC2 - resources Microsoft Visual C++ does not edit directly
+//
+
+#ifdef APSTUDIO_INVOKED
+#error this file is not editable by Microsoft Visual C++
+#endif //APSTUDIO_INVOKED
+
+#include "../version.h"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION I2PD_VERSION_MAJOR,I2PD_VERSION_MINOR,I2PD_VERSION_MICRO,I2PD_VERSION_PATCH
+ PRODUCTVERSION I2P_VERSION_MAJOR,I2P_VERSION_MINOR,I2P_VERSION_MICRO,I2P_VERSION_PATCH
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "Purple I2P"
+            VALUE "FileDescription", "C++ I2P daemon"
+            VALUE "FileVersion", I2PD_VERSION
+            VALUE "InternalName", CODENAME
+            VALUE "LegalCopyright", "Copyright (C) 2013-2015, The PurpleI2P Project"
+            VALUE "OriginalFilename", "i2pd"
+            VALUE "ProductName", "Purple I2P"
+            VALUE "ProductVersion", I2P_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/version.h b/version.h
index 825be574..eedde45c 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,21 @@
 #define _VERSION_H_
 
 #define CODENAME "Purple"
-#define VERSION "2.1.0"
-#define I2P_VERSION "0.9.23"
+
+#define STRINGIZE(x) #x
+#define MAKE_VERSION(a,b,c) STRINGIZE(a) "." STRINGIZE(b) "." STRINGIZE(c)
+
+#define I2PD_VERSION_MAJOR 2
+#define I2PD_VERSION_MINOR 1
+#define I2PD_VERSION_MICRO 0
+#define I2PD_VERSION_PATCH 0
+#define I2PD_VERSION MAKE_VERSION(I2PD_VERSION_MAJOR, I2PD_VERSION_MINOR, I2PD_VERSION_MICRO)
+#define VERSION I2PD_VERSION
+
+#define I2P_VERSION_MAJOR 0
+#define I2P_VERSION_MINOR 9
+#define I2P_VERSION_MICRO 23
+#define I2P_VERSION_PATCH 0
+#define I2P_VERSION MAKE_VERSION(I2P_VERSION_MAJOR, I2P_VERSION_MINOR, I2P_VERSION_MICRO)
 
 #endif