It seems like I broke the build yesterday. This should fix it. However, it seems that building with Escher lets jikes crash:
jikes: symbol.h:1110: bool TypeSymbol::IsInner() const: Assertion `(!
IsLocal() && ! Anonymous()) || (IsNested() && ! ACC_STATIC())' failed.
It seems to work with ecj, so I blame jikes for this.
2006-06-30 Roman Kennke <[EMAIL PROTECTED]>
* lib/Makefile.am: Added Escher dir/jar to classpath when
requested.
* configure.ac: Moved handling of standard.omit to a place
where it actually gets executed.
/Roman
--
“Improvement makes straight roads, but the crooked roads, without
Improvement, are roads of Genius.” - William Blake
Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.166
diff -u -1 -2 -r1.166 configure.ac
--- configure.ac 29 Jun 2006 15:15:54 -0000 1.166
+++ configure.ac 30 Jun 2006 10:26:42 -0000
@@ -737,24 +737,30 @@
esac],
[])
if test "x$ENABLE_LOCAL_SOCKETS" = "xyes"
then
AC_CHECK_HEADER([sys/un.h])
AC_CHECK_FUNCS([read write bind listen accept shutdown], [],
AC_MSG_ERROR([networking support not available]))
AC_DEFINE(ENABLE_LOCAL_SOCKETS, [1], [Define to enable support for local sockets.])
fi
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 -----------------------------------------------------------
AC_CONFIG_FILES([Makefile
doc/Makefile
doc/api/Makefile
external/Makefile
external/sax/Makefile
external/w3c_dom/Makefile
external/relaxngDatatype/Makefile
gnu/classpath/Configuration.java
gnu/java/security/Configuration.java
@@ -799,18 +805,12 @@
tools/gserialver])
AC_CONFIG_COMMANDS([gappletviewer],[chmod 755 tools/gappletviewer])
AC_CONFIG_COMMANDS([gjarsigner],[chmod 755 tools/gjarsigner])
AC_CONFIG_COMMANDS([gkeytool],[chmod 755 tools/gkeytool])
AC_CONFIG_COMMANDS([gjar],[chmod 755 tools/gjar])
AC_CONFIG_COMMANDS([gnative2ascii],[chmod 755 tools/gnative2ascii])
AC_CONFIG_COMMANDS([gserialver],[chmod 755 tools/gserialver])
fi
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.
-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
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.120
diff -u -1 -2 -r1.120 Makefile.am
--- lib/Makefile.am 25 Jun 2006 22:45:27 -0000 1.120
+++ lib/Makefile.am 30 Jun 2006 10:26:42 -0000
@@ -1,25 +1,25 @@
JAVA_DEPEND = java.dep
## silently try to include these, if it fails gnu make
## will remake these 'makefiles' with the rules given in
## this file and restart the make process again
sinclude $(JAVA_DEPEND)
propertydirs := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java javax org META-INF -type d ! -name CVS -print)
propertyfiles := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java javax org -name \*\.properties -print)
metafiles := $(shell cd $(top_srcdir)/resource && $(FIND) META-INF -name CVS -prune -o -type f -print)
iconfiles := $(shell cd $(top_srcdir) && $(FIND) gnu/javax/swing/plaf/gtk/icons -name *.png -type f -print)
-compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/relaxngDatatype:.:$(USER_CLASSLIB)
+compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/relaxngDatatype:.:$(USER_CLASSLIB):$(PATH_TO_ESCHER)
# handling source to bytecode compiler programs like gcj, jikes and kjc
if FOUND_GCJ
## This should never be used when gcj is the compiler.
## See the compile-classes target.
JAVAC = exit 1
else
if FOUND_JIKES
JAVAC = $(JIKES) $(JIKESWARNINGS) +F $(JIKESENCODING) -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(compile_classpath) -d . @classes
else
if FOUND_KJC
## FIXME: from what I can tell, kjc does not support a -encoding option.
signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil
