Mercurial > hg > openjdk > jigsaw > jdk
changeset 7048:4cf4403c9bf2
8008914: Add nashorn to the tl build
Reviewed-by: mr, tbell, jjh
Contributed-by: erik.joelsson@oracle.com, james.laskey@oracle.com
| author | jjg |
|---|---|
| date | Mon, 25 Feb 2013 15:08:11 -0800 |
| parents | 58f829566fe3 |
| children | 77447981db73 ae1fed8d80e1 |
| files | make/launchers/Makefile makefiles/CompileLaunchers.gmk makefiles/CreateJars.gmk test/tools/launcher/VersionCheck.java |
| diffstat | 4 files changed, 13 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/make/launchers/Makefile Mon Feb 25 14:19:48 2013 -0800 +++ b/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 \
--- a/makefiles/CompileLaunchers.gmk Mon Feb 25 14:19:48 2013 -0800 +++ b/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" }' \
--- a/makefiles/CreateJars.gmk Mon Feb 25 14:19:48 2013 -0800 +++ b/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 ##########################################################################################