Re: Some XML Questions

On Mon, Feb 05, 2001 at 09:40:34AM -0600, Karl Fogel wrote:
> Sure, post the patches, thanks...
>

Here are the patches. I've commented a little after each one. When
you are actually ready to commit this, I'll write some changelog
entries.

Index: subversion/include/svn_xml.h
===================================================================
RCS file: /cvs/subversion/subversion/include/svn_xml.h,v
retrieving revision 1.28
diff -u -r1.28 svn_xml.h
--- subversion/include/svn_xml.h 2000/12/26 18:37:46 1.28
+++ subversion/include/svn_xml.h 2001/02/03 12:31:25
@@ -20,7 +20,7 @@
 #ifndef SVN_XML_H
 #define SVN_XML_H
 
-#include "xmlparse.h"
+#include "expat.h"
 #include "svn_error.h"
 #include "svn_delta.h"
 #include "svn_string.h"

This is just the annoying fact that they changed the name of the
header.

Index: Makefile.am
===================================================================
RCS file: /cvs/subversion/Makefile.am,v
retrieving revision 1.16
diff -u -r1.16 Makefile.am
--- Makefile.am 2001/01/28 16:44:28 1.16
+++ Makefile.am 2001/02/03 12:31:25
@@ -8,7 +8,7 @@
 ## dependencies between Makefile.am, Makefile.in, and Makefile.
 ## In other words, SUBDIRS does not completely control automake
 ## generation.
-SUBDIRS = apr expat-lite neon subversion doc
+SUBDIRS = apr expat neon subversion doc
 
 ACLOCAL = @ACLOCAL@ -I ac-helpers
 

Since it's no longer lite, I renamed it.

Index: configure.in
===================================================================
RCS file: /cvs/subversion/configure.in,v
retrieving revision 1.52
diff -u -r1.52 configure.in
--- configure.in 2001/01/31 17:36:18 1.52
+++ configure.in 2001/02/03 12:31:25
@@ -43,7 +43,8 @@
 
 if test "$enable_subdir_config" = "yes"; then
   RUN_SUBDIR_CONFIG_NOW(apr)
- RUN_SUBDIR_CONFIG_NOW(neon, --with-expat="$abs_srcdir/expat-lite/libexpat.la")
+ RUN_SUBDIR_CONFIG_NOW(expat, --disable-shared)
+ RUN_SUBDIR_CONFIG_NOW(neon, --with-expat="$abs_srcdir/expat/lib/libexpat.la")
 fi
 
 
@@ -99,9 +100,9 @@
 AC_SUBST(SVN_APR_LIBS)
 
 dnl Expat
-SVN_EXPAT_INCLUDES='-I$(top_srcdir)/expat-lite'
+SVN_EXPAT_INCLUDES='-I$(top_srcdir)/expat/lib'
 AC_SUBST(SVN_EXPAT_INCLUDES)
-SVN_EXPAT_LIBS='$(top_builddir)/expat-lite/libexpat.la'
+SVN_EXPAT_LIBS='$(top_builddir)/expat/lib/libexpat.la'
 AC_SUBST(SVN_EXPAT_LIBS)
 
 dnl Neon
@@ -247,7 +248,6 @@
 
 AC_OUTPUT([Makefile \
            doc/Makefile \
- expat-lite/Makefile \
            subversion/Makefile \
            subversion/libsvn_subr/Makefile \
            subversion/libsvn_delta/Makefile \

The new expat uses libtool, so it's nice and easy to link. We don't
have to create it's makefile either.

Index: subversion/libsvn_delta/xml_parse.c
===================================================================
RCS file: /cvs/subversion/subversion/libsvn_delta/xml_parse.c,v
retrieving revision 1.142
diff -u -r1.142 xml_parse.c
--- subversion/libsvn_delta/xml_parse.c 2001/01/27 02:36:32 1.142
+++ subversion/libsvn_delta/xml_parse.c 2001/02/03 12:31:26
@@ -42,7 +42,6 @@
 #include "svn_base64.h"
 #include "svn_quoprint.h"
 #include "apr_strings.h"
-#include "xmlparse.h"
 #include "delta.h"
 
 
This patch stands, even if the expat change wasn't happening. There's
no need for this file to know the name of the expat header, since it
includes svn_xml.h.

Of course, the actual changes to expat are much larger. :-)
           
        sam th
        sam@uchicago.edu
        http://www.abisource.com/~sam/
        GnuPG Key:
        http://www.abisource.com/~sam/key