This is an automated email from the ASF dual-hosted git repository. jtulach 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 f2ae35e [NETBEAN-3230] - remove ht-clean target from build.xml new 0dc17cf Merge pull request #1564 from BradWalker/cleanup_build_xml f2ae35e is described below commit f2ae35eae4e95e59dc1262ffea0a356a7cd992f8 Author: Brad Walker <bwal...@musings.com> AuthorDate: Thu Oct 10 13:44:00 2019 -0600 [NETBEAN-3230] - remove ht-clean target from build.xml The Netbeans project no longer uses Mercurial as it's primary source code control system. It's not all managed in a Git repo. Therefore, we no longer need to carry around the technical debt in build.xml.. --- nbbuild/build.xml | 60 +------------------------------------------------------ 1 file changed, 1 insertion(+), 59 deletions(-) diff --git a/nbbuild/build.xml b/nbbuild/build.xml index aeb09df..e2f14db 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -1279,9 +1279,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d </target> <target name="clean" depends="-init-clean,bootstrap" description="Clean everything possible."> - <taskdef name="try-else" classname="org.netbeans.nbbuild.TryElse" classpath="${nbantext.jar}"/> - <property name="vanilla.javac.exists" value="true"/> - <try-else first="-hg-clean" second="-real-clean"/> + <antcall target="-real-clean"></antcall> </target> <target name="-clean-external"> @@ -1339,62 +1337,6 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <delete dir="${netbeans.dest.dir}"/> </target> - <target name="-hg-clean"> - <fail message="Not running in a Mercurial checkout."> - <condition> - <not> - <available type="dir" file="../.hg"/> - </not> - </condition> - </fail> - <taskdef name="hgexec" classname="org.netbeans.nbbuild.HgExec" classpath="${nbantext.jar}"/> - <antcall target="-do-hg-clean"> - <!-- <include name="."/> does not seem to work in a dirset --> - <param name="basedir" location=".."/> - </antcall> - <subant target="-do-hg-clean" genericantfile="build.xml"> - <dirset dir=".."> - <include name="contrib"/> - <include name="otherlicenses"/> - </dirset> - </subant> - <delete> - <fileset dir="nbproject"> - <include name="private/scan-cache-*"/> - </fileset> - </delete> - </target> - <target name="-do-hg-clean"> - <echo>Cleaning untracked files in ${basedir}...</echo> - <hgexec failonerror="yes" outputproperty="hg.unknown.files"> - <arg value="--cwd"/> - <arg file="."/> - <arg value="--config"/> - <arg value="defaults.status="/> - <arg value="status"/> - <arg value="--unknown"/> - <arg value="--no-status"/> - </hgexec> - <fail message="Will not run clean; checkout contains unknown and not ignored files (did you forget to hg add?): ${hg.unknown.files}"> - <condition> - <not> - <equals arg1="${hg.unknown.files}" arg2=""/> - </not> - </condition> - </fail> - <hgexec failonerror="yes"> - <arg value="--cwd"/> - <arg file="."/> - <arg value="--config"/> - <arg value="extensions.purge="/> - <arg value="clean"/> - <arg value="--all"/> - <arg value="--exclude"/> - <!-- Do not use **/nbproject/private/ as this will match some test/{results,work} dirs: --> - <arg value="glob:{*/nbproject/private/**,*/*/nbproject/private/**,**/user.build.properties}"/> - </hgexec> - </target> - <target name="rebuild-cluster" depends="init" description="Builds only one cluster with dependencies ; takes e.g. '-Drebuild.cluster.name=nb.cluster.java' as parameter"> <delete file="netbeans/${rebuild.cluster.name}.built" failonerror="false"/> <condition property="rebuild.cluster.name" value="nb.cluster.${name}"> --------------------------------------------------------------------- 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