sdedic closed pull request #362: ant update was broken
URL: https://github.com/apache/incubator-netbeans/pull/362
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index e77a2667c..4f753a2b5 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -321,12 +321,13 @@
<!-- Use of nbmerge target has the effect of automatically depending on
all-X for every module. -->
<!-- It also runs deltree(dir=wherever) and
copydir(src=../X/netbeans,dest=wherever) to create the IDE install. -->
- <target name="build-nozip"
depends="init,download-selected-extbins,clean-cluster-flags,build-clusters,create-mandatory-files-for-binary,create-netbeans-import,finish-build-platform,finish-build-nb,add-junit"
description="Build the IDE but do not create a final ZIP file."/>
+ <target name="build-nozip"
depends="init,download-selected-extbins,clean-cluster-flags,build-clusters,create-mandatory-files-for-binary,create-netbeans-import,finish-build,add-junit"
description="Build the IDE but do not create a final ZIP file."/>
<target name="-check-nb-cluster" depends="init">
<condition property="has.nb.cluster">
<contains string="${nb.clusters.list}" substring="nb.cluster.nb" />
</condition>
</target>
+ <target name="finish-build" depends="finish-build-platform,finish-build-nb"/>
<target name="finish-build-platform" depends="init,-check-nb-cluster"
unless="has.nb.cluster">
<copy file="../o.n.bootstrap/readme/README-bin.txt"
tofile="${netbeans.dest.dir}/README.txt" overwrite="true"/>
<fixcrlf eol="lf" srcdir="${netbeans.dest.dir}" >
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
