I'm committing the attached patch, which removes the option of gcj, jikes or kjc compilation from the generics branch. This stops it picking a compiler that won't be able to handle the branch.
Changelog:
2005-11-02 Andrew John Hughes <[EMAIL PROTECTED]>
* examples/Makefile.am:
Comment out JIKES and GCJ conditionals.
* lib/Makefile.am:
Comment out JIKES, KJC and GCJ conditionals.
* m4/acinclude.m4:
Comment out selection of GCJ, Jikes and KJC as compilers for
the branch.
--
Andrew :-)
Please avoid sending me Microsoft Office (e.g. Word, PowerPoint) attachments.
See http://www.fsf.org/philosophy/no-word-attachments.html
If you use Microsoft Office, support movement towards the end of vendor lock-in:
http://opendocumentfellowship.org/petition/
"Value your freedom, or you will lose it, teaches history.
`Don't bother us with politics' respond those who don't want to learn."
-- Richard Stallman
Escape the Java Trap with GNU Classpath!
http://www.gnu.org/philosophy/java-trap.html
public class gcj extends Freedom implements Java { ... }
Index: examples/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/examples/Makefile.am,v
retrieving revision 1.1.2.6
diff -u -3 -p -u -r1.1.2.6 Makefile.am
--- examples/Makefile.am 10 Sep 2005 15:31:35 -0000 1.1.2.6
+++ examples/Makefile.am 2 Nov 2005 22:01:21 -0000
@@ -1,12 +1,12 @@
## Input file for automake to generate the Makefile.in used by configure
# Setup the compiler to use the GNU Classpath library we just build
-if FOUND_GCJ
-JCOMPILER = $(GCJ) --bootclasspath '$(top_builddir)/lib' --classpath . -C
-else
-if FOUND_JIKES
-JCOMPILER = $(JIKES) -bootclasspath '' -extdirs '' -sourcepath '' --classpath
$(top_builddir)/lib:.
-else
+#if FOUND_GCJ
+#JCOMPILER = $(GCJ) --bootclasspath '$(top_builddir)/lib' --classpath . -C
+#else
+#if FOUND_JIKES
+#JCOMPILER = $(JIKES) -bootclasspath '' -extdirs '' -sourcepath '' --classpath
$(top_builddir)/lib:.
+#else
if FOUND_GCJX
JCOMPILER = $(GCJX) -bootclasspath '' -sourcepath '' -classpath
$(top_builddir)/lib:.
else
@@ -15,8 +15,8 @@ JCOMPILER = $(ECJ) -1.5 -bootclasspath '
else
error dunno how to setup the JCOMPILER and compile
endif
-endif
-endif
+#endif
+#endif
endif
# All our example java source files
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.63.2.17
diff -u -3 -p -u -r1.63.2.17 Makefile.am
--- lib/Makefile.am 2 Nov 2005 20:30:10 -0000 1.63.2.17
+++ lib/Makefile.am 2 Nov 2005 22:01:22 -0000
@@ -15,29 +15,25 @@ compile_classpath = $(vm_classes):$(top_
# handling source to bytecode compiler programs like gcj, jikes and kjc
if FOUND_ECJ
JAVAC = $(ECJ) -1.5
-warn:-deprecation,serial,typeHiding,unchecked,unused,varargsCast
-proceedOnError -bootclasspath '' -classpath $(compile_classpath) -d . @classes
-else
-if FOUND_GCJ
+#else
+#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) +Pno-shadow +Pno-switchcheck +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.
-JAVAC = $(KJC) -classpath .:$(USER_CLASSLIB) -d . @classes
+#JAVAC = exit 1
+#else
+#if FOUND_JIKES
+#JAVAC = $(JIKES) +Pno-shadow +Pno-switchcheck +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.
+#JAVAC = $(KJC) -classpath .:$(USER_CLASSLIB) -d . @classes
else
if FOUND_GCJX
JAVAC = $(GCJX) -encoding UTF-8 -classpath .:$(USER_CLASSLIB) -d . @classes
-else
-if FOUND_ECJ
-JAVAC = $(ECJ) -source 1.4 -encoding UTF-8 -warn:none -proceedOnError
-bootclasspath '' -classpath $(compile_classpath) -d . @classes
-endif # FOUND_ECJ
endif # FOUND_GCJX
-endif # FOUND_KJC
-endif # FOUND_GCJ
-endif # FOUND_JIKES
+#endif # FOUND_KJC
+#endif # FOUND_GCJ
+#endif # FOUND_JIKES
endif # FOUND_ECJ
JAVAH = $(USER_JAVAH) -jni -classpath .:$(USER_CLASSLIB)
@@ -123,21 +119,21 @@ endif # REGEN_PARSER
$(JAVA_DEPEND): genclasses
-if FOUND_GCJ
+#if FOUND_GCJ
## When building with gcj, we do a recursive make. We split this rule
## out specially, rather than simply defining JAVAC, so that GNU make
## will see the recursive make invocation and still allow parallel
## builds.
-compile-classes: classes $(JAVA_SRCS) Makefile
- $(MAKE) -f $(srcdir)/Makefile.gcj \
- GCJ='$(GCJ)' \
- compile_classpath='$(top_builddir):$(compile_classpath)' \
- top_srcdir=$(top_srcdir)
-else
+#compile-classes: classes $(JAVA_SRCS) Makefile
+# $(MAKE) -f $(srcdir)/Makefile.gcj \
+# GCJ='$(GCJ)' \
+# compile_classpath='$(top_builddir):$(compile_classpath)' \
+# top_srcdir=$(top_srcdir)
+#else
compile-classes: classes $(JAVA_SRCS) Makefile
$(JAVAC)
touch compile-classes
-endif
+#endif
EXTRA_DIST = standard.omit mkcollections.pl.in Makefile.gcj split-for-gcj.sh
CLEANFILES = compile-classes resources classes \
Index: m4/acinclude.m4
===================================================================
RCS file: /cvsroot/classpath/classpath/m4/acinclude.m4,v
retrieving revision 1.1.2.4
diff -u -3 -p -u -r1.1.2.4 acinclude.m4
--- m4/acinclude.m4 20 Sep 2005 18:46:36 -0000 1.1.2.4
+++ m4/acinclude.m4 2 Nov 2005 22:01:22 -0000
@@ -5,27 +5,28 @@ AC_DEFUN([CLASSPATH_FIND_JAVAC],
[
user_specified_javac=
- CLASSPATH_WITH_GCJ
- CLASSPATH_WITH_JIKES
- CLASSPATH_WITH_KJC
+dnl CLASSPATH_WITH_GCJ
+dnl CLASSPATH_WITH_JIKES
+dnl CLASSPATH_WITH_KJC
CLASSPATH_WITH_GCJX
CLASSPATH_WITH_ECJ
if test "x${user_specified_javac}" = x; then
- AM_CONDITIONAL(FOUND_GCJ, test "x${GCJ}" != x)
- AM_CONDITIONAL(FOUND_JIKES, test "x${JIKES}" != x)
+dnl AM_CONDITIONAL(FOUND_GCJ, test "x${GCJ}" != x)
+dnl AM_CONDITIONAL(FOUND_JIKES, test "x${JIKES}" != x)
AM_CONDITIONAL(FOUND_ECJ, test "x${ECJ}" != x)
else
- AM_CONDITIONAL(FOUND_GCJ, test "x${user_specified_javac}" = xgcj)
- AM_CONDITIONAL(FOUND_JIKES, test "x${user_specified_javac}" = xjikes)
+dnl AM_CONDITIONAL(FOUND_GCJ, test "x${user_specified_javac}" = xgcj)
+dnl AM_CONDITIONAL(FOUND_JIKES, test "x${user_specified_javac}" = xjikes)
AM_CONDITIONAL(FOUND_ECJ, test "x${user_specified_javac}" = xecj)
fi
- AM_CONDITIONAL(FOUND_KJC, test "x${user_specified_javac}" = xkjc)
+dnl AM_CONDITIONAL(FOUND_KJC, test "x${user_specified_javac}" = xkjc)
AM_CONDITIONAL(FOUND_GCJX, test "x${user_specified_javac}" = xgcjx)
- if test "x${GCJ}" = x && test "x${JIKES}" = x && test
"x${user_specified_javac}" != xkjc && test "x${user_specified_javac}" != xgcjx;
then
+dnl if test "x${GCJ}" = x && test "x${JIKES}" = x && test
"x${user_specified_javac}" != xkjc && test "x${user_specified_javac}" != xgcjx;
then
+ if test "x${ECJ}" = x && test "x${user_specified_javac}" != xecj && test
"x${user_specified_javac}" != xgcjx; then
# FIXME: use autoconf error function
- echo "configure: cannot find javac, try --with-gcj, --with-jikes,
--with-kjc, or --with-gcjx" 1>&2
+ echo "configure: cannot find javac, try -with-ecj or --with-gcjx" 1>&2
exit 1
fi
])
signature.asc
Description: Digital signature
_______________________________________________ Classpath-patches mailing list [email protected] http://lists.gnu.org/mailman/listinfo/classpath-patches
