aboutsummaryrefslogtreecommitdiff
blob: 54958e2da48ed37dd063411295248bd363f66096 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
--- nbbuild/build.xml.orig	2010-06-22 18:39:18.000000000 +0200
+++ nbbuild/build.xml	2010-06-22 19:05:03.000000000 +0200
@@ -85,13 +85,6 @@
     <validate-hg-configuration root=".."/>
     <taskdef name="deregisterexternalhook" classname="org.netbeans.nbbuild.extlibs.DeregisterExternalHook" classpath="build/antclasses"/>
     <deregisterexternalhook root=".."/>
-    <taskdef name="downloadbinaries" classname="org.netbeans.nbbuild.extlibs.DownloadBinaries" classpath="build/antclasses"/>
-    <downloadbinaries cache="${binaries.cache}" server="${binaries.server}">
-        <manifest dir="${nb_all}">
-            <include name="apisupport.harness/external/binaries-list"/>
-            <include name="javahelp/external/binaries-list"/>
-        </manifest>
-    </downloadbinaries>
 
     <echo message="Bootstrapping NetBeans-specific Ant extensions..."/>
     <path id="bootstrap-cp">
@@ -124,12 +117,6 @@
 
   <target name="download-all-extbins" unless="ext.binaries.downloaded" depends="bootstrap">
     <echo>Downloading external binaries (*/external/ directories)...</echo>
-    <downloadbinaries cache="${binaries.cache}" server="${binaries.server}">
-        <manifest dir="${nb_all}">
-            <include name="*/external/binaries-list"/>
-            <include name="contrib/*/external/binaries-list"/>
-        </manifest>
-    </downloadbinaries>
     <property name="ext.binaries.downloaded" value="true"/>
   </target>
 
@@ -142,9 +129,6 @@
         <map from="${nb_all}/" to=""/>
         <globmapper from="*" to="*/external/binaries-list"/>
     </pathconvert>
-    <downloadbinaries cache="${binaries.cache}" server="${binaries.server}">
-        <manifest dir="${nb_all}" includes="${modules.binaries-list}"/>
-    </downloadbinaries>
   </target>
 
   <target name="init-module-list" depends="bootstrap,init-tasks">
@@ -1064,13 +1048,6 @@
         <include name="contrib/*/external/build.xml"/>
       </fileset>
     </subant>
-    <taskdef name="downloadbinaries" classname="org.netbeans.nbbuild.extlibs.DownloadBinaries" classpath="nbantext.jar"/>
-    <downloadbinaries cache="${binaries.cache}" server="${binaries.server}" clean="true">
-        <manifest dir="${nb_all}">
-            <include name="*/external/binaries-list"/>
-            <include name="contrib/*/external/binaries-list"/>
-        </manifest>
-    </downloadbinaries>
   </target>
 
   <target name="-real-clean" depends="-cleanall,localclean,-clean-external">