[vmkit-commits] [PATCH] Add OpenJDK resource definitions to Classpath.h.in

[Will Dietz]

Inlined below.

~Will

diff --git a/lib/J3/ClassLib/Classpath.h.in b/lib/J3/ClassLib/Classpath.h.in
index a409582..6bd51d8 100644
--- a/lib/J3/ClassLib/Classpath.h.in
+++ b/lib/J3/ClassLib/Classpath.h.in
@@ -14,9 +14,32 @@
 #endif

 // GNU Classpath values
-#define GNUClasspathLibs "@classpathlibs@";
-#define GNUClasspathGlibj "@classpathglibj@";
-#define GNUClasspathVersion "@classpathversion@";
+#define GNUClasspathLibs "@classpathlibs@"
+#define GNUClasspathGlibj "@classpathglibj@"
+#define GNUClasspathVersion "@classpathversion@"

 // OpenJDK values
-// TODO: Add me!
+#define OpenJDKJRE "@openjdkjre@"
+#define OpenJDKArch "@openjdkarchdir@"
+
+// OpenJDK Bootstrap classpath
+#define OpenJDKBootPath \
+      OpenJDKJRE "/lib/rt.jar" \
+  ":" OpenJDKJRE "/lib/resources.jar" \
+  ":" OpenJDKJRE "/lib/jsse.jar" \
+  ":" OpenJDKJRE "/lib/jce.jar" \
+  ":" OpenJDKJRE "/lib/charsets.jar"
+
+// Location of OpenJDK's libjava.so
+#define OpenJDKLibJava OpenJDKArch "/libjava.so"
+
+// Search path for native library files
+// TODO: Use LD_LIBRARY_PATH to second part of this?
+#define OpenJDKLibPaths \
+      OpenJDKArch \
+  ":" OpenJDKArch "/client" \
+  ":" OpenJDKArch "/server" \
+  ":" "/lib" \
+  ":" "/lib64" \
+  ":" "/usr/lib" \
+  ":" "/usr/lib64"
-- 
1.7.5.1