diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | lib/Makefile.am | 2 | ||||
| -rwxr-xr-x | lib/gen-classlist.sh.in | 8 | ||||
| -rw-r--r-- | m4/acinclude.m4 | 2 |
5 files changed, 18 insertions, 4 deletions
@@ -1,3 +1,11 @@ +2005-06-14 Tom Tromey <tromey@redhat.com> + + * 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. + 2005-06-14 Mark Wielaard <mark@klomp.org> * javax/swing/JComponent.java (setMinimumSize): Only adjust @@ -2,6 +2,8 @@ New in release 0.16 * 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: diff --git a/lib/Makefile.am b/lib/Makefile.am index b6fc106dd..747c391be 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -98,7 +98,7 @@ $(top_builddir)/java/util/LocaleData.java: $(top_srcdir)/scripts/generate-locale $(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 diff --git a/lib/gen-classlist.sh.in b/lib/gen-classlist.sh.in index ec7af0e3a..4a5cf225c 100755 --- a/lib/gen-classlist.sh.in +++ b/lib/gen-classlist.sh.in @@ -18,8 +18,12 @@ echo "Adding java source files from srcdir '@top_srcdir@'." 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 diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index 8c8baf08d..b8cef4f67 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -304,7 +304,7 @@ AC_DEFUN([CLASSPATH_WITH_CLASSLIB], 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) ]) |