Skip to content

Commit

Permalink
Upgrade pugixml 1.5 to 1.8
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
0xdaryl committed Apr 5, 2024
1 parent 8037ccd commit d81b211
Show file tree
Hide file tree
Showing 9 changed files with 2,585 additions and 1,396 deletions.
2 changes: 1 addition & 1 deletion GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions longabout.html
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion omrmakefiles/configure.mk.in
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion third_party/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
31 changes: 0 additions & 31 deletions third_party/pugixml-1.5/makefile

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* pugixml parser - version 1.5
* pugixml parser - version 1.8
* --------------------------------------------------------
* Copyright (C) 2006-2014, by Arseny Kapoulkine ([email protected])
* Copyright (C) 2006-2016, by Arseny Kapoulkine ([email protected])
* Report bugs and download new versions at http://pugixml.org/
*
* This library is distributed under the MIT License. See notice at the end
Expand All @@ -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

Expand All @@ -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
Expand All @@ -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
Expand Down
Loading

0 comments on commit d81b211

Please sign in to comment.