Update version, year for Windows builds, etc. (#830)

* Add new files from win32 to Makefile.am

- New files were added in the Makefile.am to EXTRA_DIST

* Update version for Windows builds to 1.7.0

- Changed version from 1.4.999 to 1.7.0

* Update Copyright year and ProductName in rc files

- Change year 2013 to 2017
- Change "ProductName" from
  "time-series data storage and display system" to "RRDtool"

diff --git a/Makefile.am b/Makefile.am
index 6331a69b38c096b60ac6d99f769c6bbf1ed9a894..dc96f8f8aeb5ca6da23dfde42a11b2aed70f33b9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,9 @@ EXTRA_DIST = COPYRIGHT CHANGES TODO CONTRIBUTORS THREADS VERSION LICENSE \
              win32/librrd-4.def win32/librrd-4.rc win32/librrd-4.vcxproj win32/librrd-4.vcxproj.user \
              win32/Makefile.msc win32/RCa02816 win32/README win32/rrdcgi.rc win32/rrd_config.h \
              win32/rrd.sln win32/rrdtool.rc win32/rrdtool.sln win32/rrdtool.vcxproj win32/rrdupdate.rc \
-             win32/rrdupdate.sln win32/rrdupdate.vcxproj win32/uac.manifest
+             win32/rrdupdate.sln win32/rrdupdate.vcxproj win32/uac.manifest \
+             win32/asprintf.c win32/asprintf.h win32/dirent.h win32/vasprintf-msvc.c \
+             win32/win32-glob.c win32/win32-glob.h
 
 CLEANFILES = config.cache
 

diff --git a/win32/librrd-4.rc b/win32/librrd-4.rc
index 4721eaf8629e3da4d982a5a35563f2e699e8a373..90742adf11029266a0821387db1110eb7093f8c8 100644 (file)
--- a/win32/librrd-4.rc
+++ b/win32/librrd-4.rc
@@ -19,9 +19,9 @@ BEGIN
     BEGIN\r
       VALUE "Comments", "RRDtool is available under the terms of the GNU General Public License V2 or later"\r
       VALUE "CompanyName", "The RRDtool Project, http://oss.oetiker.ch/rrdtool/"\r
-      VALUE "LegalCopyright", "Copyright (c) 1998-2013 Tobias Oetiker"\r
+      VALUE "LegalCopyright", "Copyright (c) 1998-2017 Tobias Oetiker"\r
       VALUE "FileDescription", "time-series data storage and display system"\r
-      VALUE "ProductName", "time-series data storage and display system"\r
+      VALUE "ProductName", "RRDtool"\r
       VALUE "FileVersion", PACKAGE_VERSION\r
       VALUE "ProductVersion", PACKAGE_VERSION\r
       VALUE "OriginalFilename", "librrd-4.dll"\r

diff --git a/win32/rrd_config.h b/win32/rrd_config.h
index f87d0595e7dfb864d04c8d247107484b1f518879..783377ad98b8432708273849f0e1e24c0acf47df 100644 (file)
--- a/win32/rrd_config.h
+++ b/win32/rrd_config.h
@@ -1,4 +1,4 @@
-/* rrd_config.h for Visual Studio 2010, 2012 */
+/* rrd_config.h for Visual Studio 2010, 2012 and newer */
 
 #ifndef RRD_CONFIG_H
 #define RRD_CONFIG_H
@@ -8,10 +8,10 @@
 
 /* Define to the version of this package. */
 #define PACKAGE_MAJOR       1
-#define PACKAGE_MINOR       4
-#define PACKAGE_REVISION    999
-#define PACKAGE_VERSION     "1.4.999"
-#define NUMVERS             1.4999
+#define PACKAGE_MINOR       7
+#define PACKAGE_REVISION    0
+#define PACKAGE_VERSION     "1.7.0"
+#define NUMVERS             1.70
 
 #define RRD_DEFAULT_FONT "Courier"
 

diff --git a/win32/rrdcgi.rc b/win32/rrdcgi.rc
index f03ad4b01894afab43ab8e14c2f2ed27d91f3a88..9720241797a51c7a1567d63aa9e9e037474a2ebc 100644 (file)
--- a/win32/rrdcgi.rc
+++ b/win32/rrdcgi.rc
@@ -19,9 +19,9 @@ BEGIN
     BEGIN\r
       VALUE "Comments", "RRDtool is available under the terms of the GNU General Public License V2 or later"\r
       VALUE "CompanyName", "The RRDtool Project, http://oss.oetiker.ch/rrdtool/"\r
-      VALUE "LegalCopyright", "Copyright (c) 1998-2013 Tobias Oetiker"\r
+      VALUE "LegalCopyright", "Copyright (c) 1998-2017 Tobias Oetiker"\r
       VALUE "FileDescription", "time-series data storage and display system"\r
-      VALUE "ProductName", "time-series data storage and display system"\r
+      VALUE "ProductName", "RRDtool"\r
       VALUE "FileVersion", PACKAGE_VERSION\r
       VALUE "ProductVersion", PACKAGE_VERSION\r
       VALUE "InternalName", "rrdcgi.exe"\r

diff --git a/win32/rrdtool.rc b/win32/rrdtool.rc
index f904461c8ce71dd145a2511bd4dc0edbf3904e8d..0d987b94cdb521280d2cf7818488b9fbd3cc5483 100644 (file)
--- a/win32/rrdtool.rc
+++ b/win32/rrdtool.rc
@@ -19,9 +19,9 @@ BEGIN
     BEGIN\r
       VALUE "Comments", "RRDtool is available under the terms of the GNU General Public License V2 or later"\r
       VALUE "CompanyName", "The RRDtool Project, http://oss.oetiker.ch/rrdtool/"\r
-      VALUE "LegalCopyright", "Copyright (c) 1998-2013 Tobias Oetiker"\r
+      VALUE "LegalCopyright", "Copyright (c) 1998-2017 Tobias Oetiker"\r
       VALUE "FileDescription", "time-series data storage and display system"\r
-      VALUE "ProductName", "time-series data storage and display system"\r
+      VALUE "ProductName", "RRDtool"\r
       VALUE "FileVersion", PACKAGE_VERSION\r
       VALUE "ProductVersion", PACKAGE_VERSION\r
       VALUE "InternalName", "rrdtool.exe"\r

diff --git a/win32/rrdupdate.rc b/win32/rrdupdate.rc
index 10cf7de1b168f88a7e62d3192b1bb59d9939ad07..7933791b9f7c58891f9c84290d63cfc7df665769 100644 (file)
--- a/win32/rrdupdate.rc
+++ b/win32/rrdupdate.rc
@@ -19,9 +19,9 @@ BEGIN
     BEGIN\r
       VALUE "Comments", "RRDtool is available under the terms of the GNU General Public License V2 or later"\r
       VALUE "CompanyName", "The RRDtool Project, http://oss.oetiker.ch/rrdtool/"\r
-      VALUE "LegalCopyright", "Copyright (c) 1998-2013 Tobias Oetiker"\r
+      VALUE "LegalCopyright", "Copyright (c) 1998-2017 Tobias Oetiker"\r
       VALUE "FileDescription", "time-series data storage and display system"\r
-      VALUE "ProductName", "time-series data storage and display system"\r
+      VALUE "ProductName", "RRDtool"\r
       VALUE "FileVersion", PACKAGE_VERSION\r
       VALUE "ProductVersion", PACKAGE_VERSION\r
       VALUE "InternalName", "rrdupdate.exe"\r