Looks good!<br><br><div class="gmail_quote">On Tue, Oct 25, 2011 at 11:24 PM, Will Dietz <span dir="ltr"><<a href="mailto:wdietz2@illinois.edu">wdietz2@illinois.edu</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
Inlined below.<br>
<br>
~Will<br>
<br>
 From c8f76b50d7c3b44b0b8e01b77c2a0a92aa55640d Mon Sep 17 00:00:00 2001<br>
From: Will Dietz <<a href="mailto:w@wdtz.org">w@wdtz.org</a>><br>
Date: Fri, 14 Oct 2011 03:18:35 -0500<br>
Subject: [PATCH 1/3] Add OpenJDK resource definitions to <a href="http://Classpath.h.in" target="_blank">Classpath.h.in</a>.<br>
<br>
---<br>
 lib/J3/ClassLib/<a href="http://Classpath.h.in" target="_blank">Classpath.h.in</a> |   43 +++++++++++++++++++++++++++++++++------<br>
 1 files changed, 36 insertions(+), 7 deletions(-)<br>
<br>
diff --git a/lib/J3/ClassLib/<a href="http://Classpath.h.in" target="_blank">Classpath.h.in</a> b/lib/J3/ClassLib/<a href="http://Classpath.h.in" target="_blank">Classpath.h.in</a><br>
index 107510d..67a3f9f 100644<br>
--- a/lib/J3/ClassLib/<a href="http://Classpath.h.in" target="_blank">Classpath.h.in</a><br>
+++ b/lib/J3/ClassLib/<a href="http://Classpath.h.in" target="_blank">Classpath.h.in</a><br>
@@ -7,13 +7,42 @@<br>
 //<br>
 //===----------------------------------------------------------------------===//<br>
<br>
+// Historically has been included here, keep it for now<br>
+#include <jni.h><br>
+<br>
+#ifndef USE_OPENJDK<br>
<br>
-#define GNUClasspathLibs "@classpathlibs@";<br>
-#define GNUClasspathGlibj "@classpathglibj@";<br>
-#define GNUClasspathVersion "@classpathversion@";<br>
+// GNU Classpath values<br>
+#define GNUClasspathLibs "@classpathlibs@"<br>
+#define GNUClasspathGlibj "@classpathglibj@"<br>
+#define GNUClasspathVersion "@classpathversion@"<br>
<br>
-#ifdef NATIVE_JNI<br>
-#define JNIEXPORT<br>
 #else<br>
-#include <jni.h><br>
-#endif<br>
+<br>
+// OpenJDK values<br>
+#define OpenJDKJRE "@openjdkjre@"<br>
+#define OpenJDKArch "@openjdkarchdir@"<br>
+<br>
+// OpenJDK Bootstrap classpath<br>
+#define OpenJDKBootPath \<br>
+      OpenJDKJRE "/lib/rt.jar" \<br>
+  ":" OpenJDKJRE "/lib/resources.jar" \<br>
+  ":" OpenJDKJRE "/lib/jsse.jar" \<br>
+  ":" OpenJDKJRE "/lib/jce.jar" \<br>
+  ":" OpenJDKJRE "/lib/charsets.jar"<br>
+<br>
+// Location of OpenJDK's libjava.so<br>
+#define OpenJDKLibJava OpenJDKArch "/libjava.so"<br>
+<br>
+// Search path for native library files<br>
+// TODO: Use LD_LIBRARY_PATH to second part of this?<br>
+#define OpenJDKLibPaths \<br>
+      OpenJDKArch \<br>
+  ":" OpenJDKArch "/client" \<br>
+  ":" OpenJDKArch "/server" \<br>
+  ":" "/lib" \<br>
+  ":" "/lib64" \<br>
+  ":" "/usr/lib" \<br>
+  ":" "/usr/lib64"<br>
+<br>
+#endif // USE_OPENJDK<br>
<font color="#888888">--<br>
1.7.5.1<br>
_______________________________________________<br>
vmkit-commits mailing list<br>
<a href="mailto:vmkit-commits@cs.uiuc.edu">vmkit-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/vmkit-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/vmkit-commits</a><br>
</font></blockquote></div><br>