changeset 2257:24efaaddd376

8165595: Main class should be set for nashorn modules Reviewed-by: jlaskey, erikj
author sundar
date Thu, 08 Sep 2016 14:35:02 +0530
parents 82b94cb5f342
children 6e62bbd02e6b
files make/CreateJmods.gmk
diffstat 1 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/make/CreateJmods.gmk	Mon Sep 05 10:10:29 2016 +0200
+++ b/make/CreateJmods.gmk	Thu Sep 08 14:35:02 2016 +0530
@@ -82,6 +82,14 @@
   endif
 endif
 
+ifeq ($(MODULE), jdk.scripting.nashorn.shell)
+  JMOD_FLAGS += --main-class jdk.nashorn.tools.jjs.Main
+endif
+
+ifeq ($(MODULE), jdk.scripting.nashorn)
+  JMOD_FLAGS += --main-class jdk.nashorn.tools.Shell
+endif
+
 # Changes to the jmod tool itself should also trigger a rebuild of all jmods.
 # The variable JMOD_CMD could contain an environment variable assignment before
 # the actual command. Filter that out using wildcard before adding to DEPS.