[cp-patches] Making gen-classlist.sh more robust

[Mark Wielaard]

Hi,

While testing the distribution I found that in some cases
lib/gen-classlist.sh listed generated files twice. The following patch
makes gen-classlist a little more robust and echo where it gets its
input from.

2005-01-02  Mark Wielaard  <address@hidden>

        * lib/gen-classlist.sh.in: Use test -ef and echo top_srcdir and
        top_builddir locations.

Committed,

Mark


Index: lib/gen-classlist.sh.in
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/gen-classlist.sh.in,v
retrieving revision 1.19
diff -u -r1.19 gen-classlist.sh.in
--- lib/gen-classlist.sh.in     23 Dec 2004 22:38:45 -0000      1.19
+++ lib/gen-classlist.sh.in     2 Jan 2005 15:05:20 -0000
@@ -1,9 +1,17 @@
 #! @SH@
 # @configure_input@
-if test "@top_srcdir@" = "${top_builddir}"; then
-  @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu 
@top_srcdir@/org @top_srcdir@/vm/reference @top_srcdir@/external/w3c_dom 
@top_srcdir@/external/sax -follow -type f -print | grep '\.java$' > 
${top_builddir}/lib/classes.1
-else
-  @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu 
@top_srcdir@/org ${top_builddir}/gnu ${top_builddir}/java 
@top_srcdir@/vm/reference @top_srcdir@/external/w3c_dom 
@top_srcdir@/external/sax -follow -type f -print | grep '\.java$' > 
${top_builddir}/lib/classes.1
+
+echo "Adding java source files from srcdir '@top_srcdir@'."
address@hidden@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu \
+       @top_srcdir@/org @top_srcdir@/vm/reference \
+       @top_srcdir@/external/w3c_dom @top_srcdir@/external/sax \
+       -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1
+
+# Only include generated files once.
+if test ! "${top_builddir}" -ef "@top_srcdir@"; then
+  echo "Adding generated files in builddir '${top_builddir}'."
+  @FIND@ ${top_builddir}/gnu ${top_builddir}/java -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