From 7dd362908794239cb9304210bbc7ead0d1f2d413 Mon Sep 17 00:00:00 2001 From: Steven! Ragnarok Date: Tue, 12 Jun 2018 07:28:43 -0700 Subject: [PATCH] Update tinyxml2 to 6.0.0 and fix instructions. --- package/tinyxml2/README.md | 14 +++++++------- package/tinyxml2/tinyxml2.nuspec | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/tinyxml2/README.md b/package/tinyxml2/README.md index defeeb1..1d3f929 100644 --- a/package/tinyxml2/README.md +++ b/package/tinyxml2/README.md @@ -6,16 +6,16 @@ tutorial application which requires it. To build the package, follow these steps. -You need Git, Visual Studio 2015 Command line tools, CMake, Chocolatey, and a text editor. +You need Git, Visual Studio 2017 Command line tools, CMake, Chocolatey, and a text editor. -- Clone or download https://github.com/leethomason/tinxml2 -- Create a CMake build directory and run `cmake -G "Visual Studio 14 2015 Win64" PATH_TO_TINYXML_VENDOR`. +- Clone or download https://github.com/leethomason/tinyxml2 +- Create a CMake build directory and run `cmake -G "Visual Studio 15 2017 Win64" PATH_TO_TINYXML_VENDOR`. - Run `msbuild ALL_BUILD.sln /p:Configuration=Release` -- Copy the tinyxml.lib file to the package lib/ directory. +- Copy the tinyxml2.lib and tinyxml2.dll files to the package lib/ directory. - Run `msbuild ALL_BUILD.sln /p:Configuration=Debug` -- Rename the tinyxml.lib file to tinyxmld.lib and copy it to the package lib/ directory. -- Find the debug symbols (a .pdb file) in the build directory. I have to use File Explorer's search to find it. +- Copy tinyxml2d.lib and tinyxml2d.dll to the package lib/ directory. +- Find the debug symbols (a .pdb file) in the build directory and copy it to the package lib/ directory. I have to use File Explorer's search to find it. - Copy *.h from the tinyxml source directory to the package include/ directory. - Verify the information in the package share/cmake/ directory and nuspec. - Run `choco pack`. -- Test the package and if it's good upload it somewhere your end users can reach it. \ No newline at end of file +- Test the package and if it's good upload it somewhere your end users can reach it. diff --git a/package/tinyxml2/tinyxml2.nuspec b/package/tinyxml2/tinyxml2.nuspec index 199d784..7bd29a4 100644 --- a/package/tinyxml2/tinyxml2.nuspec +++ b/package/tinyxml2/tinyxml2.nuspec @@ -26,7 +26,7 @@ This is a nuspec. It mostly adheres to https://docs.nuget.org/create/Nuspec-Refe - 4.0.1 + 6.0.0 https://github.com/ros2/choco-packages/tree/latest/package/tinyxml2 Steven! Ragnarök