changeset 1626:0e94e79a0621

Merging recent jdk9/dev changes into kulla/dev
author jlahoda
date Sat, 22 Aug 2015 09:02:47 +0200
parents 1084cf3c35ca a04fb3e6c9d1
children 107d37e1840f
files make/CompileJavaModules.gmk make/Images.gmk modules.xml
diffstat 3 files changed, 36 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/CompileJavaModules.gmk	Fri Aug 21 18:00:53 2015 +0530
+++ b/make/CompileJavaModules.gmk	Sat Aug 22 09:02:47 2015 +0200
@@ -264,6 +264,10 @@
 
 ################################################################################
 
+jdk.jshell_ADD_JAVAC_FLAGS := -Xlint:none
+
+################################################################################
+
 java.sql_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
 java.sql_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
 
--- a/make/Images.gmk	Fri Aug 21 18:00:53 2015 +0530
+++ b/make/Images.gmk	Sat Aug 22 09:02:47 2015 +0200
@@ -48,7 +48,8 @@
 # tools
 TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev jdk.internal.le jdk.scripting.nashorn.shell \
                jdk.javadoc jdk.jcmd jdk.jconsole jdk.hotspot.agent jdk.jartool \
-               jdk.jdeps jdk.jdi jdk.jdwp.agent jdk.policytool jdk.rmic jdk.xml.bind jdk.xml.ws
+               jdk.jdeps jdk.jdi jdk.jdwp.agent jdk.jshell jdk.policytool jdk.rmic \
+               jdk.xml.bind jdk.xml.ws
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
   PROVIDER_MODULES += jdk.crypto.mscapi
--- a/modules.xml	Fri Aug 21 18:00:53 2015 +0530
+++ b/modules.xml	Sat Aug 22 09:02:47 2015 +0200
@@ -778,6 +778,20 @@
     </export>
   </module>
   <module>
+    <name>jdk.jshell</name>
+    <depend>java.base</depend>
+    <depend re-exports="true">java.compiler</depend> <!-- reexport for Diagnostic! -->
+    <depend>jdk.compiler</depend>
+    <depend>java.desktop</depend> <!--for EditPad -->
+    <depend>java.datatransfer</depend> <!--for jline -->
+    <depend>java.prefs</depend>
+    <depend>jdk.jdi</depend>
+    <depend>jdk.internal.le</depend>
+    <export>
+      <name>jdk.jshell</name>
+    </export>
+  </module>
+  <module>
     <name>java.instrument</name>
     <depend>java.base</depend>
     <export>
@@ -1537,14 +1551,17 @@
     </export>
     <export>
       <name>com.sun.tools.javac.api</name>
+      <to>jdk.jshell</to>
       <to>jdk.javadoc</to>
     </export>
     <export>
       <name>com.sun.tools.javac.code</name>
+      <to>jdk.jshell</to>
       <to>jdk.javadoc</to>
     </export>
     <export>
       <name>com.sun.tools.javac.comp</name>
+      <to>jdk.jshell</to>
       <to>jdk.javadoc</to>
     </export>
     <export>
@@ -1554,10 +1571,12 @@
     </export>
     <export>
       <name>com.sun.tools.javac.jvm</name>
+      <to>jdk.jshell</to>
       <to>jdk.javadoc</to>
     </export>
     <export>
       <name>com.sun.tools.javac.main</name>
+      <to>jdk.jshell</to>
       <to>jdk.javadoc</to>
     </export>
     <export>
@@ -1565,6 +1584,10 @@
       <to>jdk.javadoc</to>
     </export>
     <export>
+      <name>com.sun.tools.javac.parser</name>
+      <to>jdk.jshell</to>
+    </export>
+    <export>
       <name>com.sun.tools.javac.platform</name>
       <to>jdk.javadoc</to>
     </export>
@@ -1574,10 +1597,12 @@
     </export>
     <export>
       <name>com.sun.tools.javac.tree</name>
+      <to>jdk.jshell</to>
       <to>jdk.javadoc</to>
     </export>
     <export>
       <name>com.sun.tools.javac.util</name>
+      <to>jdk.jshell</to>
       <to>jdk.javadoc</to>
       <to>jdk.jdeps</to>
     </export>
@@ -1639,22 +1664,27 @@
     <export>
       <name>jdk.internal.jline</name>
       <to>jdk.scripting.nashorn.shell</to>
+      <to>jdk.jshell</to>
     </export>
     <export>
       <name>jdk.internal.jline.console</name>
       <to>jdk.scripting.nashorn.shell</to>
+      <to>jdk.jshell</to>
     </export>
     <export>
       <name>jdk.internal.jline.console.completer</name>
       <to>jdk.scripting.nashorn.shell</to>
+      <to>jdk.jshell</to>
     </export>
     <export>
       <name>jdk.internal.jline.console.history</name>
       <to>jdk.scripting.nashorn.shell</to>
+      <to>jdk.jshell</to>
     </export>
     <export>
       <name>jdk.internal.jline.internal</name>
       <to>jdk.scripting.nashorn.shell</to>
+      <to>jdk.jshell</to>
     </export>
   </module>
   <module>