[vmkit-commits] [vmkit] r142976 - /vmkit/trunk/lib/J3/ClassLib/Classpath.h.in

[Will Dietz]

Author: wdietz2
Date: Tue Oct 25 16:30:25 2011
New Revision: 142976

URL: http://llvm.org/viewvc/llvm-project?rev=142976&view=rev
Log:
Add OpenJDK resource definitions to Classpath.h.in.

Modified:
    vmkit/trunk/lib/J3/ClassLib/Classpath.h.in

Modified: vmkit/trunk/lib/J3/ClassLib/Classpath.h.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/ClassLib/Classpath.h.in?rev=142976&r1=142975&r2=142976&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/ClassLib/Classpath.h.in (original)
+++ vmkit/trunk/lib/J3/ClassLib/Classpath.h.in Tue Oct 25 16:30:25 2011
@@ -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