Skip to content

Correct conflict in #2170#2266

Merged
WardF merged 12 commits intoUnidata:mainfrom
WardF:gh2170.wif
Mar 30, 2022
Merged

Correct conflict in #2170#2266
WardF merged 12 commits intoUnidata:mainfrom
WardF:gh2170.wif

Conversation

@WardF
Copy link
Copy Markdown
Member

@WardF WardF commented Mar 29, 2022

This is PR #2170 + a couple minor conflicts resolved.

DennisHeimbigner and others added 12 commits December 22, 2021 21:04
re: PR Unidata#2139
re: PR Unidata#2169
re: PR Unidata#2146
re: Issue Unidata#2119

Found the product tinyxml2 at https://github.com/leethomason/tinyxml2.git
and replaced ezxml with it. Tinyxml2 is about twice the LOC of ezxml,
but at least is it still being maintained, and I can use it out of the box.
It is C++ rather than C, but we seem to have reached the point that we can
include C++ code with only minor compile flag changes. Untested on Mac OS.
Added instructions to the end of libncxml/Makefile.am on how to upgrade
to a later version of tinyxml2.

This PR obsoletes the use of ezxml (re PRs Unidata#2146 and https://github.com/Unidata/netcdf-c/issue/2119).
2. There is a bug in building tinyxml2 under OSX, so as a hack, the absence of an installed libxml2 under OSX will disable libxml2 and DAP4.
@WardF WardF added the Conflict Resolved Indicates this is a different PR that needed a conflict resolved in order to merge. label Mar 29, 2022
@WardF WardF added this to the 4.9.0 milestone Mar 29, 2022
@WardF WardF self-assigned this Mar 29, 2022
@WardF WardF merged commit ce0446b into Unidata:main Mar 30, 2022
@WardF WardF deleted the gh2170.wif branch March 30, 2022 16:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Conflict Resolved Indicates this is a different PR that needed a conflict resolved in order to merge.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants