You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ge...@apache.org on 2019/09/01 14:16:33 UTC
[netbeans] branch geertjanw-patch-3 updated: [NETBEANS-1097] Copy
the libs when module-info is not present and do not copy them if it is
present. (#1469)
This is an automated email from the ASF dual-hosted git repository.
geertjan pushed a commit to branch geertjanw-patch-3
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/geertjanw-patch-3 by this push:
new 3b8ad15 [NETBEANS-1097] Copy the libs when module-info is not present and do not copy them if it is present. (#1469)
3b8ad15 is described below
commit 3b8ad151a3306639102bfdad1dce015510d8f5ad
Author: Jan Lahoda <jl...@netbeans.org>
AuthorDate: Sun Sep 1 16:16:26 2019 +0200
[NETBEANS-1097] Copy the libs when module-info is not present and do not copy them if it is present. (#1469)
---
.../java/j2seproject/resources/build-impl.xsl | 29 ++++++++++++++--------
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/resources/build-impl.xsl b/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/resources/build-impl.xsl
index e1474c7..474263f 100644
--- a/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/resources/build-impl.xsl
+++ b/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/resources/build-impl.xsl
@@ -294,15 +294,6 @@ is divided into following sections:
<istrue value="${{not.archive.disabled}}" />
</or>
</condition>
- <condition property="do.mkdist">
- <and>
- <isset property="do.archive"/>
- <isset property="libs.CopyLibs.classpath"/>
- <not>
- <istrue value="${{mkdist.disabled}}"/>
- </not>
- </and>
- </condition>
<condition property="do.archive+manifest.available">
<and>
<isset property="manifest.available"/>
@@ -2199,8 +2190,24 @@ is divided into following sections:
</manifest>
</target>
+ <target name="-check-do-mkdist">
+ <xsl:attribute name="depends">init,compile</xsl:attribute>
+ <condition property="do.mkdist">
+ <and>
+ <isset property="do.archive"/>
+ <isset property="libs.CopyLibs.classpath"/>
+ <not>
+ <istrue value="${{mkdist.disabled}}"/>
+ </not>
+ <not>
+ <available file="${{build.classes.dir}}/module-info.class"/>
+ </not>
+ </and>
+ </condition>
+ </target>
+
<target name="-do-jar-copylibs">
- <xsl:attribute name="depends">init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen</xsl:attribute>
+ <xsl:attribute name="depends">init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-check-do-mkdist</xsl:attribute>
<xsl:attribute name="if">do.mkdist</xsl:attribute>
<j2seproject3:copylibs manifest="${{tmp.manifest.file}}"/>
<echo level="info">To run this application from the command line without Ant, try:</echo>
@@ -2212,7 +2219,7 @@ is divided into following sections:
</target>
<target name="-do-jar-jar">
- <xsl:attribute name="depends">init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen</xsl:attribute>
+ <xsl:attribute name="depends">init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-check-do-mkdist</xsl:attribute>
<xsl:attribute name="if">do.archive</xsl:attribute>
<xsl:attribute name="unless">do.mkdist</xsl:attribute>
<j2seproject1:jar manifest="${{tmp.manifest.file}}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists