Hi,
When using builddir != srcdir (as on the autobuilder) things didn't
build successfully. This fixes that.
2006-06-30 Mark Wielaard <[EMAIL PROTECTED]>
* configure.ac: Move standard.omit creation after dirs are created.
Cat standard.omit.in from srcdir. Make exclude regex more explicit.
* lib/Makefile.am (EXTRA_DIST): Add standard.omit.in.
(clean-local): Remove standard.omit.
* lib/gen-classlist.sh.in: Use omit file in build dir.
* lib/standard.omit.in: Make exclude regex more explicit.
Committed,
Mark
Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.167
diff -u -r1.167 configure.ac
--- configure.ac 30 Jun 2006 10:27:32 -0000 1.167
+++ configure.ac 30 Jun 2006 11:31:49 -0000
@@ -746,12 +746,6 @@
AM_CONDITIONAL(ENABLE_LOCAL_SOCKETS, test "x$ENABLE_LOCAL_SOCKETS" = "xyes")
-# Create standard.omit based on decisions we just made.
-cp lib/standard.omit.in lib/standard.omit
-if test x$use_escher != xtrue; then
- echo gnu/java/awt/peer/x >> lib/standard.omit
-fi
-
dnl -----------------------------------------------------------
dnl output files
dnl -----------------------------------------------------------
@@ -814,3 +808,10 @@
AC_CONFIG_COMMANDS([gen-classlist],[chmod 755 lib/gen-classlist.sh])
AC_CONFIG_COMMANDS([copy-vmresources],[chmod 755 lib/copy-vmresources.sh])
AC_OUTPUT
+
+# Create standard.omit based on decisions we just made.
+cat ${srcdir}/lib/standard.omit.in > lib/standard.omit
+if test x$use_escher != xtrue; then
+ echo gnu/java/awt/peer/x/.*java$ >> lib/standard.omit
+fi
+
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.121
diff -u -r1.121 Makefile.am
--- lib/Makefile.am 30 Jun 2006 10:27:33 -0000 1.121
+++ lib/Makefile.am 30 Jun 2006 11:31:51 -0000
@@ -165,7 +165,7 @@
touch compile-classes
endif
-EXTRA_DIST = standard.omit mkcollections.pl.in Makefile.gcj split-for-gcj.sh
+EXTRA_DIST = standard.omit.in mkcollections.pl.in Makefile.gcj split-for-gcj.sh
CLEANFILES = compile-classes resources classes \
glibj.zip classes.1 classes.2 \
$(top_builddir)/gnu/java/locale/LocaleData.java \
@@ -181,6 +181,7 @@
-rm -rf META-INF
-rm -rf lists
-rm -f Makefile.deps
+ -rm -f standard.omit
dist-hook:
mkdir -p $(distdir)
Index: lib/gen-classlist.sh.in
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/gen-classlist.sh.in,v
retrieving revision 1.37
diff -u -r1.37 gen-classlist.sh.in
--- lib/gen-classlist.sh.in 9 Jun 2006 21:30:44 -0000 1.37
+++ lib/gen-classlist.sh.in 30 Jun 2006 11:31:51 -0000
@@ -66,7 +66,7 @@
fi
-cat @top_srcdir@/lib/$1.omit vm.omit > tmp.omit
+cat $1.omit vm.omit > tmp.omit
for dir in $vm_dirlist; do
if test -f $dir/$1.omit; then
cat $dir/$1.omit >> tmp.omit
Index: lib/standard.omit.in
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/standard.omit.in,v
retrieving revision 1.1
diff -u -r1.1 standard.omit.in
--- lib/standard.omit.in 29 Jun 2006 15:15:55 -0000 1.1
+++ lib/standard.omit.in 30 Jun 2006 11:31:51 -0000
@@ -1 +1 @@
-../gnu/test/.*$
+gnu/test/.*java$
