From: Dongsheng Song Date: Sat, 4 May 2013 07:22:48 +0000 (+0800) Subject: Use CRLF line endings for Windows resource files X-Git-Tag: v1.5.0-rc1~181^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a4999011ce448f13478b4cdfd222484686fe32a;p=thirdparty%2Frrdtool-1.x.git Use CRLF line endings for Windows resource files --- diff --git a/win32/rrdcgi.rc b/win32/rrdcgi.rc index a28ca633..f03ad4b0 100644 --- a/win32/rrdcgi.rc +++ b/win32/rrdcgi.rc @@ -1,34 +1,35 @@ -#include -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1, 4, 7, 38 - PRODUCTVERSION 1, 4, 7, 38 - FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -#ifdef _DEBUG - FILEFLAGS VS_FF_DEBUG -#else - FILEFLAGS 0x0L -#endif - FILEOS VOS_NT_WINDOWS32 - FILETYPE VFT_DLL - FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "RRDtool is available under the terms of the GNU General Public License V2 or later" - VALUE "CompanyName", "The RRDtool Project, http://oss.oetiker.ch/rrdtool/" - VALUE "FileDescription", "time-series data storage and display system" - VALUE "FileVersion", "1.4.7.38" - VALUE "InternalName", "rrdcgi.exe" - VALUE "LegalCopyright", "Copyright (c) 1998-2013 Tobias Oetiker" - VALUE "OriginalFilename", "rrdcgi.exe" - VALUE "ProductName", "time-series data storage and display system" - VALUE "ProductVersion", "1.4.7.38" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 0x04b0 - END -END +#include +#include "rrd_config.h" +VS_VERSION_INFO VERSIONINFO + FILEVERSION PACKAGE_MAJOR, PACKAGE_MINOR, PACKAGE_REVISION, 0 + PRODUCTVERSION PACKAGE_MAJOR, PACKAGE_MINOR, PACKAGE_REVISION, 0 + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS_NT_WINDOWS32 + FILETYPE VFT_DLL + FILESUBTYPE VFT2_UNKNOWN +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "RRDtool is available under the terms of the GNU General Public License V2 or later" + VALUE "CompanyName", "The RRDtool Project, http://oss.oetiker.ch/rrdtool/" + VALUE "LegalCopyright", "Copyright (c) 1998-2013 Tobias Oetiker" + VALUE "FileDescription", "time-series data storage and display system" + VALUE "ProductName", "time-series data storage and display system" + VALUE "FileVersion", PACKAGE_VERSION + VALUE "ProductVersion", PACKAGE_VERSION + VALUE "InternalName", "rrdcgi.exe" + VALUE "OriginalFilename", "rrdcgi.exe" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 0x04b0 + END +END diff --git a/win32/rrdtool.rc b/win32/rrdtool.rc index 196ea9e1..f904461c 100644 --- a/win32/rrdtool.rc +++ b/win32/rrdtool.rc @@ -1,35 +1,35 @@ -#include -#include "rrd_config.h" -VS_VERSION_INFO VERSIONINFO - FILEVERSION PACKAGE_MAJOR, PACKAGE_MINOR, PACKAGE_REVISION, 0 - PRODUCTVERSION PACKAGE_MAJOR, PACKAGE_MINOR, PACKAGE_REVISION, 0 - FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -#ifdef _DEBUG - FILEFLAGS VS_FF_DEBUG -#else - FILEFLAGS 0x0L -#endif - FILEOS VOS_NT_WINDOWS32 - FILETYPE VFT_DLL - FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "RRDtool is available under the terms of the GNU General Public License V2 or later" - VALUE "CompanyName", "The RRDtool Project, http://oss.oetiker.ch/rrdtool/" - VALUE "LegalCopyright", "Copyright (c) 1998-2013 Tobias Oetiker" - VALUE "FileDescription", "time-series data storage and display system" - VALUE "ProductName", "time-series data storage and display system" - VALUE "FileVersion", PACKAGE_VERSION - VALUE "ProductVersion", PACKAGE_VERSION - VALUE "InternalName", "rrdtool.exe" - VALUE "OriginalFilename", "rrdtool.exe" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 0x04b0 - END -END +#include +#include "rrd_config.h" +VS_VERSION_INFO VERSIONINFO + FILEVERSION PACKAGE_MAJOR, PACKAGE_MINOR, PACKAGE_REVISION, 0 + PRODUCTVERSION PACKAGE_MAJOR, PACKAGE_MINOR, PACKAGE_REVISION, 0 + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS_NT_WINDOWS32 + FILETYPE VFT_DLL + FILESUBTYPE VFT2_UNKNOWN +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "RRDtool is available under the terms of the GNU General Public License V2 or later" + VALUE "CompanyName", "The RRDtool Project, http://oss.oetiker.ch/rrdtool/" + VALUE "LegalCopyright", "Copyright (c) 1998-2013 Tobias Oetiker" + VALUE "FileDescription", "time-series data storage and display system" + VALUE "ProductName", "time-series data storage and display system" + VALUE "FileVersion", PACKAGE_VERSION + VALUE "ProductVersion", PACKAGE_VERSION + VALUE "InternalName", "rrdtool.exe" + VALUE "OriginalFilename", "rrdtool.exe" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 0x04b0 + END +END