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.

Sign up for GitHub

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

Jump to bottom

[NETBEANS-1097] Copy the libs when module-info is not present and do … #1469

Merged
merged 1 commit into from Sep 1, 2019
Merged

[NETBEANS-1097] Copy the libs when module-info is not present and do … #1469

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 18 additions & 11 deletions java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/resources/build-impl.xsl
View file
Open in desktop
Expand Up @@ -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"/>
Expand Down Expand Up @@ -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>
Expand All @@ -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}}"/>
Expand Down