enh(expat): Add patch system for POCO-specific xmlparse modifications#5099
Merged
enh(expat): Add patch system for POCO-specific xmlparse modifications#5099
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This PR adds a patch system to simplify future expat library upgrades. The
src/xmlparse.cppfile contains POCO-specific modifications to expat's originalxmlparse.c, and previously these changes had to be manually re-applied after each upgrade.Changes
New files
xmlparse_poco.patch- Patch file containing all POCO-specific modificationssrc/xmlparse.c- Original unmodified file from expat 2.7.1 (excluded from build)POCO-specific modifications captured in the patch
malloc_fcncalls (required for C++ compilation)CMake changes
xmlparse.cfrom build (we usexmlparse.cpp)patch_expat_xmlparsecustom target (excluded from ALL)How to upgrade expat in the future
dependencies/expat/src/with new release filescmake --build <build-dir> --target patch_expat_xmlparsexmlparse.cand generatexmlparse.cpp