From 44e4d7e40b4612c72b8265f38653fc5a93c71f1a Mon Sep 17 00:00:00 2001 From: Arseny Kapoulkine Date: Wed, 11 Sep 2019 20:53:14 -0700 Subject: [PATCH] Update version to 1.10 Note: this chang also updates PUGIXML_VERSION macro to allow for double-digit minor versions; this preserves the continuity of versions so PUGIXML_VERSION >= 190 will still work. --- CMakeLists.txt | 2 +- readme.txt | 2 +- scripts/nuget/pugixml.nuspec | 2 +- scripts/pugixml.podspec | 2 +- src/pugiconfig.hpp | 2 +- src/pugixml.cpp | 2 +- src/pugixml.hpp | 7 ++++--- tests/test_version.cpp | 2 +- 8 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dca6fac..f043962 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.0) -project(pugixml VERSION 1.9) +project(pugixml VERSION 1.10) option(BUILD_SHARED_AND_STATIC_LIBS "Build both shared and static libraries" OFF) option(BUILD_SHARED_LIBS "Build shared instead of static library" OFF) diff --git a/readme.txt b/readme.txt index 478e5a8..3af59b1 100644 --- a/readme.txt +++ b/readme.txt @@ -1,4 +1,4 @@ -pugixml 1.9 - an XML processing library +pugixml 1.10 - an XML processing library Copyright (C) 2006-2019, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com) Report bugs and download new versions at https://pugixml.org/ diff --git a/scripts/nuget/pugixml.nuspec b/scripts/nuget/pugixml.nuspec index e6d3cca..c5da214 100644 --- a/scripts/nuget/pugixml.nuspec +++ b/scripts/nuget/pugixml.nuspec @@ -2,7 +2,7 @@ pugixml - 1.9.0-appveyor + 1.10.0-appveyor pugixml Arseny Kapoulkine Arseny Kapoulkine diff --git a/scripts/pugixml.podspec b/scripts/pugixml.podspec index ccffc4c..f9a72ed 100644 --- a/scripts/pugixml.podspec +++ b/scripts/pugixml.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "pugixml" - s.version = "1.9" + s.version = "1.10" s.summary = "C++ XML parser library." s.homepage = "https://pugixml.org" s.license = "MIT" diff --git a/src/pugiconfig.hpp b/src/pugiconfig.hpp index ff89716..2fb6918 100644 --- a/src/pugiconfig.hpp +++ b/src/pugiconfig.hpp @@ -1,5 +1,5 @@ /** - * pugixml parser - version 1.9 + * pugixml parser - version 1.10 * -------------------------------------------------------- * Copyright (C) 2006-2019, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com) * Report bugs and download new versions at https://pugixml.org/ diff --git a/src/pugixml.cpp b/src/pugixml.cpp index 87e58fb..a321c14 100644 --- a/src/pugixml.cpp +++ b/src/pugixml.cpp @@ -1,5 +1,5 @@ /** - * pugixml parser - version 1.9 + * pugixml parser - version 1.10 * -------------------------------------------------------- * Copyright (C) 2006-2019, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com) * Report bugs and download new versions at https://pugixml.org/ diff --git a/src/pugixml.hpp b/src/pugixml.hpp index 972f8a3..da8ff36 100644 --- a/src/pugixml.hpp +++ b/src/pugixml.hpp @@ -1,5 +1,5 @@ /** - * pugixml parser - version 1.9 + * pugixml parser - version 1.10 * -------------------------------------------------------- * Copyright (C) 2006-2019, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com) * Report bugs and download new versions at https://pugixml.org/ @@ -12,8 +12,9 @@ */ #ifndef PUGIXML_VERSION -// Define version macro; evaluates to major * 100 + minor * 10 + patch so that it's safe to use in less-than comparisons -# define PUGIXML_VERSION 190 +// Define version macro; evaluates to major * 1000 + minor * 10 + patch so that it's safe to use in less-than comparisons +// Note: pugixml used major * 100 + minor * 10 + patch format up until 1.9 (which had version identifier 190); starting from pugixml 1.10, the minor version number is two digits +# define PUGIXML_VERSION 1100 #endif // Include user configuration file (this can define various configuration macros) diff --git a/tests/test_version.cpp b/tests/test_version.cpp index 604dcf6..eeebd14 100644 --- a/tests/test_version.cpp +++ b/tests/test_version.cpp @@ -1,5 +1,5 @@ #include "../src/pugixml.hpp" -#if PUGIXML_VERSION != 190 +#if PUGIXML_VERSION != 1100 #error Unexpected pugixml version #endif