Skip to content

Commit

Permalink
Remove extra whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
szegedi committed Nov 17, 2020
1 parent 1b32647 commit c0f0577
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
22 changes: 11 additions & 11 deletions make/nashorn/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<!-- set default values to run.test.jvmargs.external property -->
<condition property="run.test.jvmargs.external" value="">
<not><isset property="run.test.jvmargs.external"/></not>
</condition>
</condition>
<!-- loading locally defined resources and properties. NB they owerwrite default ones defined later -->
<property file="${user.home}/.nashorn.project.local.properties"/>

Expand Down Expand Up @@ -114,7 +114,7 @@
</not>
</condition>
</target>


<!-- check minimum ant version required to be 1.9.9 -->
<target name="check-ant-version">
Expand Down Expand Up @@ -161,7 +161,7 @@
<mkdir dir="${dist.javadoc.dir}"/>
<property name="dist.dir.resolved" location="${dist.dir}"/>
</target>

<target name="get-deps" depends="prepare">
<property name="asm.version" value="7.3.1"/>
<property name="asm.url" value="${repo.url}/org/ow2/asm"/>
Expand All @@ -173,7 +173,7 @@
<url url="${asm.url}/asm-util/${asm.version}/asm-util-${asm.version}.jar"/>
</get>
</target>

<target name="clean" depends="init, clean-nasgen, init-cc-cleanup">
<delete includeemptydirs="true">
<fileset dir="${build.dir}" erroronmissingdir="false"/>
Expand Down Expand Up @@ -210,8 +210,8 @@
<echo file="${nashorn.module.classes.dir}/org/openjdk/nashorn/internal/runtime/resources/version.properties" append="true">${line.separator}</echo>
<echo message="version_short=${nashorn.version}" file="${nashorn.module.classes.dir}/org/openjdk/nashorn/internal/runtime/resources/version.properties" append="true"/>
</target>
<target name="compile-shell" depends="jar-nashorn">

<target name="compile-shell" depends="jar-nashorn">
<javac srcdir="${nashorn.shell.module.src.dir}"
destdir="${nashorn.shell.module.classes.dir}"
debug="${javac.debug}"
Expand Down Expand Up @@ -244,15 +244,15 @@
</manifest>
</jar>
</target>

<target name="jar-shell" depends="compile-shell">
<jar jarfile="${jjs.jar}">
<fileset dir="${nashorn.shell.module.classes.dir}"/>
</jar>
</target>

<target name="jar" depends="jar-nashorn, jar-shell"/>

<!-- generate javadoc for Nashorn classes -->
<target name="javadoc" depends="jar-nashorn" unless="test.class">
<javadoc destdir="${dist.javadoc.dir}" use="yes"
Expand All @@ -270,7 +270,7 @@
<target name="artifacts" depends="jar-nashorn, javadoc">
<property name="artifacts.dir" location="${build.dir}/artifacts"/>
<mkdir dir="${artifacts.dir}"/>

<property name="resolved.pom.file" location="${artifacts.dir}/nashorn-core-${nashorn.version}.pom"/>
<copy file="${nashorn.jar}" tofile="${artifacts.dir}/nashorn-core-${nashorn.version}.jar" force="true"/>
<copy file="make/nashorn/nashorn-core.pom" tofile="${resolved.pom.file}"/>
Expand Down Expand Up @@ -298,8 +298,8 @@
debug="${javac.debug}"
encoding="${javac.encoding}"
includeantruntime="false" fork="true">
<compilerarg line="--module-path ${deps.dir}:${dist.dir.resolved}"/>
<compilerarg line="--add-modules org.openjdk.nashorn"/>
<compilerarg line="--module-path ${deps.dir}:${dist.dir.resolved}"/>
<compilerarg line="--add-modules org.openjdk.nashorn"/>
<compilerarg value="-Xlint:unchecked"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xdiags:verbose"/>
Expand Down
4 changes: 2 additions & 2 deletions make/nashorn/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ test.module.imports.compile.time=\
--add-exports org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime.regexp=ALL-UNNAMED \
--add-exports org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime.regexp.joni=ALL-UNNAMED \
--add-exports org.openjdk.nashorn/org.openjdk.nashorn.tools=ALL-UNNAMED

test.module.imports.runtime=\
${test.module.imports.compile.time} \
--add-opens org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime=ALL-UNNAMED \
Expand Down Expand Up @@ -271,7 +271,7 @@ test262-test-sys-prop.test.js.enable.strict.mode=true
test262-test-sys-prop.test.js.exclude.list=\
${test262.suite.dir}/ch07/7.4/S7.4_A6.js \
${test262.suite.dir}/ch07/7.8/7.8.5/S7.8.5_A1.4_T2.js \
${test262.suite.dir}/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-170.js
${test262.suite.dir}/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-170.js

# list of test262 test dirs to be excluded
test262-test-sys-prop.test.js.exclude.dir=\
Expand Down
2 changes: 1 addition & 1 deletion src/org.openjdk.nashorn/share/classes/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
requires org.objectweb.asm;
requires org.objectweb.asm.commons;
requires org.objectweb.asm.util;

requires transitive java.scripting;

exports org.openjdk.nashorn.api.scripting;
Expand Down

0 comments on commit c0f0577

Please sign in to comment.