harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arc...@apache.org
Subject svn commit: r332572 - in /incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm: configure.in java/Makefile.am libjc/native/gnu_classpath_VMStackWalker.c libjc/native/java_lang_VMCompiler.c
Date Fri, 11 Nov 2005 14:45:10 GMT
Author: archie
Date: Fri Nov 11 06:45:07 2005
New Revision: 332572

URL: http://svn.apache.org/viewcvs?rev=332572&view=rev
Log:
These patches remove all remaining dependencies on modified Classpath
source files; now we are compatible with an unmodified Classpath 0.19,
i.e., with no customized Classpath "overlay" source files.

Modified:
    incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/configure.in
    incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/java/Makefile.am
    incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/native/gnu_classpath_VMStackWalker.c
    incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/native/java_lang_VMCompiler.c

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/configure.in
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/configure.in?rev=332572&r1=332571&r2=332572&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/configure.in (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/configure.in Fri Nov 11
06:45:07 2005
@@ -159,10 +159,6 @@
 AC_CONFIG_FILES(include/Makefile)
 AC_CONFIG_FILES(include/jc_machdep.h)
 AC_CONFIG_FILES(java/Makefile)
-AC_CONFIG_FILES(java/gnu/Makefile)
-AC_CONFIG_FILES(java/gnu/classpath/Makefile)
-AC_CONFIG_FILES(java/java/Makefile)
-AC_CONFIG_FILES(java/java/lang/Makefile)
 AC_CONFIG_FILES(java/org/Makefile)
 AC_CONFIG_FILES(java/org/dellroad/Makefile)
 AC_CONFIG_FILES(java/org/dellroad/jc/Makefile)

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/java/Makefile.am
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/java/Makefile.am?rev=332572&r1=332571&r2=332572&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/java/Makefile.am (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/java/Makefile.am Fri Nov
11 06:45:07 2005
@@ -11,7 +11,7 @@
 
 JCOMPILE=	$(JIKES) -nowarn +F -bootclasspath '' -extdirs '' -sourcepath '' -classpath $(srcdir):$(CLASSPATH)
-d classes
 
-SUBDIRS=	gnu java org
+SUBDIRS=	org
 
 EXTRA_DIST=	api.tgz jc.zip
 

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/native/gnu_classpath_VMStackWalker.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/native/gnu_classpath_VMStackWalker.c?rev=332572&r1=332571&r2=332572&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/native/gnu_classpath_VMStackWalker.c
(original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/native/gnu_classpath_VMStackWalker.c
Fri Nov 11 06:45:07 2005
@@ -39,8 +39,11 @@
 	return JNI_FALSE;
 }
 
+#if 0
 /*
  * public static final native Class getCallingClass()
+ *
+ * NOTE: this implementation is not used with "stock" Classpath.
  */
 _jc_object * _JC_JCNI_ATTR
 JCNI_gnu_classpath_VMStackWalker_getCallingClass(_jc_env *env)
@@ -86,6 +89,8 @@
 
 /*
  * public static final native ClassLoader getCallingClassLoader()
+ *
+ * NOTE: this implementation is not used with "stock" Classpath.
  */
 _jc_object * _JC_JCNI_ATTR
 JCNI_gnu_classpath_VMStackWalker_getCallingClassLoader(_jc_env *env)
@@ -128,6 +133,7 @@
 	/* Done */
 	return result;
 }
+#endif
 
 /*
  * public static final native Class[] getClassContext()

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/native/java_lang_VMCompiler.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/native/java_lang_VMCompiler.c?rev=332572&r1=332571&r2=332572&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/native/java_lang_VMCompiler.c
(original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/native/java_lang_VMCompiler.c
Fri Nov 11 06:45:07 2005
@@ -21,6 +21,9 @@
 #include "libjc.h"
 #include "java_lang_VMCompiler.h"
 
+/* NOTE: these are not used with "stock" Classpath */
+
+#if 0
 /*
  * public static final native boolean compileClass(Class)
  */
@@ -89,4 +92,5 @@
 {
 	env->vm->compiler_disabled = JNI_FALSE;
 }
+#endif
 



Mime
View raw message