From 7812310c7a1833b96319986bd19e29551e91305d Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@gcc.gnu.org>
Date: Tue, 4 Apr 2006 20:05:01 +0000
Subject: [PATCH] gen-classlist.sh.in: Correct handle generated files.
* lib/gen-classlist.sh.in: Correct handle generated files.
2006-04-04 Mark Wielaard <mark@klomp.org>
* lib/gen-classlist.sh.in: Use classes.tmp, not classes.2
as temporary file name.
2006-04-04 Tom Tromey <tromey@redhat.com>
* lib/split-for-gcj.sh: Updated for multi-field format.
* lib/Makefile.am (CLEANFILES): Added classes.2.
* lib/gen-classlist.sh.in (GCJ): Removed. Create classes.1 and
classes.2 using multiple fields.
From-SVN: r112677
---
libjava/classpath/ChangeLog.gcj | 18 +++++-
libjava/classpath/lib/Makefile.am | 2 +-
libjava/classpath/lib/Makefile.in | 10 ++--
libjava/classpath/lib/gen-classlist.sh.in | 69 +++++++++++++++--------
libjava/classpath/lib/split-for-gcj.sh | 28 ++++-----
5 files changed, 86 insertions(+), 41 deletions(-)
diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index 56ade6d6efcc..735a2a5bf648 100644
--- a/libjava/classpath/ChangeLog.gcj
+++ b/libjava/classpath/ChangeLog.gcj
@@ -1,4 +1,20 @@
-2006-03-29 Tom Tromey <tromey@redhat.com>
+2006-04-04 Tom Tromey <tromey@redhat.com>
+
+ * lib/gen-classlist.sh.in: Correct handle generated files.
+
+2006-04-04 Mark Wielaard <mark@klomp.org>
+
+ * lib/gen-classlist.sh.in: Use classes.tmp, not classes.2
+ as temporary file name.
+
+2006-04-04 Tom Tromey <tromey@redhat.com>
+
+ * lib/split-for-gcj.sh: Updated for multi-field format.
+ * lib/Makefile.am (CLEANFILES): Added classes.2.
+ * lib/gen-classlist.sh.in (GCJ): Removed. Create classes.1 and
+ classes.2 using multiple fields.
+
+2006-04-03 Bernhard Rosenkraenzer <bero@arklinux.org>
PR gcc/26901:
* Makefile.in: Rebuilt.
diff --git a/libjava/classpath/lib/Makefile.am b/libjava/classpath/lib/Makefile.am
index d73be80a09a5..c9e00191eb70 100644
--- a/libjava/classpath/lib/Makefile.am
+++ b/libjava/classpath/lib/Makefile.am
@@ -159,7 +159,7 @@ endif
EXTRA_DIST = standard.omit mkcollections.pl.in Makefile.gcj split-for-gcj.sh
CLEANFILES = compile-classes resources classes \
- glibj.zip classes.1 \
+ glibj.zip classes.1 classes.2 \
$(top_builddir)/java/util/LocaleData.java \
$(JAVA_DEPEND)
diff --git a/libjava/classpath/lib/Makefile.in b/libjava/classpath/lib/Makefile.in
index e9b4f228f21e..de14acf55993 100644
--- a/libjava/classpath/lib/Makefile.in
+++ b/libjava/classpath/lib/Makefile.in
@@ -42,9 +42,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/copy-vmresources.sh.in $(srcdir)/gen-classlist.sh.in \
$(srcdir)/mkcollections.pl.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../../libtool.m4 \
- $(top_srcdir)/m4/acattribute.m4 $(top_srcdir)/m4/accross.m4 \
- $(top_srcdir)/m4/acinclude.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
+ $(top_srcdir)/../../config/lead-dot.m4 \
+ $(top_srcdir)/../../config/no-executables.m4 \
+ $(top_srcdir)/../../libtool.m4 $(top_srcdir)/m4/acattribute.m4 \
+ $(top_srcdir)/m4/accross.m4 $(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/ax_create_stdint_h.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
@@ -276,7 +278,7 @@ JAVAH = $(USER_JAVAH) -jni -classpath .:$(USER_CLASSLIB)
@BUILD_CLASS_FILES_TRUE@noinst_DATA = genclasses compile-classes resources
EXTRA_DIST = standard.omit mkcollections.pl.in Makefile.gcj split-for-gcj.sh
CLEANFILES = compile-classes resources classes \
- glibj.zip classes.1 \
+ glibj.zip classes.1 classes.2 \
$(top_builddir)/java/util/LocaleData.java \
$(JAVA_DEPEND)
diff --git a/libjava/classpath/lib/gen-classlist.sh.in b/libjava/classpath/lib/gen-classlist.sh.in
index 4c3a836eb49a..795d7be87074 100755
--- a/libjava/classpath/lib/gen-classlist.sh.in
+++ b/libjava/classpath/lib/gen-classlist.sh.in
@@ -7,40 +7,62 @@
LC_ALL=C; export LC_ALL
LANG=C; export LANG
-# We use this to decide whether we need to invoke the split script.
-GCJ="@GCJ@"
-
echo "Adding java source files from srcdir '@top_srcdir@'."
-@FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu \
- @top_srcdir@/org \
- @top_srcdir@/external/w3c_dom @top_srcdir@/external/sax \
- @top_srcdir@/external/relaxngDatatype \
- -follow -type f -print | sort -r | grep '\.java$' \
- > ${top_builddir}/lib/classes.1
+# We construct 'classes.1' as a series of lines. Each line
+# has three fields, which are separated by spaces. The first
+# field is the package of this class (separated by "/"s).
+# The second field is the name of the top-level directory for
+# this file, relative to the build directory. E.g., it might
+# look like "../../classpath/vm/reference".
+# The third field is the file name, like "java/lang/Object.java".
+# We do this because it makes splitting for the gcj build much
+# cheaper.
+(cd @top_srcdir@
+ @FIND@ java javax gnu org -follow -name '*.java' -print |
+ sort -r | sed -e 's,/\([^/]*\)$, \1,' |
+ while read pkg file; do
+ echo $pkg @top_srcdir@ $pkg/$file
+ 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; 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)
+done >> ${top_builddir}/lib/classes.1
# Generate files for the VM classes.
: > vm.omit
: > vm.add
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
+ echo "Adding java source files from VM directory $dir"
(cd $dir
for subdir in java javax gnu org com; 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
+ done) | sed -e 's,/\([^/]*\)$, \1,' |
+ while read pkg file; do
+ echo $pkg $dir $pkg/$file >> vm.add
+ echo $pkg/$file >> vm.omit
done
done
# 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 \
- | sort | grep '\.java$' >> ${top_builddir}/lib/classes.1
+ # Currently the only generated files are in gnu and java.
+ (cd ${top_builddir}; @FIND@ gnu java -follow -name '*.java' -print) |
+ sort | sed -e 's,/\([^/]*\)$, \1,' |
+ while read pkg file; do
+ echo $pkg $top_builddir $pkg/$file
+ done >> ${top_builddir}/lib/classes.1
fi
@@ -51,9 +73,10 @@ for dir in $vm_dirlist; do
fi
done
+# FIXME: could be more efficient by constructing a series of greps.
for filexp in `cat tmp.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
+ grep -v ${filexp} < ${top_builddir}/lib/classes.1 > ${top_builddir}/lib/classes.tmp
+ mv ${top_builddir}/lib/classes.tmp ${top_builddir}/lib/classes.1
done
@@ -72,18 +95,20 @@ rm vm.add
rm tmp.omit
new=
-if test -e ${top_builddir}/lib/classes; then
- p=`diff ${top_builddir}/lib/classes ${top_builddir}/lib/classes.1`
+if test -e ${top_builddir}/lib/classes.2; then
+ p=`diff ${top_builddir}/lib/classes.2 ${top_builddir}/lib/classes.1`
if test "$p" != ""; then
new="true"
- cp ${top_builddir}/lib/classes.1 ${top_builddir}/lib/classes
fi
else
new="true"
- cp ${top_builddir}/lib/classes.1 ${top_builddir}/lib/classes
fi
if test "$new" = "true"; then
+ cp ${top_builddir}/lib/classes.1 ${top_builddir}/lib/classes.2
+ # Strip the package part.
+ sed -e 's/^[^ ]* //' -e 's, ,/,' < ${top_builddir}/lib/classes.1 \
+ > ${top_builddir}/lib/classes
echo "JAVA_SRCS = \\" > ${top_builddir}/lib/java.dep
for i in `cat ${top_builddir}/lib/classes` ; do
echo $i "\\" >> ${top_builddir}/lib/java.dep
diff --git a/libjava/classpath/lib/split-for-gcj.sh b/libjava/classpath/lib/split-for-gcj.sh
index f69b79797288..4130d56648a0 100755
--- a/libjava/classpath/lib/split-for-gcj.sh
+++ b/libjava/classpath/lib/split-for-gcj.sh
@@ -22,22 +22,24 @@
# java/awt/BitwiseXORComposite.class: lists/java-awt.stamp
# lists/java-awt.list: /home/aph/gcc/gcc/libjava/classpath/gnu/java/awt/BitwiseXORComposite.java
-# This uses a somewhat hacky procedure for finding the package of a
-# given file.
-
echo "Splitting for gcj"
rm -f Makefile.dtmp > /dev/null 2>&1
test -d lists || mkdir lists
-for dir in java javax gnu org; do
- fgrep /$dir/ classes | while read file; do
- pkg=`echo "$file " | sed -n -e "s,^.*/\($dir/.*\)/[^/]*$,\1,p"`
- list=lists/`echo $pkg | sed -e 's,/,-,g' | cut -f1-3 -d-`
- echo "$file" >> ${list}.list.1
- f2=`echo "$file" | sed -n -e "s,^.*/\($dir/.*\)$,\1,p"`
- f2=`echo "$f2" | sed -e 's/.java$//'`.class
- echo "$f2: ${list}.stamp" >> Makefile.dtmp
- echo "${list}.list: $file" >> Makefile.dtmp
- done
+# Much more efficient to do processing outside the loop...
+# The first expression computes the .class file name.
+# We only want the first three package components, and
+# we want them separated by '-'; this is the remaining expressions.
+sed -e 's, \(.*\)[.]java$, \1.java \1.class,' \
+ -e 's,^\([^/ ]*\)/\([^/ ]*\) ,\1-\2 ,' \
+ -e 's,^\([^/ ]*\)/\([^/ ]*\)/\([^/ ]*\) ,\1-\2-\3 ,' \
+ -e 's,^\([^/ ]*\)/\([^/ ]*\)/\([^/ ]*\)/[^ ]* ,\1-\2-\3 ,' \
+ classes.2 |
+while read pkg dir file f2; do
+ list=lists/$pkg
+ echo "$dir/$file" >> ${list}.list.1
+
+ echo "$f2: ${list}.stamp" >> Makefile.dtmp
+ echo "${list}.list: $dir/$file" >> Makefile.dtmp
done
# Only update a .list file if it changed.
--
GitLab