This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push: new 51cafef NETBEANS-1097 "Copy Dependent Libraries" does not work if "Source/Binary Format" is greater than JDK 8 51cafef is described below commit 51cafef54cf075605eea29f1b2f1516af4024658 Author: Geertjan Wielenga <geertjan.wiele...@oracle.com> AuthorDate: Mon Sep 2 05:14:50 2019 +0100 NETBEANS-1097 "Copy Dependent Libraries" does not work if "Source/Binary Format" is greater than JDK 8 --- .../java/j2seproject/resources/build-impl.xsl | 32 ++++++++++++---------- 1 file changed, 18 insertions(+), 14 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 395a993..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,18 +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> - <not> - <istrue value="${{modules.supported.internal}}"/> - </not> - </and> - </condition> <condition property="do.archive+manifest.available"> <and> <isset property="manifest.available"/> @@ -2202,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> @@ -2215,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-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists