Hi!
This patch adds support for Sun's javac. This patch is already
commited.
- twisti
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.8991
diff -u -3 -p -r1.8991 ChangeLog
--- ChangeLog 15 Dec 2006 21:48:39 -0000 1.8991
+++ ChangeLog 15 Dec 2006 22:05:37 -0000
@@ -1,3 +1,14 @@
+2006-12-15 Christian Thalinger <[EMAIL PROTECTED]>
+
+ * m4/acinclude.m4 (CLASSPATH_FIND_JAVAC): Added support for Sun's
+ javac.
+ (CLASSPATH_WITH_JAVAC): Added.
+ (CLASSPATH_CHECK_JAVAC): Likewise.
+ * lib/Makefile.am (JAVAC): Renamed to JCOMPILER.
+ (FOUND_JAVAC): Added support for Sun's javac.
+ * examples/Makefile.am: Likewise.
+ * tools/Makefile.am: Likewise.
+
2006-12-15 Francis Kung <[EMAIL PROTECTED]>
* gnu/java/awt/peer/gtk/CairoGraphics2D.java:
Index: m4/acinclude.m4
===================================================================
RCS file: /cvsroot/classpath/classpath/m4/acinclude.m4,v
retrieving revision 1.14
diff -u -3 -p -r1.14 acinclude.m4
--- m4/acinclude.m4 13 Dec 2006 19:25:28 -0000 1.14
+++ m4/acinclude.m4 15 Dec 2006 22:05:37 -0000
@@ -9,15 +9,18 @@ dnl CLASSPATH_WITH_GCJ
dnl CLASSPATH_WITH_JIKES
dnl CLASSPATH_WITH_KJC
CLASSPATH_WITH_ECJ
+ CLASSPATH_WITH_JAVAC
if test "x${user_specified_javac}" = x; then
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)
+ AM_CONDITIONAL(FOUND_JAVAC, test "x${JAVAC}" != x)
else
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)
+ AM_CONDITIONAL(FOUND_JAVAC, test "x${user_specified_javac}" = xjavac)
fi
dnl AM_CONDITIONAL(FOUND_KJC, test "x${user_specified_javac}" = xkjc)
@@ -422,3 +425,38 @@ AC_DEFUN([CLASSPATH_CHECK_ECJ],
AC_PATH_PROG(ECJ, "ecj")
fi
])
+
+dnl -----------------------------------------------------------
+AC_DEFUN([CLASSPATH_WITH_JAVAC],
+[
+ AC_ARG_WITH([javac],
+ [AS_HELP_STRING(--with-javac,bytecode compilation with javac)],
+ [
+ if test "x${withval}" != x && test "x${withval}" != xyes && test
"x${withval}" != xno; then
+ CLASSPATH_CHECK_JAVAC(${withval})
+ else
+ if test "x${withval}" != xno; then
+ CLASSPATH_CHECK_JAVAC
+ fi
+ fi
+ user_specified_javac=javac
+ ],
+ [
+ CLASSPATH_CHECK_JAVAC
+ ])
+ AC_SUBST(JAVAC)
+])
+
+dnl -----------------------------------------------------------
+AC_DEFUN([CLASSPATH_CHECK_JAVAC],
+[
+ if test "x$1" != x; then
+ if test -f "$1"; then
+ JAVAC="$1"
+ else
+ AC_PATH_PROG(JAVAC, "$1")
+ fi
+ else
+ AC_PATH_PROG(JAVAC, "javac")
+ fi
+])
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.130
diff -u -3 -p -r1.130 Makefile.am
--- lib/Makefile.am 13 Dec 2006 19:25:28 -0000 1.130
+++ lib/Makefile.am 15 Dec 2006 22:05:37 -0000
@@ -14,22 +14,26 @@ 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
+JCOMPILER = $(ECJ) -1.5
-warn:-deprecation,serial,typeHiding,unchecked,unused,varargsCast
-proceedOnError -bootclasspath '' -classpath $(compile_classpath) -d . @classes
+else
+if FOUND_JAVAC
+JCOMPILER = $(JAVAC) -bootclasspath '' -classpath $(compile_classpath) -d .
@classes
#else
#if FOUND_GCJ
## This should never be used when gcj is the compiler.
## See the compile-classes target.
-#JAVAC = exit 1
+#JCOMPILER = exit 1
#else
#if FOUND_JIKES
-#JAVAC = $(JIKES) $(JIKESWARNINGS) +F $(JIKESENCODING) -bootclasspath ''
-extdirs '' -sourcepath '' --classpath $(compile_classpath) -d . @classes
+#JCOMPILER = $(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.
-#JAVAC = $(KJC) -classpath .:$(USER_CLASSLIB) -d . @classes
+#JCOMPILER = $(KJC) -classpath .:$(USER_CLASSLIB) -d . @classes
#endif # FOUND_KJC
#endif # FOUND_GCJ
#endif # FOUND_JIKES
+endif # FOUND_JAVAC
endif # FOUND_ECJ
JAVAH = $(USER_JAVAH) -jni -classpath .:$(USER_CLASSLIB)
@@ -42,7 +46,7 @@ collections.jar: mkcollections.pl
#if FOUND_GCJ
# $(GCJ) -C `$(FIND) $(COLLECTIONS_PREFIX) -name '*.java' -type f -print`
#else
- $(JAVAC) `$(FIND) $(COLLECTIONS_PREFIX) -name '*.java' -type f -print`
+ $(JCOMPILER) `$(FIND) $(COLLECTIONS_PREFIX) -name '*.java' -type f
-print`
#endif
if test "$(FASTJAR)" != ""; then \
$(FASTJAR) cf $@ $(COLLECTIONS_PREFIX); \
@@ -161,7 +165,7 @@ $(JAVA_DEPEND): genclasses
# touch compile-classes
#else
compile-classes: classes $(JAVA_SRCS) Makefile
- $(JAVAC)
+ $(JCOMPILER)
touch compile-classes
#endif
Index: examples/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/examples/Makefile.am,v
retrieving revision 1.17
diff -u -3 -p -r1.17 Makefile.am
--- examples/Makefile.am 13 Dec 2006 19:25:28 -0000 1.17
+++ examples/Makefile.am 15 Dec 2006 22:05:37 -0000
@@ -11,10 +11,14 @@ GLIBJ_CLASSPATH='$(top_builddir)/lib':'$
if FOUND_ECJ
JCOMPILER = $(ECJ) -1.5 -encoding UTF-8 -bootclasspath $(GLIBJ_CLASSPATH)
-classpath .
else
+if FOUND_JAVAC
+JCOMPILER = $(JAVAC) -encoding UTF-8 -bootclasspath $(GLIBJ_CLASSPATH)
-classpath .
+else
error dunno how to setup the JCOMPILER and compile
#endif
#endif
endif
+endif
# All our example java source files
EXAMPLE_JAVA_FILES = $(srcdir)/gnu/classpath/examples/*/*.java
$(srcdir)/gnu/classpath/examples/*/*/*.java
$(srcdir)/gnu/classpath/examples/*/*/*/*.java
Index: tools/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/Makefile.am,v
retrieving revision 1.32
diff -u -3 -p -r1.32 Makefile.am
--- tools/Makefile.am 15 Dec 2006 17:43:17 -0000 1.32
+++ tools/Makefile.am 15 Dec 2006 22:05:37 -0000
@@ -7,8 +7,12 @@ GLIBJ_CLASSPATH=asm
if FOUND_ECJ
JCOMPILER = $(ECJ) -1.5 -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH)
-classpath .:$(GLIBJ_CLASSPATH)
else
+if FOUND_JAVAC
+JCOMPILER = $(JAVAC) -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH)
-classpath .:$(GLIBJ_CLASSPATH)
+else
error dunno how to setup the JCOMPILER and compile
endif
+endif
if CREATE_WRAPPERS
bin_SCRIPTS =
