[cp-patches] FYI: Remove external directory

[Mark Wielaard]

Hi,

As discussed on the main list this removes the external directory and
adds a note about using GNU JAXP with GNU Classpath.

2004-09-03  Mark Wielaard  <address@hidden>

        * Makefile.am (SUBDIRS): Remove external.
        * configure.ac (AC_CONFIG_FILES): Remove external/Makefile.
        * doc/api/Makefile.am: Don't refer to external directory
        * lib/Makefile.am: Likewise.
        * lib/gen-classlist.sh.in: Likewise.
        * external/*: Removed.
        * NEWS: Mention GNU JAXP.

Committed.

Mark

Index: Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/Makefile.am,v
retrieving revision 1.34
diff -u -r1.34 Makefile.am
--- Makefile.am 1 Aug 2004 21:31:11 -0000       1.34
+++ Makefile.am 3 Sep 2004 16:16:21 -0000
@@ -1,7 +1,7 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
 # lib first, to compile .class files before native code, last examples
-SUBDIRS = lib doc external include native resource examples
+SUBDIRS = lib doc include native resource examples
 
 native: lib
 
Index: NEWS
===================================================================
RCS file: /cvsroot/classpath/classpath/NEWS,v
retrieving revision 1.51
diff -u -r1.51 NEWS
--- NEWS        31 Aug 2004 22:17:29 -0000      1.51
+++ NEWS        3 Sep 2004 16:16:21 -0000
@@ -29,6 +29,10 @@
 * javax.swing.JSpinner implemented.
 * Extensive documentation update for java.util collection classes.
 * java.awt.geom completed. Area, Arc2D, Ellipse2D and Line2D implemented.
+* GNU JAXP is no longer included with GNU Classpath. Runtime, compiler and
+  tool integrators are encouraged to directly integrate GNU JAXP.
+  This release has been tested against GNU JAXP 1.1.
+  http://www.gnu.org/software/classpathx/jaxp/jaxp.html
 
 Runtime interface Changes:
 
Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.47
diff -u -r1.47 configure.ac
--- configure.ac        31 Aug 2004 21:06:48 -0000      1.47
+++ configure.ac        3 Sep 2004 16:16:21 -0000
@@ -345,7 +345,6 @@
 AC_CONFIG_FILES([Makefile
 doc/Makefile
 doc/api/Makefile
-external/Makefile
 gnu/classpath/Configuration.java
 include/Makefile
 native/Makefile
Index: doc/api/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/doc/api/Makefile.am,v
retrieving revision 1.11
diff -u -r1.11 Makefile.am
--- doc/api/Makefile.am 2 Aug 2004 14:48:52 -0000       1.11
+++ doc/api/Makefile.am 3 Sep 2004 16:16:21 -0000
@@ -31,13 +31,11 @@
 html: create_html
 
 core := $(shell cd $(top_srcdir) && $(FIND) java javax -type d ! -name CVS ! 
-name doc-files -print | tr '/' '.' | grep -v "java.awt.dnd.peer" | grep -v 
"java.awt.peer")
-jaxp := $(shell cd $(top_srcdir)/external/jaxp/source && $(FIND) javax org 
-type d ! -name CVS -print | tr '/' '.' | grep -v "org.w3c.dom.")
 
 # Just generate api doc for the core packages.
 # Adding the external ones takes a lot more time and we should reference
 # them anyway since we will place out own copyright notive on the generated
 # pages.
-# packages = $(core) $(jaxp)
 packages = $(core)
 #| grep -v "^java\$" )
 date := $(shell $(DATE))
@@ -51,7 +49,7 @@
 #create_xml:
 #      -$(MKDIR) xml > /dev/null 2>&1
 #      $(GJDOC) -sourcepath \
-#              
"$(top_srcdir):$(top_srcdir)/external/jaxp/source:$(top_srcdir)/vm/reference" \
+#              "$(top_srcdir):$(top_srcdir)/vm/reference" \
 #              -doclet gnu.classpath.tools.doclets.xmldoclet.Driver \
 #              -d xml $(packages) 
 #      -touch create_xml
@@ -72,24 +70,4 @@
        $(GJDOC) -sourcepath "$(top_srcdir):$(top_srcdir)/vm/reference" \
        -d html -bottomnote "$(srcdir)/classpath-copyright.xml" \
        $(packages)
-
-# Including the external ones (jaxp) this would be:
-# create_html:
-#      -$(MKDIR) html > /dev/null 2>&1
-#      $(GJDOC) -sourcepath \
-#      
"$(top_srcdir):$(top_srcdir)/vm/reference:$(top_srcdir)/external/jaxp/source" \
-#      -d html -bottomnote "$(srcdir)/classpath-copyright.xml" \
-#      $(packages)
-
-#      -$(CP) -Ru $(srcdir)/xslt/common html
-#      $(XSLTPROC) \
-#              --novalid \
-#              --param verbose "1" \
-#              --param now "'$(date)'" \
-#              --param copyrightfile "'$(srcdir)/classpath-copyright.xml'" \
-#              --param windowtitle "'GNU Classpath CVS'" \
-#              --param targetdir "'html'" \
-#              "$(srcdir)/xslt/gjdocxml2html.xsl" \
-#              "xml/index.xml"
        -touch create_html
-
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.66
diff -u -r1.66 Makefile.am
--- lib/Makefile.am     19 Aug 2004 05:57:11 -0000      1.66
+++ lib/Makefile.am     3 Sep 2004 16:16:21 -0000
@@ -18,10 +18,10 @@
 
 # handling source to bytecode compiler programs like gcj, jikes  and kjc
 if FOUND_GCJ
-JAVAC = $(GCJ) --bootclasspath '' --classpath 
$(top_srcdir):$(top_srcdir)/external/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB)
 -C -d . @classes
+JAVAC = $(GCJ) --bootclasspath '' --classpath 
$(top_srcdir):$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -C -d . @classes
 else
 if FOUND_JIKES
-JAVAC = $(JIKES) +F -bootclasspath '' -extdirs '' -sourcepath '' --classpath 
$(top_srcdir):$(top_srcdir)/external/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB)
 -d . @classes
+JAVAC = $(JIKES) +F -bootclasspath '' -extdirs '' -sourcepath '' --classpath 
$(top_srcdir):$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -d . @classes
 else
 if FOUND_KJC
 JAVAC = $(KJC) -classpath .:$(USER_CLASSLIB) -d . @classes
Index: lib/gen-classlist.sh.in
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/gen-classlist.sh.in,v
retrieving revision 1.13
diff -u -r1.13 gen-classlist.sh.in
--- lib/gen-classlist.sh.in     14 Aug 2004 18:21:35 -0000      1.13
+++ lib/gen-classlist.sh.in     3 Sep 2004 16:16:21 -0000
@@ -1,9 +1,9 @@
 #! @SH@
 # @configure_input@
 if test "@top_srcdir@" = "${top_builddir}"; then
-  @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu 
@top_srcdir@/external/jaxp/source @top_srcdir@/org ${top_builddir}/vm/current 
-follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1
+  @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu 
@top_srcdir@/org ${top_builddir}/vm/current -follow -type f -print | grep 
'\.java$' > ${top_builddir}/lib/classes.1
 else
-  @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu 
@top_srcdir@/external/jaxp/source @top_srcdir@/org ${top_builddir}/gnu 
${top_builddir}/vm/current -follow -type f -print | grep '\.java$' > 
${top_builddir}/lib/classes.1
+  @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu 
@top_srcdir@/org ${top_builddir}/gnu ${top_builddir}/vm/current -follow -type f 
-print | grep '\.java$' > ${top_builddir}/lib/classes.1
 fi
 
 for filexp in `cat @top_srcdir@/lib/$1.omit` ; do { grep -v ${filexp} < 
${top_builddir}/lib/classes.1 > ${top_builddir}/lib/classes.2 ; mv 
${top_builddir}/lib/classes.2 ${top_builddir}/lib/classes.1 ; } ; done

signature.asc
Description: This is a digitally signed message part