8187782: no ant build artifact should be produced under make/nashorn directory

Reviewed-by: hannesw, jlaskey
This commit is contained in:
Athijegannathan Sundararajan 2017-09-21 18:00:44 +05:30
parent 1cb97b8378
commit 0f4c864067
4 changed files with 15 additions and 13 deletions

@ -219,7 +219,8 @@
<target name="-define-nashorn-task">
<ant dir="${nashorntask.dir}" inheritAll="false"/>
<taskdef name="nashorn" classname="jdk.nashorn.ant.NashornTask" classpath="${nashorntask.dir}/dist/nashorntask.jar"/>
<taskdef name="nashorn" classname="jdk.nashorn.ant.NashornTask"
classpath="${nashorntask.dist.dir}/nashorntask.jar"/>
</target>
<!--

@ -27,18 +27,18 @@
</target>
<target name="prepare" depends="init">
<mkdir dir="${build.classes.dir}"/>
<mkdir dir="${dist.dir}"/>
<mkdir dir="${nashorntask.build.classes.dir}"/>
<mkdir dir="${nashorntask.dist.dir}"/>
</target>
<target name="clean" depends="init">
<delete dir="${build.dir}"/>
<delete dir="${dist.dir}"/>
<delete dir="${nashorntask.build.dir}"/>
<delete dir="${nashorntask.dist.dir}"/>
</target>
<target name="compile" depends="prepare" description="Compiles the nashorn ant tag sources">
<javac srcdir="${src.dir}"
destdir="${build.classes.dir}"
destdir="${nashorntask.build.classes.dir}"
debug="${javac.debug}"
includeantruntime="true">
<compilerarg value="-Xlint:unchecked"/>
@ -47,7 +47,7 @@
</target>
<target name="jar" depends="compile" description="Creates nashorntask.jar">
<jar jarfile="${dist.jar}" basedir="${build.classes.dir}"/>
<jar jarfile="${nashorntask.dist.jar}" basedir="${nashorntask.build.classes.dir}"/>
</target>
<target name="dist" depends="jar"/>

@ -27,14 +27,14 @@ build.compiler=modern
javac.source=1.8
javac.target=1.8
build.classes.dir=${build.dir}/classes
# This directory is removed when the project is cleaned:
nashorntask.build.dir=../../../../build/nashorn/nashorntask
nashorntask.build.classes.dir=${nashorntask.build.dir}/classes
# This directory is removed when the project is cleaned:
build.dir=build
# This directory is removed when the project is cleaned:
dist.dir=dist
dist.jar=${dist.dir}/nashorntask.jar
dist.javadoc.dir=${dist.dir}/javadoc
nashorntask.dist.dir=${nashorntask.build.dir}/dist
nashorntask.dist.jar=${nashorntask.dist.dir}/nashorntask.jar
nashorntask.dist.javadoc.dir=${nashorntask.dist.dir}/javadoc
javac.debug=true
src.dir=src

@ -61,6 +61,7 @@ nashorn.override.option=\
# project directory of <nashorn> ant task
nashorntask.dir=${nashorn.make.dir}/buildtools/nashorntask
nashorntask.dist.dir=${build.dir}/nashorntask/dist
# nashorn Shell tool
nashorn.shell.tool=jdk.nashorn.tools.Shell