]> git.ipfire.org Git - thirdparty/rrdtool-1.x.git/commitdiff
Bump version to librrd-8.dll for MSVC builds
authorWolfgang Stöggl <c72578@yahoo.de>
Sat, 22 Jun 2019 20:58:50 +0000 (22:58 +0200)
committerTobias Oetiker <tobi@oetiker.ch>
Mon, 24 Jun 2019 06:20:50 +0000 (08:20 +0200)
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}' \;

14 files changed:
Makefile.am
Makefile.in
WIN32-BUILD-TIPS.txt
bindings/dotnet/rrdlib.cs
bindings/perl-shared/Makefile.PL
win32/Makefile.msc
win32/Makefile_vcpkg.msc
win32/README
win32/librrd-8.def [moved from win32/librrd-4.def with 98% similarity]
win32/librrd-8.rc [moved from win32/librrd-4.rc with 88% similarity]
win32/librrd-8.vcxproj [moved from win32/librrd-4.vcxproj with 96% similarity]
win32/rrd.sln
win32/rrdtool.vcxproj
win32/rrdupdate.vcxproj

index c8cbee4b835adbe18ecfab871c084093449530d3..1da51d637615ab19b27d0e85560833ab210e3315 100644 (file)
@@ -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 \
index 60f3f584a5de305ebe99d61acb267e0a00b7b2c3..6bcce66fc3d4f3ed2d49388268371f7a82beb379 100644 (file)
@@ -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 \
index acc769899292489fd287f9e1ba0c73e9aa174f49..80251e2412d2cedea9709915d4b98bf6fd009721 100644 (file)
@@ -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
index f60fbd8ac21d489315a450b7d724d9baa7ac06ed..15e3d8613fb6ce0e20cc07eb1f084cdc2190efed 100644 (file)
@@ -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);
index 667e6554329e6df050fb0add2229cb42219a1cb0..49c710c6db0e2b8c98fa20ec78df18227d627c7a 100644 (file)
@@ -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)',
index fa266347ebd7811015fb657b0cf618d4e26764d6..c958ef3e44191151ce03b0a79ce3f2318213dbb9 100644 (file)
@@ -8,7 +8,7 @@
 # The toplevel directory of the source tree\r
 #\r
 TOP = .\r
-RRD_LIB_NAME=librrd-4\r
+RRD_LIB_NAME=librrd-8\r
 ARCH_PATH_X86=contrib\r
 ARCH_PATH_X64=contrib-x64\r
 \r
index 85a39be69131984d511b9b3de1127c7c4a461ca4..cbd0a17001c9349e80c0df01a2ac88c2ded210e2 100644 (file)
@@ -8,7 +8,7 @@
 # The toplevel directory of the source tree\r
 #\r
 TOP = .\r
-RRD_LIB_NAME=librrd-4\r
+RRD_LIB_NAME=librrd-8\r
 ARCH_PATH_X86=vcpkg\installed\x86-windows\r
 ARCH_PATH_X64=vcpkg\installed\x64-windows\r
 \r
index 25c768d0ee1428db42786d3843095fe0a8df5f1c..3720b0433d3d1d6cfce1b45b351d012a2660688f 100644 (file)
@@ -34,7 +34,7 @@ Win32 Build Instructions (using nmake Makefile):
    If you use headers and libraries in the contrib or the contrib-x64 folder,\r
    use Makefile.msc instead of Makefile_vcpkg.msc in the three commands above.\r
 \r
-6) librrd-4.dll, librrd-4.lib, rrdtool.exe, rrdupdate.exe, rrdcgi.exe, and\r
+6) librrd-8.dll, librrd-8.lib, rrdtool.exe, rrdupdate.exe, rrdcgi.exe, and\r
    these corresponding pdb files will be located in the win32 directory.\r
 \r
 7) To install, copy these files which you required to their permanent location.\r
similarity index 98%
rename from win32/librrd-4.def
rename to win32/librrd-8.def
index f585286ed8bbab69dc7b3e7ae6d3361106ed6527..5427e01043e89760d3229d9e896a683a20bf967b 100644 (file)
@@ -1,4 +1,4 @@
-LIBRARY "librrd-4.dll"
+LIBRARY "librrd-8.dll"
 EXPORTS
 rrd_add_ptr
 rrd_add_ptr_chunk
similarity index 88%
rename from win32/librrd-4.rc
rename to win32/librrd-8.rc
index d88b82928ac5a91850f899c86538c5da8a34191e..1e946bd2072fe13408fc2ea63705757f319285d3 100644 (file)
@@ -24,8 +24,8 @@ BEGIN
       VALUE "ProductName", "RRDtool"\r
       VALUE "FileVersion", PACKAGE_VERSION\r
       VALUE "ProductVersion", PACKAGE_VERSION\r
