Re: [cp-patches] Patch: FYI: new --with-vm-classes option

[Tom Tromey]

Mark> This breaks the build for me (and others on irc). Did you actually try
Mark> to do a make distclean && ./autogen.sh && ./configure && make?

No, I forgot to try it outside my merge tree.
Sorry about that.

Mark> If you fix this can you please add documentation for these new configure
Mark> options to the INSTALL file and add a little note to the NEWS file about
Mark> it please.

Here's the fix.  I didn't update INSTALL since I don't see when these
would be useful for a typical Classpath user.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>

        * lib/gen-classlist.sh.in (vm_dirlist): Prune non-existing
        directories.
        * lib/Makefile.am (genclasses): Pass top_srcdir to
        gen-classlist.sh.
        * m4/acinclude.m4: Quote default value of vm_classes.

Index: NEWS
===================================================================
RCS file: /cvsroot/classpath/classpath/NEWS,v
retrieving revision 1.80
diff -u -r1.80 NEWS
--- NEWS 8 Jun 2005 21:19:25 -0000 1.80
+++ NEWS 14 Jun 2005 23:23:11 -0000
@@ -2,6 +2,8 @@
 
 * GdkGraphics2D has been updated to use Cairo 0.5.0 APIs.
 * Better GTK scrollbar peer implementation requiring GTK 2.6 or higher.
+* New --with-vm-classes configure option, and new 'build' setting
+  for --with-glibj
 
 Runtime interface changes:
 
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.88
diff -u -r1.88 Makefile.am
--- lib/Makefile.am 14 Jun 2005 21:22:36 -0000 1.88
+++ lib/Makefile.am 14 Jun 2005 23:23:12 -0000
@@ -98,7 +98,7 @@
        $(top_srcdir)/scripts/generate-locale-list.sh > 
$(top_builddir)/java/util/LocaleData.java
 
 genclasses: gen-classlist.sh standard.omit 
$(top_builddir)/java/util/LocaleData.java gen-xpath-parser
-       top_builddir=$(top_builddir) $(SHELL) ./gen-classlist.sh standard
+       top_builddir=$(top_builddir) top_srcdir=$(top_srcdir) $(SHELL) 
./gen-classlist.sh standard
 
 # Only rebuild parsers when explicitly asked to.
 if REGEN_PARSERS
Index: lib/gen-classlist.sh.in
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/gen-classlist.sh.in,v
retrieving revision 1.24
diff -u -r1.24 gen-classlist.sh.in
--- lib/gen-classlist.sh.in 14 Jun 2005 21:22:36 -0000 1.24
+++ lib/gen-classlist.sh.in 14 Jun 2005 23:23:12 -0000
@@ -18,8 +18,12 @@
 vm_dirlist=`echo "@vm_classes@" | sed -e 's/:/ /g'`
 echo "Adding java source files from VM directory $vm_dirlist"
 for dir in $vm_dirlist; do
-   (cd $dir && @FIND@ java javax gnu org -name '*.java' -print |
-    sed -e 's,^[.]/,,') |
+   (cd $dir
+   for subdir in java javax gnu org; do
+      if test -d $subdir; then
+        @FIND@ $subdir -name '*.java' -print
+      fi
+   done) |
    while read f; do
       echo $dir/$f >> vm.add
       echo $f >> vm.omit
Index: m4/acinclude.m4
===================================================================
RCS file: /cvsroot/classpath/classpath/m4/acinclude.m4,v
retrieving revision 1.2
diff -u -r1.2 acinclude.m4
--- m4/acinclude.m4 14 Jun 2005 21:22:36 -0000 1.2
+++ m4/acinclude.m4 14 Jun 2005 23:23:12 -0000
@@ -304,7 +304,7 @@
 
   AC_ARG_WITH([vm-classes],
              [AS_HELP_STRING(--with-vm-classes,specify path to VM override 
source files)], [vm_classes="$with_vm_classes"],
-             [vm_classes="${top_srcdir}/vm/reference"])
+             [vm_classes='${top_srcdir}/vm/reference'])
   AC_SUBST(vm_classes)
 ])