# HG changeset patch
# User sundar
# Date 1439473199 -19800
# Node ID 59d19d081bbcbd0288e9566cdf9332c470a42eb8
# Parent  4c85a31c02e8d03924b7a880c204b4055aa1bda9
8133347: Add makefiles support and basic session, persistence history navigation with jline
Reviewed-by: erikj, jlahoda, jlaskey

diff -r 4c85a31c02e8 -r 59d19d081bbc make/CompileJavaModules.gmk
--- a/make/CompileJavaModules.gmk	Mon Aug 10 09:47:35 2015 +0200
+++ b/make/CompileJavaModules.gmk	Thu Aug 13 19:09:59 2015 +0530
@@ -491,6 +491,7 @@
     $(CORBA_TOPDIR)/src/$1/share/classes \
     $(JAXP_TOPDIR)/src/$1/share/classes \
     $(JAXWS_TOPDIR)/src/$1/share/classes \
+    $(NASHORN_TOPDIR)/src/$1/share/classes \
     #
 
 ALL_SRC_DIRS = \
diff -r 4c85a31c02e8 -r 59d19d081bbc make/Images.gmk
--- a/make/Images.gmk	Mon Aug 10 09:47:35 2015 +0200
+++ b/make/Images.gmk	Thu Aug 13 19:09:59 2015 +0530
@@ -46,9 +46,9 @@
                jdk.naming.dns jdk.naming.rmi jdk.scripting.nashorn jdk.zipfs
 
 # tools
-TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev jdk.internal.le jdk.javadoc jdk.jcmd jdk.jconsole \
-               jdk.hotspot.agent jdk.hprof.agent jdk.jartool jdk.jdeps jdk.jdi jdk.jdwp.agent \
-               jdk.policytool jdk.rmic jdk.xml.bind jdk.xml.ws
+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.hprof.agent jdk.jartool \
+               jdk.jdeps jdk.jdi jdk.jdwp.agent jdk.policytool jdk.rmic jdk.xml.bind jdk.xml.ws
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
   PROVIDER_MODULES += jdk.crypto.mscapi
diff -r 4c85a31c02e8 -r 59d19d081bbc modules.xml
--- a/modules.xml	Mon Aug 10 09:47:35 2015 +0200
+++ b/modules.xml	Thu Aug 13 19:09:59 2015 +0530
@@ -1799,6 +1799,25 @@
     <depend>java.base</depend>
     <depend>java.logging</depend>
     <depend>java.scripting</depend>
+    <export>
+      <name>jdk.nashorn.internal.runtime</name>
+      <to>jdk.scripting.nashorn.shell</to>
+    </export>
+    <export>
+      <name>jdk.nashorn.internal.objects</name>
+      <to>jdk.scripting.nashorn.shell</to>
+    </export>
+    <export>
+      <name>jdk.nashorn.tools</name>
+      <to>jdk.scripting.nashorn.shell</to>
+    </export>
+  </module>
+  <module>
+    <name>jdk.scripting.nashorn.shell</name>
+    <depend>java.base</depend>
+    <depend>java.prefs</depend>
+    <depend>jdk.scripting.nashorn</depend>
+    <depend>jdk.internal.le</depend>
   </module>
   <module>
     <name>jdk.sctp</name>