Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added tasks for JDK's jmod and jlink tools. #80

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CONTRIBUTORS
Expand Up @@ -76,6 +76,7 @@ Costin Manolache
Craeg Strong
Craig Cottingham
Craig R. McClanahan
Craig Pell
Craig Richardson
Craig Ryan
Craig Sandvik
Expand Down
2 changes: 2 additions & 0 deletions WHATSNEW
Expand Up @@ -71,6 +71,8 @@ Other changes:
loading resources at runtime in Java 9+ runtime environments.
Bugzilla Report 62952

* Added jmod and link tasks, to support jmod and jlink tools of JDK 9+.


Changes from Ant 1.10.4 TO Ant 1.10.5
=====================================
Expand Down
6 changes: 6 additions & 0 deletions build.xml
Expand Up @@ -42,6 +42,7 @@
<property name="ant.package" value="org/apache/tools/ant"/>
<property name="taskdefs.package" value="${ant.package}/taskdefs"/>
<property name="condition.package" value="${taskdefs.package}/condition"/>
<property name="modules.package" value="${taskdefs.package}/modules"/>
<property name="optional.package" value="${taskdefs.package}/optional"/>
<property name="type.package" value="${ant.package}/types"/>
<property name="optional.type.package" value="${type.package}/optional"/>
Expand Down Expand Up @@ -178,6 +179,10 @@
===================================================================
-->

<selector id="needs.jdk9+">
<filename name="${modules.package}/"/>
</selector>

<!-- Kaffe has some JDK 1.5 features including java.lang.Readable,
but not all of them -->
<selector id="not.in.kaffe">
Expand Down Expand Up @@ -609,6 +614,7 @@
<selector id="conditional-patterns">
<not>
<or>
<selector refid="needs.jdk9+" unless="jdk9+"/>
<selector refid="not.in.kaffe" if="kaffe"/>
<selector refid="needs.apache-resolver" unless="apache.resolver.present"/>
<selector refid="needs.junit" unless="junit.present"/> <!-- TODO should perhaps use -source 1.4? -->
Expand Down
4 changes: 4 additions & 0 deletions contributors.xml
Expand Up @@ -329,6 +329,10 @@
<first>Craig</first>
<last>Cottingham</last>
</name>
<name>
<first>Craig</first>
<last>Pell</last>
</name>
<name>
<first>Craig</first>
<middle>R.</middle>
Expand Down
7 changes: 6 additions & 1 deletion manual/Tasks/jlink.html
Expand Up @@ -26,9 +26,14 @@ <h3><em><u>Deprecated</u></em></h3>
<p><em>This task has been <u>deprecated</u>. Use a <a href="../Types/zipfileset.html">zipfileset</a>
or <a href="../Tasks/zip.html#zipgroupfileset">zipgroupfileset</a> with
the <a href="../Tasks/jar.html">Jar task</a> or <a href="../Tasks/zip.html">Zip task</a>
instead.</em></p>
instead. For a task based on the JDK's jlink tool, see
<a href="link.html">Link</a>.</em></p>

<h3>Description</h3>
<p><strong>For a task based on the JDK's jlink tool, see
<a href="link.html">Link</a>. This task is for something else
entirely.</strong></p>

<p>Links entries from sub-builds and libraries.</p>

<p>The <code>jlink</code> task can be used to build jar and zip files, similar to
Expand Down