# HG changeset patch
# User jjg
# Date 1361833691 28800
# Node ID 4e88242da117f25c6a747ab1e1333453055c20cd
# Parent  1204994c426f4c752889189b3bfc115474a3e9da
8008914: Add nashorn to the tl build
Reviewed-by: mr, tbell, jjh
Contributed-by: erik.joelsson@oracle.com, james.laskey@oracle.com

diff -r 1204994c426f -r 4e88242da117 jdk/make/launchers/Makefile
--- a/jdk/make/launchers/Makefile	Mon Feb 25 14:19:48 2013 -0800
+++ b/jdk/make/launchers/Makefile	Mon Feb 25 15:08:11 2013 -0800
@@ -77,6 +77,7 @@
   -J-Dsun.jvm.hotspot.debugger.useWindbgDebugger, )
 $(call make-launcher, jps, sun.tools.jps.Jps, , )
 $(call make-launcher, jrunscript, com.sun.tools.script.shell.Main, , )
+$(call make-launcher, jjs, jdk.nashorn.tools.Shell, , )
 $(call make-launcher, jsadebugd, sun.jvm.hotspot.jdi.SADebugServer, , )
 $(call make-launcher, jstack, sun.tools.jstack.JStack, \
   -J-Dsun.jvm.hotspot.debugger.useProcDebugger \
diff -r 1204994c426f -r 4e88242da117 jdk/makefiles/CompileLaunchers.gmk
--- a/jdk/makefiles/CompileLaunchers.gmk	Mon Feb 25 14:19:48 2013 -0800
+++ b/jdk/makefiles/CompileLaunchers.gmk	Mon Feb 25 15:08:11 2013 -0800
@@ -311,6 +311,9 @@
 $(eval $(call SetupLauncher,jrunscript,\
     -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.script.shell.Main"$(COMMA) }'))
 
+$(eval $(call SetupLauncher,jjs,\
+    -DJAVA_ARGS='{  "-J-ms8m"$(COMMA) "jdk.nashorn.tools.Shell"$(COMMA) }'))
+
 $(eval $(call SetupLauncher,jsadebugd,\
     -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.jvm.hotspot.jdi.SADebugServer"$(COMMA) }' \
     -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
diff -r 1204994c426f -r 4e88242da117 jdk/makefiles/CreateJars.gmk
--- a/jdk/makefiles/CreateJars.gmk	Mon Feb 25 14:19:48 2013 -0800
+++ b/jdk/makefiles/CreateJars.gmk	Mon Feb 25 15:08:11 2013 -0800
@@ -1119,6 +1119,14 @@
 
 ##########################################################################################
 
+# Import nashorn.jar from nashorn dist dir.
+$(IMAGES_OUTPUTDIR)/lib/ext/nashorn.jar: $(NASHORN_DIST)/nashorn.jar
+	$(install-file)
+
+JARS += $(IMAGES_OUTPUTDIR)/lib/ext/nashorn.jar
+
+##########################################################################################
+
 -include $(CUSTOM_MAKE_DIR)/CreateJars.gmk
 
 ##########################################################################################
diff -r 1204994c426f -r 4e88242da117 jdk/test/tools/launcher/VersionCheck.java
--- a/jdk/test/tools/launcher/VersionCheck.java	Mon Feb 25 14:19:48 2013 -0800
+++ b/jdk/test/tools/launcher/VersionCheck.java	Mon Feb 25 15:08:11 2013 -0800
@@ -74,6 +74,7 @@
         "jmap",
         "jps",
         "jrunscript",
+        "jjs",
         "jsadebugd",
         "jstack",
         "jstat",