[lmi-commits] [lmi] master a020e99 05/15: Add xmlwrapp submodule and use its sources and headers from it

[Greg Chicares]

branch: master
commit a020e99386b17f1d0fcc67a3749d69ce5b262629
Author: Vadim Zeitlin <vadim@tt-solutions.com>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Add xmlwrapp submodule and use its sources and headers from it
    
    Add a submodule for this library, using the same version as was
    previously used in install_miscellanea.make -- and which doesn't need to
    be used there any more, as it is always present in the source tree now.
    
    Don't change the build system yet, i.e. continue using the "unified
    build" by including all xmlwrapp sources in xml_xslt_wrapp.cpp, but
    explicitly use the relative paths to them instead of copying them to
    /opt/lmi/third_party/src directory, which can now be removed from the
    list of include directories, where it was quite incongruous.
    
    Do add the path to xmlwrapp headers to the list of include directories,
    as there doesn't seem to be any sense in copying them anywhere neither.
---
 .gitmodules              |  4 ++++
 install_miscellanea.make | 26 ++------------------------
 third_party/xmlwrapp     |  1 +
 workhorse.make           |  2 +-
 xml_xslt_wrapp.cpp       | 36 ++++++++++++++++++------------------
 xmlwrapp-0.9.0.md5sums   | 45 ---------------------------------------------
 6 files changed, 26 insertions(+), 88 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index e0378ac..33fca89 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,3 +6,7 @@
        path = third_party/libxslt
        url = https://github.com/let-me-illustrate/libxslt.git
        branch = lmi
+[submodule "third_party/xmlwrapp"]
+       path = third_party/xmlwrapp
+       url = https://github.com/let-me-illustrate/xmlwrapp.git
+       branch = lmi
diff --git a/install_miscellanea.make b/install_miscellanea.make
index a236f63..e991f71 100644
--- a/install_miscellanea.make
+++ b/install_miscellanea.make
@@ -48,7 +48,6 @@ cgicc_archive    := cgicc-3.1.4.tar.bz2
 jing_archive     := jing-20091111.zip
 sample_archive   := lmi-data-20050618T1440Z.tar.bz2
 trang_archive    := trang-20091111.zip
-xmlwrapp_archive := xmlwrapp-0.9.0.tar.gz
 
 file_list := \
   $(boost_archive) \
@@ -56,9 +55,8 @@ file_list := \
   $(jing_archive) \
   $(sample_archive) \
   $(trang_archive) \
-  $(xmlwrapp_archive) \
 
-boost cgicc xmlwrapp: stem = $(basename $(basename $($@_archive)))
+boost cgicc:          stem = $(basename $(basename $($@_archive)))
 jing trang:           stem =            $(basename $($@_archive))
 sample:               stem = data
 
@@ -69,14 +67,12 @@ $(cgicc_archive)-url    := 
ftp://ftp.gnu.org/pub/gnu/cgicc/$(cgicc_archive)
 $(jing_archive)-url     := 
https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jing-trang/$(jing_archive)
 $(sample_archive)-url   := 
https://download.savannah.gnu.org/releases/lmi/$(sample_archive)
 $(trang_archive)-url    := 
https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jing-trang/$(trang_archive)
-$(xmlwrapp_archive)-url := 
https://github.com/vslavik/xmlwrapp/releases/download/v0.9.0/$(xmlwrapp_archive)
 
 $(boost_archive)-md5    := 2b999b2fb7798e1737d1fff8fac602ef
 $(cgicc_archive)-md5    := 6cb5153fc9fa64b4e50c7962aa557bbe
 $(jing_archive)-md5     := 13eef193921409a1636377d1efbf9843
 $(sample_archive)-md5   := e7f07133abfc3b9c2252dfa3b61191bc
 $(trang_archive)-md5    := 9d31799b948c350850eb9dd14e5b832d
-$(xmlwrapp_archive)-md5 := 5e8ac678ab03b7c60ce61ac5424e0849
 
 # Utilities 
####################################################################
 
@@ -115,7 +111,7 @@ ad_hoc_dir_exists = \
 # Targets 
######################################################################
 
 .PHONY: all
-all: boost cgicc jing sample trang xmlwrapp
+all: boost cgicc jing sample trang
 
 # Patches were generated according to this advice:
 #
@@ -201,24 +197,6 @@ trang: $(file_list)
        $(MKDIR) --parents $(dest_dir)/rng
        $(MV) $(ad_hoc_dir)/$(stem)/$@.jar $(dest_dir)/rng
 
-.PHONY: xmlwrapp
-xmlwrapp: $(file_list)
-       -[ -e $(stem).patch ] && $(PATCH) --directory=$(ad_hoc_dir) --strip=1 < 
$(stem).patch
-       $(CHMOD) -R g=u $(ad_hoc_dir)/$(stem)
-       $(MKDIR) $(third_party_include_dir)/xmlwrapp/
-       $(MV) $(ad_hoc_dir)/$(stem)/include/xmlwrapp/*.h 
$(third_party_include_dir)/xmlwrapp/
-       $(MKDIR) $(third_party_include_dir)/xsltwrapp/
-       $(MV) $(ad_hoc_dir)/$(stem)/include/xsltwrapp/*.h 
$(third_party_include_dir)/xsltwrapp/
-       $(MKDIR) $(third_party_source_dir)/libxml/
-       $(MV) $(ad_hoc_dir)/$(stem)/src/libxml/* 
$(third_party_source_dir)/libxml/
-       $(MKDIR) $(third_party_source_dir)/libxslt/
-       $(MV) $(ad_hoc_dir)/$(stem)/src/libxslt/* 
$(third_party_source_dir)/libxslt/
-       cd $(dest_dir) && $(MD5SUM) --binary include/xmlwrapp/* 
include/xsltwrapp/* src/libxml/* src/libxslt/* >$(stem).md5sums
-       cd $(dest_dir) && $(MD5SUM) --check $(CURDIR)/$(stem).md5sums
-       $(SORT) --key=2 --output=$(stem).X             $(stem).md5sums
-       $(SORT) --key=2 --output=$(stem).Y $(dest_dir)/$(stem).md5sums
-       $(DIFF) --unified $(stem).X $(stem).Y && $(RM) 
$(dest_dir)/$(stem).md5sums $(stem).X $(stem).Y
-
 $(file_list): initial_setup
 
 .PHONY: initial_setup
diff --git a/third_party/xmlwrapp b/third_party/xmlwrapp
new file mode 160000
index 0000000..7a6efb5
--- /dev/null
+++ b/third_party/xmlwrapp
@@ -0,0 +1 @@
+Subproject commit 7a6efb54842a694dfbb893569046f209affc0164
diff --git a/workhorse.make b/workhorse.make
index 1d5f979..a35141e 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -305,11 +305,11 @@ lmi_include_directories := \
   $(srcdir) \
   $(srcdir)/tools/pete-2.1.1 \
   $(overriding_include_directories) \
-  /opt/lmi/third_party/src \
 
 sys_include_directories := \
   $(compiler_include_directory) \
   $(wx_include_paths) \
+  $(srcdir)/third_party/xmlwrapp/include \
   /opt/lmi/third_party/include \
   $(localincludedir) \
   $(localincludedir)/libxml2 \
diff --git a/xml_xslt_wrapp.cpp b/xml_xslt_wrapp.cpp
index b4a5b0d..93fe455 100644
--- a/xml_xslt_wrapp.cpp
+++ b/xml_xslt_wrapp.cpp
@@ -31,23 +31,23 @@
 
 #define HAVE_BOOST_POOL_SINGLETON_POOL_HPP
 
-#include "libxml/ait_impl.cxx"
-#include "libxml/attributes.cxx"
-#include "libxml/document.cxx"
-#include "libxml/dtd_impl.cxx"
-#include "libxml/errors.cxx"
-#include "libxml/event_parser.cxx"
-#include "libxml/init.cxx"
-#include "libxml/node.cxx"
-#include "libxml/node_iterator.cxx"
-#include "libxml/node_manip.cxx"
-#include "libxml/nodes_view.cxx"
-#include "libxml/relaxng.cxx"
-#include "libxml/schema.cxx"
-#include "libxml/tree_parser.cxx"
-#include "libxml/utility.cxx"
-#include "libxml/xpath.cxx"
-#include "libxslt/init.cxx"
-#include "libxslt/stylesheet.cxx"
+#include "third_party/xmlwrapp/src/libxml/ait_impl.cxx"
+#include "third_party/xmlwrapp/src/libxml/attributes.cxx"
+#include "third_party/xmlwrapp/src/libxml/document.cxx"
+#include "third_party/xmlwrapp/src/libxml/dtd_impl.cxx"
+#include "third_party/xmlwrapp/src/libxml/errors.cxx"
+#include "third_party/xmlwrapp/src/libxml/event_parser.cxx"
+#include "third_party/xmlwrapp/src/libxml/init.cxx"
+#include "third_party/xmlwrapp/src/libxml/node.cxx"
+#include "third_party/xmlwrapp/src/libxml/node_iterator.cxx"
+#include "third_party/xmlwrapp/src/libxml/node_manip.cxx"
+#include "third_party/xmlwrapp/src/libxml/nodes_view.cxx"
+#include "third_party/xmlwrapp/src/libxml/relaxng.cxx"
+#include "third_party/xmlwrapp/src/libxml/schema.cxx"
+#include "third_party/xmlwrapp/src/libxml/tree_parser.cxx"
+#include "third_party/xmlwrapp/src/libxml/utility.cxx"
+#include "third_party/xmlwrapp/src/libxml/xpath.cxx"
+#include "third_party/xmlwrapp/src/libxslt/init.cxx"
+#include "third_party/xmlwrapp/src/libxslt/stylesheet.cxx"
 
 #undef HAVE_BOOST_POOL_SINGLETON_POOL_HPP
diff --git a/xmlwrapp-0.9.0.md5sums b/xmlwrapp-0.9.0.md5sums
deleted file mode 100644
index e875f48..0000000
--- a/xmlwrapp-0.9.0.md5sums
+++ /dev/null
@@ -1,45 +0,0 @@
-e9f53a414a8b87c19b9aaa967d118b39 *include/xmlwrapp/_cbfo.h
-e5198c69b9160f894144c27f7944f006 *include/xmlwrapp/attributes.h
-c0e31c21ee73adc551d44066a05cb56e *include/xmlwrapp/document.h
-81f2eb808ba0a08dfdf7e504148e48e1 *include/xmlwrapp/errors.h
-472be44813eefa0c2678d756a0ad8553 *include/xmlwrapp/event_parser.h
-10265ab866c1ae2f5dd2294cc07fe814 *include/xmlwrapp/export.h
-aaf6d29222f1bc492971c491e8674094 *include/xmlwrapp/init.h
-1a7abea141d786bf01eb8308e3dc4a13 *include/xmlwrapp/node.h
-621d3c9e99183cb4f0e699a196b2ae06 *include/xmlwrapp/nodes_view.h
-5c7ca8cfae5f13c463ba98b4f697fd39 *include/xmlwrapp/relaxng.h
-b1c92c9f772f9d15409239c95ffda7fa *include/xmlwrapp/schema.h
-0128a792eedd93e54c4279fbf0be747d *include/xmlwrapp/tree_parser.h
-f9a370ac25212f412df21cdb6e86338c *include/xmlwrapp/version.h
-8f828c6963aee1218b6c24e44a8c04bd *include/xmlwrapp/xmlwrapp.h
-9345a4883fb176b91565767f16431567 *include/xmlwrapp/xpath.h
-3f5f7ec654e831101f292c38b0d96822 *include/xsltwrapp/init.h
-acb3d40057869a5d5cb9761f666b3ec5 *include/xsltwrapp/stylesheet.h
-175cb6ca0c4b7c520eeb7db2f81ffe15 *include/xsltwrapp/xsltwrapp.h
-c9d06b9b82de6f8e619c849735ae51d3 *src/libxml/ait_impl.cxx
-aabe59ecc4a15a3f2fc33687f653bafb *src/libxml/ait_impl.h
-ce964eccb3ae135e4cd3cedccb400c19 *src/libxml/attributes.cxx
-08a95a96dae987ff57f7fdb7ff26622a *src/libxml/cpp11.h
-78bbc34f5704d3f685c3529b039fff10 *src/libxml/document.cxx
-4b0e309695a7edf96aef3b8340f30b1d *src/libxml/dtd_impl.cxx
-52a30d8e4839d4862ea5d6beb8e88ce8 *src/libxml/dtd_impl.h
-4c6b35c0fc36ece0394279f3fbecc4fe *src/libxml/errors.cxx
-3b4d2010ef66b0e0095315e154af0230 *src/libxml/errors_impl.h
-e5e1b3adee3f1cf531d73a1ebe21ce25 *src/libxml/event_parser.cxx
-05d595123a29b81794743f8109a5b84d *src/libxml/init.cxx
-489be726d29bf128bcaca6edf439b8b5 *src/libxml/node.cxx
-ea265506d61407be3941365a50d19cda *src/libxml/node_iterator.cxx
-69bd398ab48c4b287e43cf64e048dbda *src/libxml/node_iterator.h
-d67208460998a4758c0975051f89f146 *src/libxml/node_manip.cxx
-889caa6bab85a23ee264a7b81b5909d4 *src/libxml/node_manip.h
-7d053e87fa8ee74db74d48ba499729a7 *src/libxml/nodes_view.cxx
-d8b81745f1ae877d28bd6c7f2d11f73c *src/libxml/pimpl_base.h
-1d4982b515658958409235e1d64e912c *src/libxml/relaxng.cxx
-d7f910f4338ecf6ce5dd87c3c4925d1c *src/libxml/schema.cxx
-281189ffd81c03b45b79590be1e1c926 *src/libxml/tree_parser.cxx
-8f68498087e4b89ea1b32e71adfcdc21 *src/libxml/utility.cxx
-3e1ce5c708657b9c3c74d61a71afb186 *src/libxml/utility.h
-fff84ff7d49ea953c11f158bc0c64fa3 *src/libxml/xpath.cxx
-473b990a598670b0f7f0106548a30252 *src/libxslt/init.cxx
-ebb49a9d004f52bed42e5510ce54bb9b *src/libxslt/result.h
-955a8b16ded31ce18d9854ffb75abf02 *src/libxslt/stylesheet.cxx