-      VALUE "OriginalFilename", "librrd-4.dll"\r
-      VALUE "InternalName", "librrd-4.dll"\r
+      VALUE "OriginalFilename", "librrd-8.dll"\r
+      VALUE "InternalName", "librrd-8.dll"\r
     END\r
   END\r
   BLOCK "VarFileInfo"\r
similarity index 96%
rename from win32/librrd-4.vcxproj
rename to win32/librrd-8.vcxproj
index 949d130b35d9c9551a6b0ed0fa3dd600bdbf8647..4b81a53eb3a2c647b5b8c89cd30aff971d5e89cd 100644 (file)
@@ -24,7 +24,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{CC158E1D-1364-43CA-9B2D-4AF54225C7CA}</ProjectGuid>
-    <RootNamespace>librrd-4</RootNamespace>
+    <RootNamespace>librrd-8</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader />
       <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(IntDir)librrd-4.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>$(IntDir)librrd-8.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>CompileAsC</CompileAs>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader />
       <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(IntDir)librrd-4.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>$(IntDir)librrd-8.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>None</DebugInformationFormat>
       <CompileAs>CompileAsC</CompileAs>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader />
       <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(IntDir)librrd-4.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>$(IntDir)librrd-8.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>CompileAsC</CompileAs>
     <Link>
       <AdditionalDependencies>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)</AdditionalDependencies>
       <AdditionalLibraryDirectories>../contrib/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>librrd-4.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>librrd-8.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>CompileAsC</CompileAs>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <ProgramDataBaseFileName>$(IntDir)librrd-4.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>$(IntDir)librrd-8.pdb</ProgramDataBaseFileName>
     </ClCompile>
     <Lib>
       <AdditionalDependencies>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)</AdditionalDependencies>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(IntDir)librrd-4.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>$(IntDir)librrd-8.pdb</ProgramDataBaseFileName>
       <WarningLevel>TurnOffAllWarnings</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>CompileAsC</CompileAs>
     <Link>
       <AdditionalDependencies>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)</AdditionalDependencies>
       <AdditionalLibraryDirectories>../contrib/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>librrd-4.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>librrd-8.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="win32-glob.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="librrd-4.def" />
+    <None Include="librrd-8.def" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
index c42192865b3fdeae722ca2989444686a25820eeb..6b5665f4d1e0c9f83bf9dca624d3dc23130544f4 100644 (file)
@@ -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
index 9e3e1bd0a07f4f0fe2a3374deda67d22d619ce88..9a3b2ef71867b21bf175798432bf82070e9415dd 100644 (file)
@@ -78,7 +78,7 @@
       <AdditionalIncludeDirectories>.;../../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)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>librrd-4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>librrd-8.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ShowProgress>LinkVerboseLib</ShowProgress>
       <AdditionalLibraryDirectories>$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -119,7 +119,7 @@ copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>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)</AdditionalDependencies>
+      <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)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(Configuration); ../contrib/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <OptimizeReferences>true</OptimizeReferences>
@@ -161,7 +161,7 @@ copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\
       <AdditionalIncludeDirectories>.;../../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)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>librrd-4.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>librrd-8.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ShowProgress>LinkVerboseLib</ShowProgress>
       <AdditionalLibraryDirectories>$(Configuration);../contrib/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -197,7 +197,7 @@ copy $(ProjectDir)\..\contrib\bin\zlib1.dll "$(TargetDir)"\
     <ClInclude Include="..\src\rrd_tool.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="librrd-4.vcxproj">
+    <ProjectReference Include="librrd-8.vcxproj">
       <Project>{cc158e1d-1364-43ca-9b2d-4af54225c7ca}</Project>
     </ProjectReference>
   </ItemGroup>
index f271f83faf8a202b82cc72fd3080ad8da98e468a..3577659e8f96706ba53ef13eab6ac580259bf421 100644 (file)
@@ -78,7 +78,7 @@
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>librrd-4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>librrd-8.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ShowProgress>LinkVerboseLib</ShowProgress>
       <AdditionalLibraryDirectories>$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>LIBCMTD.lib;LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -120,7 +120,7 @@ copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>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)</AdditionalDependencies>
+      <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)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(Configuration); ../contrib/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OptimizeReferences>true</OptimizeReferences>
@@ -162,7 +162,7 @@ copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>librrd-4.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>librrd-8.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ShowProgress>LinkVerboseLib</ShowProgress>
       <AdditionalLibraryDirectories>$(Configuration);../contrib/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -198,7 +198,7 @@ copy $(ProjectDir)\..\contrib\bin\zlib1.dll "$(TargetDir)"\
     <ClInclude Include="..\src\rrd_tool.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="librrd-4.vcxproj">
+    <ProjectReference Include="librrd-8.vcxproj">
       <Project>{cc158e1d-1364-43ca-9b2d-4af54225c7ca}</Project>
     </ProjectReference>
     <ProjectReference Include="rrdtool.vcxproj">