Gentoo Archives: gentoo-commits

From: "Miroslav Sulc (fordfrog)" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-util/netbeans/files/6.9: nbbuild_build.xml.patch nbbuild_templates_projectized.xml.patch
Date: Wed, 28 Apr 2010 12:27:52
Message-Id: 20100428122748.A5DF32C063@corvid.gentoo.org
1 fordfrog 10/04/28 12:27:48
2
3 Added: nbbuild_build.xml.patch
4 nbbuild_templates_projectized.xml.patch
5 Log:
6 Added Netbeans 6.9 beta release
7 (Portage version: 2.1.8.3/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 dev-util/netbeans/files/6.9/nbbuild_build.xml.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/files/6.9/nbbuild_build.xml.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/files/6.9/nbbuild_build.xml.patch?rev=1.1&content-type=text/plain
14
15 Index: nbbuild_build.xml.patch
16 ===================================================================
17 --- nbbuild/build.xml.orig 2010-04-23 03:36:06.000000000 +0200
18 +++ nbbuild/build.xml 2010-04-23 03:36:49.000000000 +0200
19 @@ -82,13 +82,6 @@
20 <validate-hg-configuration root=".."/>
21 <taskdef name="deregisterexternalhook" classname="org.netbeans.nbbuild.extlibs.DeregisterExternalHook" classpath="build/antclasses"/>
22 <deregisterexternalhook root=".."/>
23 - <taskdef name="downloadbinaries" classname="org.netbeans.nbbuild.extlibs.DownloadBinaries" classpath="build/antclasses"/>
24 - <downloadbinaries cache="${binaries.cache}" server="${binaries.server}">
25 - <manifest dir="${nb_all}">
26 - <include name="apisupport.harness/external/binaries-list"/>
27 - <include name="javahelp/external/binaries-list"/>
28 - </manifest>
29 - </downloadbinaries>
30
31 <echo message="Bootstrapping NetBeans-specific Ant extensions..."/>
32 <path id="bootstrap-cp">
33 @@ -121,12 +114,6 @@
34
35 <target name="download-all-extbins" unless="ext.binaries.downloaded" depends="bootstrap">
36 <echo>Downloading external binaries (*/external/ directories)...</echo>
37 - <downloadbinaries cache="${binaries.cache}" server="${binaries.server}">
38 - <manifest dir="${nb_all}">
39 - <include name="*/external/binaries-list"/>
40 - <include name="contrib/*/external/binaries-list"/>
41 - </manifest>
42 - </downloadbinaries>
43 <property name="ext.binaries.downloaded" value="true"/>
44 </target>
45
46 @@ -139,9 +126,6 @@
47 <map from="${nb_all}/" to=""/>
48 <globmapper from="*" to="*/external/binaries-list"/>
49 </pathconvert>
50 - <downloadbinaries cache="${binaries.cache}" server="${binaries.server}">
51 - <manifest dir="${nb_all}" includes="${modules.binaries-list}"/>
52 - </downloadbinaries>
53 </target>
54
55 <target name="init-module-list" depends="bootstrap,init-tasks">
56 @@ -1060,13 +1044,6 @@
57 <include name="contrib/*/external/build.xml"/>
58 </fileset>
59 </subant>
60 - <taskdef name="downloadbinaries" classname="org.netbeans.nbbuild.extlibs.DownloadBinaries" classpath="nbantext.jar"/>
61 - <downloadbinaries cache="${binaries.cache}" server="${binaries.server}" clean="true">
62 - <manifest dir="${nb_all}">
63 - <include name="*/external/binaries-list"/>
64 - <include name="contrib/*/external/binaries-list"/>
65 - </manifest>
66 - </downloadbinaries>
67 </target>
68
69 <target name="-real-clean" depends="-cleanall,localclean,-clean-external">
70
71
72
73 1.1 dev-util/netbeans/files/6.9/nbbuild_templates_projectized.xml.patch
74
75 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/files/6.9/nbbuild_templates_projectized.xml.patch?rev=1.1&view=markup
76 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/files/6.9/nbbuild_templates_projectized.xml.patch?rev=1.1&content-type=text/plain
77
78 Index: nbbuild_templates_projectized.xml.patch
79 ===================================================================
80 --- nbbuild/templates/projectized.xml.orig 2010-04-23 03:47:04.000000000 +0200
81 +++ nbbuild/templates/projectized.xml 2010-04-23 03:47:16.000000000 +0200
82 @@ -81,12 +81,6 @@
83 </target>
84
85 <target name="build-init" depends="basic-init,jdk-6-check,set-buildnumber">
86 - <taskdef name="downloadbinaries" classname="org.netbeans.nbbuild.extlibs.DownloadBinaries" classpath="${nb_all}/nbbuild/nbantext.jar"/>
87 - <downloadbinaries cache="${binaries.cache}" server="${binaries.server}">
88 - <manifest dir=".">
89 - <include name="external/binaries-list"/>
90 - </manifest>
91 - </downloadbinaries>
92 <property name="public.package.jar.dir" location="${nb_all}/nbbuild/build/public-package-jars"/>
93 <mkdir dir="${public.package.jar.dir}"/>
94 <property name="test.dist.dir" location="${nb_all}/nbbuild/build/testdist"/>