sdedic closed pull request #491: Allow to postprocess downloaded binaries
URL: https://github.com/apache/incubator-netbeans/pull/491
 
 
   

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/lib.profiler/build.xml b/lib.profiler/build.xml
index 10892968f..e6c6d8b3d 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 a993f77a4..b112e65cf 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 6fb51e407..977594f3d 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>


 

----------------------------------------------------------------
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:
us...@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@netbeans.apache.org
For additional commands, e-mail: notifications-h...@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists

Reply via email to