From: Wolfgang Stöggl Date: Sat, 22 Jun 2019 20:58:50 +0000 (+0200) Subject: Bump version to librrd-8.dll for MSVC builds X-Git-Tag: v1.8.0~87 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a597646a393eeeb276a091f05a342efbfc4919c;p=thirdparty%2Frrdtool-1.x.git Bump version to librrd-8.dll for MSVC builds The current version in the filename of the library is 8, e.g. librrd.so.8 or librrd-8.dll (MinGW-w64 builds), which is based on LIBVERS from configure.ac. The version of the dll for MSVC builds is not derived from LIBVERS and has not been updated yet. - Substitute occurrences of librrd-4 with librrd-8 using: git grep -l 'librrd-4' | xargs sed -b -i 's/librrd-4/librrd-8/g' - rename librrd-4* files to librrd-8* using: find . -name 'librrd-4*' \ -exec bash -c 'file={}; git mv $file ${file/librrd-4/librrd-8}' \; --- diff --git a/Makefile.am b/Makefile.am index c8cbee4b..1da51d63 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ EXTRA_DIST = COPYRIGHT CHANGES TODO CONTRIBUTORS THREADS VERSION LICENSE \ libtool .indent.pro \ m4/snprintf.m4 \ win32/build-rrdtool.dot win32/build-rrdtool.pdf win32/build-rrdtool.svg \ - win32/librrd-4.def win32/librrd-4.rc win32/librrd-4.vcxproj \ + win32/librrd-8.def win32/librrd-8.rc win32/librrd-8.vcxproj \ win32/Makefile.msc win32/README win32/README-MinGW-w64 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 \ diff --git a/Makefile.in b/Makefile.in index 60f3f584..6bcce66f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -433,7 +433,7 @@ EXTRA_DIST = COPYRIGHT CHANGES TODO CONTRIBUTORS THREADS VERSION LICENSE \ libtool .indent.pro \ m4/snprintf.m4 \ win32/build-rrdtool.dot win32/build-rrdtool.pdf win32/build-rrdtool.svg \ - win32/librrd-4.def win32/librrd-4.rc win32/librrd-4.vcxproj \ + win32/librrd-8.def win32/librrd-8.rc win32/librrd-8.vcxproj \ win32/Makefile.msc win32/README win32/README-MinGW-w64 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 \ diff --git a/WIN32-BUILD-TIPS.txt b/WIN32-BUILD-TIPS.txt index acc76989..80251e24 100644 --- a/WIN32-BUILD-TIPS.txt +++ b/WIN32-BUILD-TIPS.txt @@ -4,7 +4,7 @@ Compiling RRDtool on Win32 with Microsoft Visual C++: 2010-06-04 Chris Larsen clarsen@euphoriaaudio.com 2008-03-12 Stefan Ludewig stefan.ludewig@exitgames.com -Here are step by step instructions for building librrd-4.dll and rrdtool.exe +Here are step by step instructions for building librrd-8.dll and rrdtool.exe version 1.4.5 and newer with Microsoft Visual Studio 2013 (12.0.x) and newer. I you would like to build RRDtool using MinGW-w64, please have a look at win32/README-MinGW-w64 @@ -64,7 +64,7 @@ However, the described procedure still works. etc folders. (4) Open the Visual Studio 2013 Solution "rrd.sln" in the win32 folder of - your rrdtool-folder and build either the project librrd-4 (for the + your rrdtool-folder and build either the project librrd-8 (for the rrdtool-library), rrdtool (for the rrdtool-executable depending on the library) or the complete solution. A post-build event automatically copies all the dlls, needed by rrdtool, next to the .exe, when you build the diff --git a/bindings/dotnet/rrdlib.cs b/bindings/dotnet/rrdlib.cs index f60fbd8a..15e3d861 100644 --- a/bindings/dotnet/rrdlib.cs +++ b/bindings/dotnet/rrdlib.cs @@ -93,7 +93,7 @@ namespace dnrrdlib public class rrd { // Set this path to the location of your "rrdlib.dll" file - const string dll = @"librrd-4.dll"; + const string dll = @"librrd-8.dll"; // IMPORTS - Main methods [DllImport(dll)] static extern Int32 rrd_create(Int32 argc, string[] argv); diff --git a/bindings/perl-shared/Makefile.PL b/bindings/perl-shared/Makefile.PL index 667e6554..49c710c6 100644 --- a/bindings/perl-shared/Makefile.PL +++ b/bindings/perl-shared/Makefile.PL @@ -19,7 +19,7 @@ if (($Config{'osname'} eq 'MSWin32' && $ENV{'OSTYPE'} eq '')) { 'LDDLFLAGS' => '-dll -nologo -opt:ref,icf -ltcg -libpath:"$perl_core_dir" -machine:X86', 'LDFLAGS' => '-nologo -opt:ref,icf -ltcg -libpath:"$perl_core_dir" -machine:X86', 'OPTIMIZE' => '-O2 -MD', - 'LIBS' => qq{"../../win32/librrd-4.lib" "perl$perlver.lib" -L../../contrib/lib -L../../win32 -L"$sdk_dir/lib" -L"$vc_dir/lib" -L"$perl_core_dir"}, + 'LIBS' => qq{"../../win32/librrd-8.lib" "perl$perlver.lib" -L../../contrib/lib -L../../win32 -L"$sdk_dir/lib" -L"$vc_dir/lib" -L"$perl_core_dir"}, 'realclean' => {FILES => 't/demo?.rrd t/demo?.png' }, ($] ge '5.005') ? ( 'AUTHOR' => 'Tobias Oetiker (tobi@oetiker.ch)', diff --git a/win32/Makefile.msc b/win32/Makefile.msc index fa266347..c958ef3e 100644 --- a/win32/Makefile.msc +++ b/win32/Makefile.msc @@ -8,7 +8,7 @@ # The toplevel directory of the source tree # TOP = . -RRD_LIB_NAME=librrd-4 +RRD_LIB_NAME=librrd-8 ARCH_PATH_X86=contrib ARCH_PATH_X64=contrib-x64 diff --git a/win32/Makefile_vcpkg.msc b/win32/Makefile_vcpkg.msc index 85a39be6..cbd0a170 100644 --- a/win32/Makefile_vcpkg.msc +++ b/win32/Makefile_vcpkg.msc @@ -8,7 +8,7 @@ # The toplevel directory of the source tree # TOP = . -RRD_LIB_NAME=librrd-4 +RRD_LIB_NAME=librrd-8 ARCH_PATH_X86=vcpkg\installed\x86-windows ARCH_PATH_X64=vcpkg\installed\x64-windows diff --git a/win32/README b/win32/README index 25c768d0..3720b043 100644 --- a/win32/README +++ b/win32/README @@ -34,7 +34,7 @@ Win32 Build Instructions (using nmake Makefile): If you use headers and libraries in the contrib or the contrib-x64 folder, use Makefile.msc instead of Makefile_vcpkg.msc in the three commands above. -6) librrd-4.dll, librrd-4.lib, rrdtool.exe, rrdupdate.exe, rrdcgi.exe, and +6) librrd-8.dll, librrd-8.lib, rrdtool.exe, rrdupdate.exe, rrdcgi.exe, and these corresponding pdb files will be located in the win32 directory. 7) To install, copy these files which you required to their permanent location. diff --git a/win32/librrd-4.def b/win32/librrd-8.def similarity index 98% rename from win32/librrd-4.def rename to win32/librrd-8.def index f585286e..5427e010 100644 --- a/win32/librrd-4.def +++ b/win32/librrd-8.def @@ -1,4 +1,4 @@ -LIBRARY "librrd-4.dll" +LIBRARY "librrd-8.dll" EXPORTS rrd_add_ptr rrd_add_ptr_chunk diff --git a/win32/librrd-4.rc b/win32/librrd-8.rc similarity index 88% rename from win32/librrd-4.rc rename to win32/librrd-8.rc index d88b8292..1e946bd2 100644 --- a/win32/librrd-4.rc +++ b/win32/librrd-8.rc @@ -24,8 +24,8 @@ BEGIN VALUE "ProductName", "RRDtool" VALUE "FileVersion", PACKAGE_VERSION VALUE "ProductVersion", PACKAGE_VERSION - VALUE "OriginalFilename", "librrd-4.dll" - VALUE "InternalName", "librrd-4.dll" + VALUE "OriginalFilename", "librrd-8.dll" + VALUE "InternalName", "librrd-8.dll" END END BLOCK "VarFileInfo" diff --git a/win32/librrd-4.vcxproj b/win32/librrd-8.vcxproj similarity index 96% rename from win32/librrd-4.vcxproj rename to win32/librrd-8.vcxproj index 949d130b..4b81a53e 100644 --- a/win32/librrd-4.vcxproj +++ b/win32/librrd-8.vcxproj @@ -24,7 +24,7 @@ {CC158E1D-1364-43CA-9B2D-4AF54225C7CA} - librrd-4 + librrd-8 Win32Proj @@ -107,7 +107,7 @@ MultiThreadedDebugDLL precompiled.h - $(IntDir)librrd-4.pdb + $(IntDir)librrd-8.pdb Level3 ProgramDatabase CompileAsC @@ -129,7 +129,7 @@ true precompiled.h - $(IntDir)librrd-4.pdb + $(IntDir)librrd-8.pdb Level3 None CompileAsC @@ -150,7 +150,7 @@ MultiThreadedDebug precompiled.h - $(IntDir)librrd-4.pdb + $(IntDir)librrd-8.pdb Level3 ProgramDatabase CompileAsC @@ -159,7 +159,7 @@ cairo.lib;glib-2.0.lib;gobject-2.0.lib;libpng.lib;libxml2.lib;pango-1.0.lib;pangocairo-1.0.lib;gthread-2.0.lib;%(AdditionalDependencies) ../contrib/lib;%(AdditionalLibraryDirectories) - librrd-4.def + librrd-8.def true @@ -177,7 +177,7 @@ ProgramDatabase CompileAsC 4996;%(DisableSpecificWarnings) - $(IntDir)librrd-4.pdb + $(IntDir)librrd-8.pdb cairo.lib;pango-1.0.lib;pangocairo-1.0.lib;libpng.lib;zdll.lib;glib-2.0.lib;gobject-2.0.lib;libxml2.lib;gthread-2.0.lib;%(AdditionalDependencies) @@ -195,7 +195,7 @@ MultiThreaded precompiled.h - $(IntDir)librrd-4.pdb + $(IntDir)librrd-8.pdb TurnOffAllWarnings ProgramDatabase CompileAsC @@ -205,7 +205,7 @@ cairo.lib;glib-2.0.lib;gobject-2.0.lib;libpng.lib;libxml2.lib;pango-1.0.lib;ws2_32.lib;pangocairo-1.0.lib;gthread-2.0.lib;%(AdditionalDependencies) ../contrib/lib;%(AdditionalLibraryDirectories) - librrd-4.def + librrd-8.def @@ -287,7 +287,7 @@ - + diff --git a/win32/rrd.sln b/win32/rrd.sln index c4219286..6b5665f4 100644 --- a/win32/rrd.sln +++ b/win32/rrd.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0.30110.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "librrd-4", "librrd-4.vcxproj", "{CC158E1D-1364-43CA-9B2D-4AF54225C7CA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "librrd-8", "librrd-8.vcxproj", "{CC158E1D-1364-43CA-9B2D-4AF54225C7CA}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rrdtool", "rrdtool.vcxproj", "{11CD05F8-E5E1-476E-A75F-A112655D4E94}" EndProject diff --git a/win32/rrdtool.vcxproj b/win32/rrdtool.vcxproj index 9e3e1bd0..9a3b2ef7 100644 --- a/win32/rrdtool.vcxproj +++ b/win32/rrdtool.vcxproj @@ -78,7 +78,7 @@ .;../../contrib/cairo/include/cairo;../../contrib/pango/include/pango-1.0;../../contrib/glib/include/glib-2.0;../../contrib/glib/lib/glib-2.0/include;../../contrib/libpng/include;../../contrib/zlib/include;../../contrib/libxml2/include/libxml2;%(AdditionalIncludeDirectories) - librrd-4.lib;%(AdditionalDependencies) + librrd-8.lib;%(AdditionalDependencies) LinkVerboseLib $(Configuration);%(AdditionalLibraryDirectories) true @@ -119,7 +119,7 @@ copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\ ProgramDatabase - librrd-4.lib;cairo.lib;pango-1.0.lib;pangocairo-1.0.lib;libpng.lib;zdll.lib;glib-2.0.lib;gobject-2.0.lib;libxml2.lib;%(AdditionalDependencies) + librrd-8.lib;cairo.lib;pango-1.0.lib;pangocairo-1.0.lib;libpng.lib;zdll.lib;glib-2.0.lib;gobject-2.0.lib;libxml2.lib;%(AdditionalDependencies) $(Configuration); ../contrib/lib;%(AdditionalLibraryDirectories) false true @@ -161,7 +161,7 @@ copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\ .;../../contrib/cairo/include/cairo;../../contrib/pango/include/pango-1.0;../../contrib/glib/include/glib-2.0;../../contrib/glib/lib/glib-2.0/include;../../contrib/libpng/include;../../contrib/zlib/include;../../contrib/libxml2/include/libxml2;%(AdditionalIncludeDirectories) - librrd-4.lib;cairo.lib;%(AdditionalDependencies) + librrd-8.lib;cairo.lib;%(AdditionalDependencies) LinkVerboseLib $(Configuration);../contrib/lib;%(AdditionalLibraryDirectories) true @@ -197,7 +197,7 @@ copy $(ProjectDir)\..\contrib\bin\zlib1.dll "$(TargetDir)"\ - + {cc158e1d-1364-43ca-9b2d-4af54225c7ca} diff --git a/win32/rrdupdate.vcxproj b/win32/rrdupdate.vcxproj index f271f83f..3577659e 100644 --- a/win32/rrdupdate.vcxproj +++ b/win32/rrdupdate.vcxproj @@ -78,7 +78,7 @@ 4996;%(DisableSpecificWarnings) - librrd-4.lib;%(AdditionalDependencies) + librrd-8.lib;%(AdditionalDependencies) LinkVerboseLib $(Configuration);%(AdditionalLibraryDirectories) LIBCMTD.lib;LIBCMT.lib;%(IgnoreSpecificDefaultLibraries) @@ -120,7 +120,7 @@ copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\ ProgramDatabase - librrd-4.lib;cairo.lib;pango-1.0.lib;pangocairo-1.0.lib;libpng.lib;zdll.lib;glib-2.0.lib;gobject-2.0.lib;libxml2.lib;%(AdditionalDependencies) + librrd-8.lib;cairo.lib;pango-1.0.lib;pangocairo-1.0.lib;libpng.lib;zdll.lib;glib-2.0.lib;gobject-2.0.lib;libxml2.lib;%(AdditionalDependencies) $(Configuration); ../contrib/lib;%(AdditionalLibraryDirectories) true true @@ -162,7 +162,7 @@ copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\ 4996;%(DisableSpecificWarnings) - librrd-4.lib;cairo.lib;%(AdditionalDependencies) + librrd-8.lib;cairo.lib;%(AdditionalDependencies) LinkVerboseLib $(Configuration);../contrib/lib;%(AdditionalLibraryDirectories) true @@ -198,7 +198,7 @@ copy $(ProjectDir)\..\contrib\bin\zlib1.dll "$(TargetDir)"\ - + {cc158e1d-1364-43ca-9b2d-4af54225c7ca}