Skip to content

Commit d81b211

Browse files
committed
Upgrade pugixml 1.5 to 1.8
pugixml 1.8 was chosen because it can still be built using the same build files as pugixml 1.5. Miscellanous modifications to pugixml.cpp were made for EBCDIC support and for snprintf compatibility with modern build compilers. pugixml 1.5 is deleted from OMR. The main motivation for this upgrade is to simplify the license vetting process with the Eclipse Foundation. However, it is also useful to maintain currency with newer pugixml releases. Signed-off-by: Daryl Maier <[email protected]>
1 parent 8037ccd commit d81b211

File tree

9 files changed

+2585
-1396
lines changed

9 files changed

+2585
-1396
lines changed

GNUmakefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ tool_targets += tools/tracemerge
101101
endif
102102

103103
# FVTest Helper Libraries
104-
test_prereqs := third_party/pugixml-1.5 fvtest/util fvtest/omrGtestGlue
104+
test_prereqs := third_party/pugixml-1.8 fvtest/util fvtest/omrGtestGlue
105105
test_targets += $(test_prereqs)
106106

107107
# Utility Libraries

longabout.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ <h4>Google C++ Testing Framework 1.7.0</h4>
6666
The source is available at <a href="https://github.com/google/googletest">https://github.com/google/googletest</a>.
6767
</p>
6868

69-
<h4>pugixml 1.5</h4>
70-
<p>Copyright (c) 2006-2015 Arseny Kapoulkine</p>
69+
<h4>pugixml 1.8</h4>
70+
<p>Copyright (c) 2006-2016 Arseny Kapoulkine</p>
7171
<p>
7272
Permission is hereby granted, free of charge, to any person obtaining a
7373
copy of this software and associated documentation files (the "Software"),
@@ -88,7 +88,7 @@ <h4>pugixml 1.5</h4>
8888
THE SOFTWARE.
8989
</p>
9090
<p>
91-
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>.
91+
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>.
9292
</p>
9393

9494
<h4>config.sub and config.guess</h4>

omrmakefiles/configure.mk.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ GLOBAL_LIBPATH += . $(exe_output_dir) $(lib_output_dir)
216216
# Location of fvtest framework
217217
OMR_GTEST_DIR := $(top_srcdir)/third_party/gtest-1.8.0
218218
OMR_GTEST_INCLUDES := $(OMR_GTEST_DIR) $(OMR_GTEST_DIR)/include $(top_srcdir)/fvtest/omrGtestGlue
219-
OMR_PUGIXML_DIR := $(top_srcdir)/third_party/pugixml-1.5
219+
OMR_PUGIXML_DIR := $(top_srcdir)/third_party/pugixml-1.8
220220

221221
# googletest code requires exception handling
222222
ifeq (linux,$(OMR_HOST_OS))

third_party/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@
2020
# 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
2121
###############################################################################
2222

23-
add_subdirectory(pugixml-1.5)
23+
add_subdirectory(pugixml-1.8)
2424
# TODO: gtest/gmock

third_party/pugixml-1.5/makefile

-31
This file was deleted.
File renamed without changes.

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

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* pugixml parser - version 1.5
2+
* pugixml parser - version 1.8
33
* --------------------------------------------------------
4-
* Copyright (C) 2006-2014, by Arseny Kapoulkine ([email protected])
4+
* Copyright (C) 2006-2016, by Arseny Kapoulkine ([email protected])
55
* Report bugs and download new versions at http://pugixml.org/
66
*
77
* This library is distributed under the MIT License. See notice at the end
@@ -17,6 +17,9 @@
1717
// Uncomment this to enable wchar_t mode
1818
// #define PUGIXML_WCHAR_MODE
1919

20+
// Uncomment this to enable compact mode
21+
// #define PUGIXML_COMPACT
22+
2023
// Uncomment this to disable XPath
2124
// #define PUGIXML_NO_XPATH
2225

@@ -39,15 +42,14 @@
3942

4043
// Uncomment this to switch to header-only version
4144
// #define PUGIXML_HEADER_ONLY
42-
// #include "pugixml.cpp"
4345

4446
// Uncomment this to enable long long support
4547
// #define PUGIXML_HAS_LONG_LONG
4648

4749
#endif
4850

4951
/**
50-
* Copyright (c) 2006-2014 Arseny Kapoulkine
52+
* Copyright (c) 2006-2016 Arseny Kapoulkine
5153
*
5254
* Permission is hereby granted, free of charge, to any person
5355
* obtaining a copy of this software and associated documentation
@@ -60,7 +62,7 @@
6062
*
6163
* The above copyright notice and this permission notice shall be
6264
* included in all copies or substantial portions of the Software.
63-
*
65+
*
6466
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
6567
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
6668
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

0 commit comments

Comments
 (0)