This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/master by this push: new acefa19 Allow to postprocess downloaded binaries (#491) acefa19 is described below commit acefa191423bf4ac9522371a07f9de071037ab80 Author: Svatopluk Dedic <svatopluk.de...@oracle.com> AuthorDate: Wed Apr 11 10:54:23 2018 +0200 Allow to postprocess downloaded binaries (#491) Overridable process.release.files with dependencies. Adapted lib.profiler and o.apache.xml.resolver to the new overridable task. --- lib.profiler/build.xml | 9 +-------- nbbuild/templates/projectized.xml | 13 +++++++++---- o.apache.xml.resolver/build.xml | 4 +++- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib.profiler/build.xml b/lib.profiler/build.xml index 1089296..e6c6d8b 100644 --- a/lib.profiler/build.xml +++ b/lib.profiler/build.xml @@ -24,15 +24,8 @@ <import file="../nbbuild/templates/projectized.xml"/> <property name="profiler.cluster" value="./release"/> - <target name="-release.dir" depends="projectized-common.-release.dir,-define-downloadbinaries-task"> - <downloadbinaries cache="${binaries.cache}" server="${binaries.server}"> - <manifest dir="."> - <include name="external/binaries-list"/> - </manifest> - </downloadbinaries> + <target name="-process.release.files"> <unzip src="external/profiler-external-binaries-8.2.zip" dest="${profiler.cluster}"/> - <taskdef name="releasefilesextra" classname="org.netbeans.nbbuild.extlibs.ReleaseFilesExtra" classpath="${nbantext.jar}"/> - <releasefilesextra property="release.files.extra"/> </target> <!-- Compile the JFluid engine system library, that depends on JDK version - so there are two libraries --> diff --git a/nbbuild/templates/projectized.xml b/nbbuild/templates/projectized.xml index a993f77..b112e65 100644 --- a/nbbuild/templates/projectized.xml +++ b/nbbuild/templates/projectized.xml @@ -230,14 +230,19 @@ If you are sure you want to build with JDK 9+ anyway, use: -Dpermit.jdk9.builds= <target name="-define-downloadbinaries-task" unless="have-downloadbinaries-task"> <taskdef name="downloadbinaries" classname="org.netbeans.nbbuild.extlibs.DownloadBinaries" classpath="${nbantext.jar}"/> </target> - - <!-- See: http://wiki.netbeans.org/wiki/view/DevFaqExternalLibrariesUpdated --> - <target name="-release.files" depends="projectized-common.-release.files,-define-downloadbinaries-task"> + + <target name="-process.release.files"/> + + <target name="-download.release.files" depends="-define-downloadbinaries-task"> <downloadbinaries cache="${binaries.cache}" server="${binaries.server}"> <manifest dir="."> <include name="external/binaries-list"/> </manifest> </downloadbinaries> + </target> + + <!-- See: http://wiki.netbeans.org/wiki/view/DevFaqExternalLibrariesUpdated --> + <target name="-release.files" depends="projectized-common.-release.files,-download.release.files,-process.release.files"> <taskdef name="releasefilesextra" classname="org.netbeans.nbbuild.extlibs.ReleaseFilesExtra" classpath="${nbantext.jar}"/> <releasefilesextra property="release.files.extra"/> </target> @@ -811,5 +816,5 @@ If you are sure you want to build with JDK 9+ anyway, use: -Dpermit.jdk9.builds= <arg value="org.codehaus.mojo:nb-repository-plugin:1.3:populate"/> </exec> </target> - + </project> diff --git a/o.apache.xml.resolver/build.xml b/o.apache.xml.resolver/build.xml index 6fb51e4..977594f 100644 --- a/o.apache.xml.resolver/build.xml +++ b/o.apache.xml.resolver/build.xml @@ -58,5 +58,7 @@ </target> <!-- Hook into harness "basic-init" task --> - <target name="-javac-init" depends="-prepare-patched-binary, projectized-common.-javac-init" /> + <target name="-process.release.files" depends="-prepare-patched-binary"/> + + </project> -- To stop receiving notification emails like this one, please contact sde...@apache.org. --------------------------------------------------------------------- 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