diff --git a/doc/nashorn/genshelldoc.js b/doc/nashorn/genshelldoc.js deleted file mode 100644 index 964735129a5..00000000000 --- a/doc/nashorn/genshelldoc.js +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/** - * Generate HTML documentation for shell tool. Re-run this tool to regenerate - * html doc when you change options. - * - * Usage: - * - * jjs -scripting genshelldoc.js > shell.html - */ - -var Options = Packages.jdk.nashorn.internal.runtime.options.Options; -var title = "Nashorn command line shell tool"; - -print(< - - -${title} - - - -

Usage

-

- -jjs <options> <script-files> [ -- <script-arguments> ] - -

- -

${title} options

- - - - - - - - -PREFIX); - -for each (opt in Options.validOptions) { - -var isTimezone = (opt.type == "timezone"); -var defValue = opt.defaultValue; -if (defValue == null) { - defValue = "<none>"; -} - -if (isTimezone) { - // don't output current user's timezone - defValue = "<default-timezone>" -} - -print(< - - - - - -ROW); - -} - -print(< - - -SUFFIX); diff --git a/make/nashorn/build.xml b/make/nashorn/build.xml index d128870764c..49fffbc7d42 100644 --- a/make/nashorn/build.xml +++ b/make/nashorn/build.xml @@ -271,17 +271,16 @@ + additionalparam="-quiet" failonerror="true" useexternalfile="true"> + + + + - - - + - - - - + @@ -290,14 +289,15 @@ + + + + - + - - - @@ -309,30 +309,22 @@ + + + + - + - - - - + - - - - - - - - - - + @@ -614,7 +606,7 @@ grant codeBase "file:/${basedir}/${test.script.dir}/basic/JDK-8158467.js" { - + @@ -752,7 +744,7 @@ grant codeBase "file:/${basedir}/${test.script.dir}/basic/JDK-8158467.js" { - + @@ -761,7 +753,7 @@ grant codeBase "file:/${basedir}/${test.script.dir}/basic/JDK-8158467.js" { - + diff --git a/make/nashorn/project.properties b/make/nashorn/project.properties index de829ab0752..6c3e02f0518 100644 --- a/make/nashorn/project.properties +++ b/make/nashorn/project.properties @@ -60,7 +60,7 @@ nashorn.override.option=\ --patch-module jdk.dynalink=${build.classes.dir}/jdk.dynalink # project directory of ant task -nashorntask.dir=buildtools/nashorntask +nashorntask.dir=${nashorn.make.dir}/buildtools/nashorntask # nashorn Shell tool nashorn.shell.tool=jdk.nashorn.tools.Shell
nametypedefaultdescription
${opt.name} ${opt.shortName == null? "" : opt.shortName}${opt.type}${defValue}${opt.description}