git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

010-05-04 Andrew Haley <aph@redhat.com> 

* lib/gen-classlist.sh.in: Use absolute pathnames for all the
	directory names in the output file.

From-SVN: r159067
This commit is contained in:
Andrew Haley 2010-05-05 13:05:21 +00:00 committed by Andrew Haley
parent e972a1d38a
commit 23cc973ca9
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/classpath/ChangeLog
View File

@ -1,3 +1,8 @@
2010-05-04 Andrew Haley <aph@redhat.com>
* lib/gen-classlist.sh.in: Use absolute pathnames for all the
directory names in the output file.
2010-04-27 Andrew Haley <aph@redhat.com> 2010-04-27 Andrew Haley <aph@redhat.com>
* java/util/concurrent/CopyOnWriteArrayList.java: Fix for empty * java/util/concurrent/CopyOnWriteArrayList.java: Fix for empty

24
libjava/classpath/lib/gen-classlist.sh.in
View File

@ -7,13 +7,17 @@
LC_ALL=C; export LC_ALL LC_ALL=C; export LC_ALL
LANG=C; export LANG LANG=C; export LANG
echo "Adding java source files from srcdir '@top_srcdir@'." abs_top_builddir=`cd "${top_builddir}"; pwd`
abs_top_srcdir=`cd "@top_srcdir@"; pwd`
echo "Adding java source files from srcdir '${abs_top_srcdir}'."
# We construct 'classes.1' as a series of lines. Each line # We construct 'classes.1' as a series of lines. Each line
# has three fields, which are separated by spaces. The first # has three fields, which are separated by spaces. The first
# field is the package of this class (separated by "/"s). # field is the package of this class (separated by "/"s).
# The second field is the name of the top-level directory for # The second field is the absolute pathname of the top-level directory
# this file, relative to the build directory. E.g., it might # for this file. E.g., it might look like
# look like "../../classpath/vm/reference". # "/home/jezebel/classpath/vm/reference".
# The third field is the file name, like "java/lang/Object.java". # The third field is the file name, like "java/lang/Object.java".
# We do this because it makes splitting for the gcj build much # We do this because it makes splitting for the gcj build much
# cheaper. # cheaper.
@ -21,15 +25,15 @@ echo "Adding java source files from srcdir '@top_srcdir@'."
@FIND@ java javax gnu org sun -follow -name '*.java' -print | @FIND@ java javax gnu org sun -follow -name '*.java' -print |
sort -r | sed -e 's,/\([^/]*\)$, \1,' | sort -r | sed -e 's,/\([^/]*\)$, \1,' |
while read pkg file; do while read pkg file; do
echo $pkg @top_srcdir@ $pkg/$file echo $pkg ${abs_top_srcdir} $pkg/$file
done) > ${top_builddir}/lib/classes.1 done) > ${top_builddir}/lib/classes.1
# The same, but for the external code. # The same, but for the external code.
for dir in \ for dir in \
@top_srcdir@/external/w3c_dom \ ${abs_top_srcdir}/external/w3c_dom \
@top_srcdir@/external/sax \ ${abs_top_srcdir}/external/sax \
@top_srcdir@/external/relaxngDatatype \ ${abs_top_srcdir}/external/relaxngDatatype \
@top_srcdir@/external/jsr166 \ ${abs_top_srcdir}/external/jsr166 \
; do ; do
(cd $dir (cd $dir
for subdir in java javax gnu org sun; do for subdir in java javax gnu org sun; do
@ -62,8 +66,6 @@ for dir in $vm_dirlist; do
done done
# Only include generated files once. # Only include generated files once.
abs_top_builddir=`cd "${top_builddir}"; pwd`
abs_top_srcdir=`cd "@top_srcdir@"; pwd`
if test "$abs_top_builddir" != "$abs_top_srcdir"; then if test "$abs_top_builddir" != "$abs_top_srcdir"; then
echo "Adding generated files in builddir '${top_builddir}'." echo "Adding generated files in builddir '${top_builddir}'."
# Currently the only generated files are in gnu.*. # Currently the only generated files are in gnu.*.