Merge pull request #7302 from 0xdaryl/pugixml

Upgrade pugixml 1.5 to 1.8

GNUmakefile

@@ -101,7 +101,7 @@ tool_targets += tools/tracemerge
 endif
 
 # FVTest Helper Libraries
-test_prereqs := third_party/pugixml-1.5 fvtest/util fvtest/omrGtestGlue
+test_prereqs := third_party/pugixml-1.8 fvtest/util fvtest/omrGtestGlue
 test_targets += $(test_prereqs)
 
 # Utility Libraries

longabout.html

@@ -66,8 +66,8 @@ <h4>Google C++ Testing Framework 1.7.0</h4>
 The source is available at <a href="https://github.com/google/googletest">https://github.com/google/googletest</a>.
 </p>
 
-<h4>pugixml 1.5</h4>
-<p>Copyright (c) 2006-2015 Arseny Kapoulkine</p>
+<h4>pugixml 1.8</h4>
+<p>Copyright (c) 2006-2016 Arseny Kapoulkine</p>
 <p>
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
@@ -88,7 +88,7 @@ <h4>pugixml 1.5</h4>
 THE SOFTWARE.
 </p>
 <p>
-The source is available at <a href="http://pugixml.org/2014/11/27/pugixml-1.5-release.html">http://pugixml.org/2014/11/27/pugixml-1.5-release.html</a>.
+The source is available at <a href="https://github.com/zeux/pugixml/releases/tag/v1.8">https://github.com/zeux/pugixml/releases/tag/v1.8</a>.
 </p>
 
 <h4>config.sub and config.guess</h4>

omrmakefiles/configure.mk.in

@@ -216,7 +216,7 @@ GLOBAL_LIBPATH += . $(exe_output_dir) $(lib_output_dir)
 # Location of fvtest framework
 OMR_GTEST_DIR := $(top_srcdir)/third_party/gtest-1.8.0
 OMR_GTEST_INCLUDES := $(OMR_GTEST_DIR) $(OMR_GTEST_DIR)/include $(top_srcdir)/fvtest/omrGtestGlue
-OMR_PUGIXML_DIR := $(top_srcdir)/third_party/pugixml-1.5
+OMR_PUGIXML_DIR := $(top_srcdir)/third_party/pugixml-1.8
 
 # googletest code requires exception handling
 ifeq (linux,$(OMR_HOST_OS))

third_party/CMakeLists.txt

@@ -20,5 +20,5 @@
 # SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
 ###############################################################################
 
-add_subdirectory(pugixml-1.5)
+add_subdirectory(pugixml-1.8)
 # TODO: gtest/gmock

third_party/pugixml-1.5/pugiconfig.hpp → third_party/pugixml-1.8/pugiconfig.hpp

@@ -1,7 +1,7 @@
 /**
- * pugixml parser - version 1.5
+ * pugixml parser - version 1.8
  * --------------------------------------------------------
- * Copyright (C) 2006-2014, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
+ * Copyright (C) 2006-2016, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
  * Report bugs and download new versions at http://pugixml.org/
  *
  * This library is distributed under the MIT License. See notice at the end
@@ -17,6 +17,9 @@
 // Uncomment this to enable wchar_t mode
 // #define PUGIXML_WCHAR_MODE
 
+// Uncomment this to enable compact mode
+// #define PUGIXML_COMPACT
+
 // Uncomment this to disable XPath
 // #define PUGIXML_NO_XPATH
 
@@ -39,15 +42,14 @@
 
 // Uncomment this to switch to header-only version
 // #define PUGIXML_HEADER_ONLY
-// #include "pugixml.cpp"
 
 // Uncomment this to enable long long support
 // #define PUGIXML_HAS_LONG_LONG
 
 #endif
 
 /**
- * Copyright (c) 2006-2014 Arseny Kapoulkine
+ * Copyright (c) 2006-2016 Arseny Kapoulkine
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
@@ -60,7 +62,7 @@
  *
  * The above copyright notice and this permission notice shall be
  * included in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
  * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND