[Help-smalltalk] [PATCH] Split XML in five different packages

[Paolo Bonzini]

The five packages are XML-SAXDriver, XML-DOM, XML-SAXParser, 
XML-NodeBuilder and XML-XMLParser.  The previous name XML can still be 
used.  In the future it may load a different but compatible (e.g. 
Expat-based) parser.

Interestingly enough, only XML-DOM is necessary to load XPath (how you 
build the DOM without a parser, that's another story...). :-)

Paolo

* looking for address@hidden/smalltalk--devo--2.2--patch-624 to compare with
* comparing to address@hidden/smalltalk--devo--2.2--patch-624
A/ packages/xml/builder
A/ packages/xml/dom
A/ packages/xml/parser
A/ packages/xml/saxdriver
A/ packages/xml/saxparser
D  packages/xml/Makefile.frag
D  packages/xml/package.xml
D  packages/xml/stamp-classes
A  packages/xml/builder/package.xml
A  packages/xml/dom/package.xml
A  packages/xml/parser/package.xml
A  packages/xml/saxdriver/package.xml
A  packages/xml/saxparser/package.xml
M  configure.ac
M  doc/gst.texi
M  packages.xml
M  packages/xml/xpath/package.xml
M  packages/xml/xsl/package.xml
/> packages/xpath       packages/xml/xpath
/> packages/xsl packages/xml/xsl
=> packages/xml/NodeBuilder.st  packages/xml/builder/NodeBuilder.st
=> packages/xml/DOM.st  packages/xml/dom/DOM.st
=> packages/xml/XML.st  packages/xml/parser/XML.st
=> packages/xml/SAX.st  packages/xml/saxdriver/SAX.st
=> packages/xml/Parser.st       packages/xml/saxparser/Parser.st

* modified files

--- orig/configure.ac
+++ mod/configure.ac
@@ -327,9 +327,13 @@ GST_PACKAGE_ENABLE([TCP], [tcp],
   [gst_cv_inet_sockets],
   [Makefile], [tcp.la])
 GST_PACKAGE_ENABLE([VFSAddOns], [vfs], [], [], [Makefile])
-GST_PACKAGE_ENABLE([XML], [xml])
-GST_PACKAGE_ENABLE([XPath], [xpath])
-GST_PACKAGE_ENABLE([XSL], [xsl])
+GST_PACKAGE_ENABLE([XML-XMLNodeBuilder], [xml/builder])
+GST_PACKAGE_ENABLE([XML-DOM], [xml/dom])
+GST_PACKAGE_ENABLE([XML-XMLParser], [xml/parser])
+GST_PACKAGE_ENABLE([XML-SAXDriver], [xml/saxdriver])
+GST_PACKAGE_ENABLE([XML-SAXParser], [xml/saxparser])
+GST_PACKAGE_ENABLE([XPath], [xml/xpath])
+GST_PACKAGE_ENABLE([XSL], [xml/xsl])
 GST_PACKAGE_ENABLE([ZLib],
   [zlib],
   [AC_CHECK_HEADER([zlib.h])],


--- orig/doc/gst.texi
+++ mod/doc/gst.texi
@@ -2545,11 +2545,15 @@ other Smalltalk dialects and ported to @
 @node XML
 @section An XML parser and object model for @gst{}
 
-The @sc{xml} parser library for Smalltalk, loaded as package XML
+The @sc{xml} parser library for Smalltalk, loaded as package @code{XML}
 includes a validating @sc{xml} parser and Document Object Model.
 This library is rapidly becoming a standard in the Smalltalk world
-and a @sc{xsl} interpreter based on it is bundled with @gst{} as
-well (see packages XPath and @sc{xsl}).
+and a @sc{xslr} interpreter based on it is bundled with @gst{} as
+well (see packages @code{XPath} and @code{XSL}).
+
+Parts of the basic XML package can be loaded independently using packages
address@hidden, @code{XML-SAXParser}, @code{XML-XMLParser},
address@hidden, @code{XML-XMLNodeBuilder}.
 
 @node Other packages
 @section Other packages


--- orig/packages.xml
+++ mod/packages.xml
@@ -1,5 +1,10 @@
 <packages>
 <package>
+  <name>XML</name>
+  <prereq>XML-XMLParser</prereq>
+</package>
+
+<package>
   <name>MD5</name>
   <prereq>Digest</prereq>
 </package>


--- orig/packages/xpath/package.xml
+++ mod/packages/xml/xpath/package.xml
@@ -1,6 +1,8 @@
 <package>
   <name>XPath</name>
-  <prereq>XML</prereq>
+  <namespace>XML</namespace>
+
+  <prereq>XML-DOM</prereq>
   <filein>XPath.st</filein>
   <file>XPath.st</file>
 </package>


--- orig/packages/xsl/package.xml
+++ mod/packages/xml/xsl/package.xml
@@ -1,5 +1,7 @@
 <package>
   <name>XSL</name>
+  <namespace>XSL</namespace>
+
   <prereq>XML</prereq>
   <prereq>XPath</prereq>
   <filein>XSL.st</filein>



--- /dev/null
+++ mod/packages/xml/builder/package.xml
@@ -0,0 +1,9 @@
+<package>
+  <name>XML-XMLNodeBuilder</name>
+  <namespace>XML</namespace>
+
+  <prereq>XML-SAXParser</prereq>
+
+  <filein>NodeBuilder.st</filein>
+  <file>NodeBuilder.st</file>
+</package>

--- /dev/null
+++ mod/packages/xml/dom/package.xml
@@ -0,0 +1,9 @@
+<package>
+  <name>XML-DOM</name>
+  <namespace>XML</namespace>
+
+  <prereq>XML-SAXDriver</prereq>
+
+  <filein>DOM.st</filein>
+  <file>DOM.st</file>
+</package>

--- /dev/null
+++ mod/packages/xml/parser/package.xml
@@ -0,0 +1,9 @@
+<package>
+  <name>XML-XMLParser</name>
+  <namespace>XML</namespace>
+
+  <prereq>XML-XMLNodeBuilder</prereq>
+
+  <filein>XML.st</filein>
+  <file>XML.st</file>
+</package>

--- /dev/null
+++ mod/packages/xml/saxdriver/package.xml
@@ -0,0 +1,7 @@
+<package>
+  <name>XML-SAXDriver</name>
+  <namespace>XML</namespace>
+
+  <filein>SAX.st</filein>
+  <file>SAX.st</file>
+</package>

--- /dev/null
+++ mod/packages/xml/saxparser/package.xml
@@ -0,0 +1,9 @@
+<package>
+  <name>XML-SAXParser</name>
+  <namespace>XML</namespace>
+
+  <prereq>XML-SAXDriver</prereq>
+
+  <filein>Parser.st</filein>
+  <file>Parser.st</file>
+</package>