diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | lib/Makefile.am | 3 | ||||
| -rwxr-xr-x | lib/gen-classlist.sh.in | 2 | ||||
| -rw-r--r-- | scripts/Makefile.am | 2 |
4 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,11 @@ +2004-12-20 Michael Koch <konqueror@gmx.de> + + * lib/Makefile.am: Generate java/util/LocaleData.java in build tree. + * lib/gen-classlist.sh.in: Include classes in java.* packages in build + tree. + * scripts/Makefile.am: Include generate-locale-list.sh in dist + tarball. + 2004-12-19 Robert Schuster <thebohemian@gmx.net> * javax/swing/JComboBox.java: diff --git a/lib/Makefile.am b/lib/Makefile.am index bbfe6d58c..6cdd39e85 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -79,7 +79,8 @@ resources: classes: genclasses genclasses: gen-classlist.sh standard.omit - $(top_srcdir)/scripts/generate-locale-list.sh > $(top_srcdir)/java/util/LocaleData.java + mkdir -p java/util + $(top_srcdir)/scripts/generate-locale-list.sh > java/util/LocaleData.java top_builddir=$(top_builddir) $(SHELL) ./gen-classlist.sh standard $(JAVA_DEPEND): genclasses diff --git a/lib/gen-classlist.sh.in b/lib/gen-classlist.sh.in index 6e3dce09b..20f7bb1b0 100755 --- a/lib/gen-classlist.sh.in +++ b/lib/gen-classlist.sh.in @@ -3,7 +3,7 @@ if test "@top_srcdir@" = "${top_builddir}"; then @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu @top_srcdir@/org @top_srcdir@/vm/reference -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_srcdir@/vm/reference -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}/java @top_srcdir@/vm/reference -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 diff --git a/scripts/Makefile.am b/scripts/Makefile.am index e4667418f..a08616618 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -1,2 +1,2 @@ -EXTRA_DIST = check_jni_methods.sh +EXTRA_DIST = check_jni_methods.sh generate-locale-list.sh |