[vmkit-commits] [PATCH] Add OpenJDK resources to Classpath.h.in
Will Dietz
wdietz2 at illinois.edu
Tue Oct 25 14:24:57 PDT 2011
Inlined below.
~Will
From c8f76b50d7c3b44b0b8e01b77c2a0a92aa55640d Mon Sep 17 00:00:00 2001
From: Will Dietz <w at wdtz.org>
Date: Fri, 14 Oct 2011 03:18:35 -0500
Subject: [PATCH 1/3] Add OpenJDK resource definitions to Classpath.h.in.
---
lib/J3/ClassLib/Classpath.h.in | 43 +++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/lib/J3/ClassLib/Classpath.h.in b/lib/J3/ClassLib/Classpath.h.in
index 107510d..67a3f9f 100644
--- a/lib/J3/ClassLib/Classpath.h.in
+++ b/lib/J3/ClassLib/Classpath.h.in
@@ -7,13 +7,42 @@
//
//===----------------------------------------------------------------------===//
+// Historically has been included here, keep it for now
+#include <jni.h>
+
+#ifndef USE_OPENJDK
-#define GNUClasspathLibs "@classpathlibs@";
-#define GNUClasspathGlibj "@classpathglibj@";
-#define GNUClasspathVersion "@classpathversion@";
+// GNU Classpath values
+#define GNUClasspathLibs "@classpathlibs@"
+#define GNUClasspathGlibj "@classpathglibj@"
+#define GNUClasspathVersion "@classpathversion@"
-#ifdef NATIVE_JNI
-#define JNIEXPORT
#else
-#include <jni.h>
-#endif
+
+// OpenJDK values
+#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"
+
+#endif // USE_OPENJDK
--
1.7.5.1
More information about the vmkit-commits
mailing list