changeset 2427:1d5d23a62702

remove jcheck, fix launcher and add com.sun.runtime to rt.jar
author mcimadamore
date Wed, 16 Jun 2010 12:42:23 +0100
parents 6568c84116bb
children bb194ca1e9fe
files .jcheck/conf make/common/internal/Defs-langtools.gmk make/docs/NON_CORE_PKGS.gmk src/share/bin/java.c
diffstat 4 files changed, 21 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.jcheck/conf	Thu Jun 10 13:59:09 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-project=jdk7
--- a/make/common/internal/Defs-langtools.gmk	Thu Jun 10 13:59:09 2010 -0700
+++ b/make/common/internal/Defs-langtools.gmk	Wed Jun 16 12:42:23 2010 +0100
@@ -28,7 +28,8 @@
 IMPORT_RT_PACKAGES +=               \
       javax/annotation/processing   \
       javax/lang/model              \
-      javax/tools
+      javax/tools                   \
+      com/sun/runtime
 
 IMPORT_TOOLS_PACKAGES +=            \
       com/sun/javadoc               \
--- a/make/docs/NON_CORE_PKGS.gmk	Thu Jun 10 13:59:09 2010 -0700
+++ b/make/docs/NON_CORE_PKGS.gmk	Wed Jun 16 12:42:23 2010 +0100
@@ -91,6 +91,8 @@
 TRACING_PKGS     = com.sun.tracing         \
                    com.sun.tracing.dtrace
 
+LAMBDA_RTAPI     = com.sun.runtime
+
 # non-core packages in rt.jar
 NON_CORE_PKGS    = $(DOMAPI_PKGS) \
                    $(MGMT_PKGS) \
@@ -101,5 +103,6 @@
                    $(HTTPSERVER_PKGS) \
                    $(SMARTCARDIO_PKGS) \
                    $(TRACING_PKGS) \
-                   $(SCTPAPI_PKGS)
+                   $(SCTPAPI_PKGS) \
+                   $(LAMBDA_RTAPI)
 
--- a/src/share/bin/java.c	Thu Jun 10 13:59:09 2010 -0700
+++ b/src/share/bin/java.c	Wed Jun 16 12:42:23 2010 +0100
@@ -93,6 +93,7 @@
  * Prototypes for functions internal to launcher.
  */
 static void SetClassPath(const char *s);
+static void SetLambdaOptions();
 static void SetModulesBootClassPath(const char *s);
 static void SelectVersion(int argc, char **argv, char **main_class);
 static jboolean ParseArguments(int *pargc, char ***pargv, char **pjarfile,
@@ -295,6 +296,9 @@
     /* set the -Dsun.java.launcher.* platform properties */
     SetJavaLauncherPlatformProps();
 
+    /* Set special options for lambda */
+    SetLambdaOptions();
+
     /* Show the splash screen if needed */
     ShowSplashScreen();
 
@@ -659,7 +663,7 @@
      */
     if (numOptions >= maxOptions) {
         if (options == 0) {
-            maxOptions = 4;
+            maxOptions = 6;
             options = JLI_MemAlloc(maxOptions * sizeof(JavaVMOption));
         } else {
             JavaVMOption *tmp;
@@ -697,6 +701,16 @@
         JLI_MemFree((char *) s);
 }
 
+/* 
+ * add a lambda options for now
+ */
+static void
+SetLambdaOptions() {
+    AddOption("-XX:+UnlockExperimentalVMOptions", NULL);
+    AddOption("-XX:+EnableMethodHandles", NULL);
+    AddOption("-XX:+EnableInvokeDynamic", NULL);
+}
+
 /*
  * Set the bootclasspath for modules.
  * A temporary workaround until jigsaw is integrated into JDK 7.