Author: jfclere
Date: Sat Aug 20 04:55:19 2005
New Revision: 234022
URL: http://svn.apache.org/viewcvs?rev=234022&view=rev
Log:
Add support for the sableVM (tested with 1.12 + patch PR 154)
See http://sablevm.org/bugs/attachment.cgi?bugid=154&action=viewall
Modified:
jakarta/commons/proper/daemon/trunk/src/native/unix/configure.in
jakarta/commons/proper/daemon/trunk/src/native/unix/native/java.c
jakarta/commons/proper/daemon/trunk/src/native/unix/native/location.c
jakarta/commons/proper/daemon/trunk/src/native/unix/support/apjava.m4
Modified: jakarta/commons/proper/daemon/trunk/src/native/unix/configure.in
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/daemon/trunk/src/native/unix/configure.in?rev=234022&r1=234021&r2=234022&view=diff
==============================================================================
--- jakarta/commons/proper/daemon/trunk/src/native/unix/configure.in (original)
+++ jakarta/commons/proper/daemon/trunk/src/native/unix/configure.in Sat Aug 20
04:55:19 2005
@@ -75,6 +75,7 @@
dnl -------------------------------------------------------------------------
AP_MSG_HEADER([Java compilation tools])
AP_JAVA()
+AP_SABLEVM()
AP_PROG_JAVAC()
AP_PROG_JAR()
if test "$supported_os" != "darwin"
Modified: jakarta/commons/proper/daemon/trunk/src/native/unix/native/java.c
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/daemon/trunk/src/native/unix/native/java.c?rev=234022&r1=234021&r2=234022&view=diff
==============================================================================
--- jakarta/commons/proper/daemon/trunk/src/native/unix/native/java.c (original)
+++ jakarta/commons/proper/daemon/trunk/src/native/unix/native/java.c Sat Aug
20 04:55:19 2005
@@ -237,6 +237,9 @@
}
log_debug("Class %s found",loaderclass);
+#if defined(HAVE_SABLEVM)
+ log_debug("sableVM doesn't support RegisterNatives");
+#else
jsvc_xlate_to_ascii(shutdownclass);
nativemethod.name=shutdownclass;
jsvc_xlate_to_ascii(shutdownparams);
@@ -247,6 +250,7 @@
return(false);
}
log_debug("Native methods registered");
+#endif
return(true);
}
Modified: jakarta/commons/proper/daemon/trunk/src/native/unix/native/location.c
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/daemon/trunk/src/native/unix/native/location.c?rev=234022&r1=234021&r2=234022&view=diff
==============================================================================
--- jakarta/commons/proper/daemon/trunk/src/native/unix/native/location.c
(original)
+++ jakarta/commons/proper/daemon/trunk/src/native/unix/native/location.c Sat
Aug 20 04:55:19 2005
@@ -69,6 +69,9 @@
"$JAVA_HOME/jre/bin/classic/jvm.dll", /* Sun JDK 1.3 */
"$JAVA_HOME/jre/bin/client/jvm.dll", /* Sun JDK 1.4 */
#elif defined(OS_LINUX) || defined(OS_SOLARIS) || defined(OS_BSD) ||
defined(OS_SYSV) || defined(OS_FREEBSD) || defined(OS_TRU64)
+#if defined(HAVE_SABLEVM)
+ "$JAVA_HOME/lib/libsablevm.so", /* sableVM */
+#endif
"$JAVA_HOME/jre/lib/" CPU "/classic/libjvm.so", /* Sun JDK 1.2 */
"$JAVA_HOME/jre/lib/" CPU "/client/libjvm.so", /* Sun JDK 1.3 */
"$JAVA_HOME/jre/lib/" CPU "/libjvm.so", /* Sun JDK */
Modified: jakarta/commons/proper/daemon/trunk/src/native/unix/support/apjava.m4
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/daemon/trunk/src/native/unix/support/apjava.m4?rev=234022&r1=234021&r2=234022&view=diff
==============================================================================
--- jakarta/commons/proper/daemon/trunk/src/native/unix/support/apjava.m4
(original)
+++ jakarta/commons/proper/daemon/trunk/src/native/unix/support/apjava.m4 Sat
Aug 20 04:55:19 2005
@@ -16,7 +16,7 @@
dnl -------------------------------------------------------------------------
dnl Author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
-dnl Version $Id: apjava.m4,v 1.3 2004/02/27 08:40:46 jfclere Exp $
+dnl Version $Id$
dnl -------------------------------------------------------------------------
AC_DEFUN([AP_PROG_JAVAC_WORKS],[
@@ -85,5 +85,21 @@
if test x"$JAVA_HOME" = x
then
AC_MSG_ERROR([Java Home not defined. Rerun with --with-java=[...]
parameter])
+ fi
+])
+
+dnl check if the JVM in JAVA_HOME is sableVM
+dnl $JAVA_HOME/bin/sablevm and /opt/java/lib/sablevm/bin are tested.
+AC_DEFUN([AP_SABLEVM],[
+ if test x"$JAVA_HOME" != x
+ then
+ AC_PATH_PROG(JAVAC,javac-sablevm,NONE,$JAVA_HOME/bin)
+ AC_PATH_PROG(JAR,jar-sablevm,NONE,$JAVA_HOME/bin)
+ AC_PATH_PROG(SABLEVM,sablevm,NONE,$JAVA_HOME/bin)
+ if test "$SABLEVM" != "NONE"
+ then
+ AC_MSG_RESULT([Using sableVM: $SABLEVM])
+ CFLAGS="$CFLAGS -DHAVE_SABLEVM"
+ fi
fi
])
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
