[cp-patches] [generics] Patch: FYI: really build jsr166 code with make

Tom Tromey tromey at redhat.com
Sat Jun 17 15:38:48 UTC 2006


I'm checking this in on the generics branch.

This fixes a build bug.  I didn't notice that we were only look for
files in the 'org' package from external when I added my jsr166 build
changes, and I forgot to verify that the new classes are actually
compiled.  Oops.

Tom

Index: ChangeLog
from  Tom Tromey  <tromey at redhat.com>

	* lib/gen-classlist.sh.in: Search all top-level directories, not
	just 'org', in external.

Index: lib/gen-classlist.sh.in
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/gen-classlist.sh.in,v
retrieving revision 1.12.2.15
diff -u -r1.12.2.15 gen-classlist.sh.in
--- lib/gen-classlist.sh.in 16 Jun 2006 18:04:09 -0000 1.12.2.15
+++ lib/gen-classlist.sh.in 17 Jun 2006 15:40:53 -0000
@@ -25,19 +25,22 @@
  done) > ${top_builddir}/lib/classes.1
 
 # The same, but for the external code.
-# Right now all external code is in org/.
 for dir in \
    @top_srcdir@/external/w3c_dom \
    @top_srcdir@/external/sax \
    @top_srcdir@/external/relaxngDatatype \
    @top_srcdir@/external/jsr166 \
    ; do
-  (cd $dir
-  @FIND@ org -follow -name '*.java' -print |
-  sort -r | sed -e 's,/\([^/]*\)$, \1,' |
-  while read pkg file; do
-     echo $pkg $dir $pkg/$file
-  done)
+   (cd $dir
+   for subdir in java javax gnu org sun; do
+      if test -d $subdir; then
+	 @FIND@ $subdir -follow -name '*.java' -print |
+	 sort -r | sed -e 's,/\([^/]*\)$, \1,' |
+	 while read pkg file; do
+	    echo $pkg $dir $pkg/$file
+	 done
+      fi
+   done)
 done >> ${top_builddir}/lib/classes.1
 
 # Generate files for the VM classes.



More information about the Classpath-patches mailing list