1 |
fordfrog 08/12/04 11:57:27 |
2 |
|
3 |
Modified: ChangeLog netbeans-6.5-r2.ebuild |
4 |
Log: |
5 |
Rewritten checking of needed and not specified modules so it should be easier for users to add the missing modules |
6 |
(Portage version: 2.1.6_rc2/cvs/Linux 2.6.27-gentoo x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.96 dev-util/netbeans/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?rev=1.96&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?rev=1.96&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?r1=1.95&r2=1.96 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v |
18 |
retrieving revision 1.95 |
19 |
retrieving revision 1.96 |
20 |
diff -u -r1.95 -r1.96 |
21 |
--- ChangeLog 4 Dec 2008 10:43:17 -0000 1.95 |
22 |
+++ ChangeLog 4 Dec 2008 11:57:27 -0000 1.96 |
23 |
@@ -1,6 +1,10 @@ |
24 |
# ChangeLog for dev-util/netbeans |
25 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.95 2008/12/04 10:43:17 fordfrog Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.96 2008/12/04 11:57:27 fordfrog Exp $ |
28 |
+ |
29 |
+ 04 Dec 2008; Miroslav Šulc <fordfrog@g.o> netbeans-6.5-r2.ebuild: |
30 |
+ Rewritten checking of needed and not specified modules so it should be |
31 |
+ easier for users to add the missing modules |
32 |
|
33 |
04 Dec 2008; Miroslav Šulc <fordfrog@g.o> netbeans-6.5-r2.ebuild: |
34 |
Filtered all ecj compilers |
35 |
|
36 |
|
37 |
|
38 |
1.3 dev-util/netbeans/netbeans-6.5-r2.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-6.5-r2.ebuild?rev=1.3&view=markup |
41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-6.5-r2.ebuild?rev=1.3&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-6.5-r2.ebuild?r1=1.2&r2=1.3 |
43 |
|
44 |
Index: netbeans-6.5-r2.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r2.ebuild,v |
47 |
retrieving revision 1.2 |
48 |
retrieving revision 1.3 |
49 |
diff -u -r1.2 -r1.3 |
50 |
--- netbeans-6.5-r2.ebuild 4 Dec 2008 10:43:17 -0000 1.2 |
51 |
+++ netbeans-6.5-r2.ebuild 4 Dec 2008 11:57:27 -0000 1.3 |
52 |
@@ -1,6 +1,6 @@ |
53 |
# Copyright 1999-2008 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r2.ebuild,v 1.2 2008/12/04 10:43:17 fordfrog Exp $ |
56 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r2.ebuild,v 1.3 2008/12/04 11:57:27 fordfrog Exp $ |
57 |
|
58 |
EAPI="2" |
59 |
WANT_SPLIT_ANT="true" |
60 |
@@ -249,57 +249,57 @@ |
61 |
die |
62 |
fi |
63 |
|
64 |
+ local need_apisupport="0" |
65 |
+ local need_groovy="0" |
66 |
+ local need_gsf="0" |
67 |
+ local need_harness="0" |
68 |
+ local need_ide="0" |
69 |
+ local need_j2ee="0" |
70 |
+ local need_java="0" |
71 |
+ local need_websvccommon="0" |
72 |
+ local need_xml="0" |
73 |
+ |
74 |
# direct deps: ide |
75 |
- if use netbeans_modules_cnd && ! use netbeans_modules_ide ; then |
76 |
- eerror "'cnd' module requires 'ide' module" |
77 |
- die |
78 |
+ if use netbeans_modules_cnd ; then |
79 |
+ need_ide="1" |
80 |
fi |
81 |
|
82 |
# direct deps: gsf, ide, java |
83 |
- if use netbeans_modules_groovy && ! ( \ |
84 |
- use netbeans_modules_gsf && \ |
85 |
- use netbeans_modules_ide && \ |
86 |
- use netbeans_modules_java && \ |
87 |
- use netbeans_modules_websvccommon ) ; then |
88 |
- eerror "'groovy' module requires 'gsf', 'ide', 'java' and 'websvccommon' modules" |
89 |
- die |
90 |
+ if use netbeans_modules_groovy ; then |
91 |
+ need_gsf="1" |
92 |
+ need_ide="1" |
93 |
+ need_java="1" |
94 |
+ need_websvccommon="1" |
95 |
fi |
96 |
|
97 |
# direct deps: ide |
98 |
- if use netbeans_modules_gsf && ! use netbeans_modules_ide ; then |
99 |
- eerror "'gsf' module requires 'ide' module" |
100 |
- die |
101 |
+ if use netbeans_modules_gsf ; then |
102 |
+ need_ide="1" |
103 |
fi |
104 |
|
105 |
# direct deps: gsf, ide, j2ee, java |
106 |
- if use netbeans_modules_identity && ! ( \ |
107 |
- use netbeans_modules_groovy && \ |
108 |
- use netbeans_modules_gsf && \ |
109 |
- use netbeans_modules_ide && \ |
110 |
- use netbeans_modules_j2ee && \ |
111 |
- use netbeans_modules_java && \ |
112 |
- use netbeans_modules_websvccommon ) ; then |
113 |
- eerror "'identity' module requires 'groovy', 'gsf', 'ide', 'j2ee', 'java' and 'websvccommon' modules" |
114 |
- die |
115 |
+ if use netbeans_modules_identity ; then |
116 |
+ need_groovy="1" |
117 |
+ need_gsf="1" |
118 |
+ need_ide="1" |
119 |
+ need_j2ee="1" |
120 |
+ need_java="1" |
121 |
+ need_websvccommon="1" |
122 |
fi |
123 |
|
124 |
# direct deps: groovy, gsf, ide, java |
125 |
- if use netbeans_modules_j2ee && ! ( \ |
126 |
- use netbeans_modules_groovy && \ |
127 |
- use netbeans_modules_gsf && \ |
128 |
- use netbeans_modules_ide && \ |
129 |
- use netbeans_modules_java && \ |
130 |
- use netbeans_modules_websvccommon ) ; then |
131 |
- eerror "'j2ee' module requires 'groovy', 'gsf', 'ide', 'java' and 'websvccommon' modules" |
132 |
- die |
133 |
+ if use netbeans_modules_j2ee ; then |
134 |
+ need_groovy="1" |
135 |
+ need_gsf="1" |
136 |
+ need_ide="1" |
137 |
+ need_java="1" |
138 |
+ need_websvccommon="1" |
139 |
fi |
140 |
|
141 |
# direct deps: ide, websvccommon |
142 |
- if use netbeans_modules_java && ! ( \ |
143 |
- use netbeans_modules_ide && \ |
144 |
- use netbeans_modules_websvccommon ) ; then |
145 |
- eerror "'java' module requires 'ide' and 'websvccommon' module" |
146 |
- die |
147 |
+ if use netbeans_modules_java ; then |
148 |
+ need_ide="1" |
149 |
+ need_websvccommon="1" |
150 |
fi |
151 |
|
152 |
# because of bug http://www.netbeans.org/issues/show_bug.cgi?id=151535 'j2ee' cluster is also |
153 |
@@ -307,46 +307,38 @@ |
154 |
# because of bug http://www.netbeans.org/issues/show_bug.cgi?id=151538 'apisupport' cluster is also |
155 |
# needed to build 'mobility' cluster |
156 |
# direct deps: apisupport, ide, j2ee, java |
157 |
- if use netbeans_modules_mobility && ! ( \ |
158 |
- use netbeans_modules_apisupport && \ |
159 |
- use netbeans_modules_groovy && \ |
160 |
- use netbeans_modules_gsf && \ |
161 |
- use netbeans_modules_harness && \ |
162 |
- use netbeans_modules_ide && \ |
163 |
- use netbeans_modules_j2ee && \ |
164 |
- use netbeans_modules_java && \ |
165 |
- use netbeans_modules_websvccommon ) ; then |
166 |
- eerror "'mobility' module requires 'apisupport', 'groovy', 'gsf', 'harness', 'ide', 'j2ee', 'java' and 'websvccommon' modules" |
167 |
- die |
168 |
+ if use netbeans_modules_mobility ; then |
169 |
+ need_apisupport="1" |
170 |
+ need_groovy="1" |
171 |
+ need_gsf="1" |
172 |
+ need_harness="1" |
173 |
+ need_ide="1" |
174 |
+ need_j2ee="1" |
175 |
+ need_java="1" |
176 |
+ need_websvccommon="1" |
177 |
fi |
178 |
|
179 |
# direct deps: harness, ide |
180 |
- if use netbeans_modules_nb && ! ( \ |
181 |
- use netbeans_modules_harness && \ |
182 |
- use netbeans_modules_ide ) ; then |
183 |
- eerror "'nb' module requires 'harness' and 'ide' module" |
184 |
- die |
185 |
+ if use netbeans_modules_nb ; then |
186 |
+ need_harness="1" |
187 |
+ need_ide="1" |
188 |
fi |
189 |
|
190 |
# direct deps: gsf, ide, websvccommon |
191 |
- if use netbeans_modules_php && ! ( \ |
192 |
- use netbeans_modules_gsf && \ |
193 |
- use netbeans_modules_ide && \ |
194 |
- use netbeans_modules_websvccommon ) ; then |
195 |
- eerror "'php' module requires 'gsf', 'ide' and 'websvccommon' modules" |
196 |
- die |
197 |
+ if use netbeans_modules_php ; then |
198 |
+ need_gsf="1" |
199 |
+ need_ide="1" |
200 |
+ need_websvccommon="1" |
201 |
fi |
202 |
|
203 |
# direct deps: gsf, ide, j2ee, java |
204 |
- if use netbeans_modules_profiler && ! ( \ |
205 |
- use netbeans_modules_groovy && \ |
206 |
- use netbeans_modules_gsf && \ |
207 |
- use netbeans_modules_ide && \ |
208 |
- use netbeans_modules_j2ee && \ |
209 |
- use netbeans_modules_java && \ |
210 |
- use netbeans_modules_websvccommon ) ; then |
211 |
- eerror "'profiler' module requires 'groovy', 'gsf', 'ide', 'j2ee', 'java' and 'websvccommon' modules" |
212 |
- die |
213 |
+ if use netbeans_modules_profiler ; then |
214 |
+ need_groovy="1" |
215 |
+ need_gsf="1" |
216 |
+ need_ide="1" |
217 |
+ need_j2ee="1" |
218 |
+ need_java="1" |
219 |
+ need_websvccommon="1" |
220 |
fi |
221 |
|
222 |
# direct deps: gsf, ide |
223 |
@@ -356,48 +348,56 @@ |
224 |
#fi |
225 |
|
226 |
# direct deps: gsf, ide, j2ee, java, xml |
227 |
- if use netbeans_modules_soa && ! ( \ |
228 |
- use netbeans_modules_groovy && \ |
229 |
- use netbeans_modules_gsf && \ |
230 |
- use netbeans_modules_ide && \ |
231 |
- use netbeans_modules_j2ee && \ |
232 |
- use netbeans_modules_java && \ |
233 |
- use netbeans_modules_websvccommon && \ |
234 |
- use netbeans_modules_xml ) ; then |
235 |
- eerror "'soa' module requires 'groovy', 'gsf', 'ide', 'j2ee', 'java', 'websvccommon' and 'xml' modules" |
236 |
- die |
237 |
+ if use netbeans_modules_soa ; then |
238 |
+ need_groovy="1" |
239 |
+ need_gsf="1" |
240 |
+ need_ide="1" |
241 |
+ need_j2ee="1" |
242 |
+ need_java="1" |
243 |
+ need_websvccommon="1" |
244 |
+ need_xml="1" |
245 |
fi |
246 |
|
247 |
# direct deps: gsf, ide, j2ee, java |
248 |
- if use netbeans_modules_visualweb && ! ( \ |
249 |
- use netbeans_modules_groovy && \ |
250 |
- use netbeans_modules_gsf && \ |
251 |
- use netbeans_modules_ide && \ |
252 |
- use netbeans_modules_j2ee && \ |
253 |
- use netbeans_modules_java && \ |
254 |
- use netbeans_modules_websvccommon ) ; then |
255 |
- eerror "'visualweb' module requires 'groovy', 'gsf', 'ide', 'j2ee', 'java' and 'websvccommon' modules" |
256 |
- die |
257 |
+ if use netbeans_modules_visualweb ; then |
258 |
+ need_groovy="1" |
259 |
+ need_gsf="1" |
260 |
+ need_ide="1" |
261 |
+ need_j2ee="1" |
262 |
+ need_java="1" |
263 |
+ need_websvccommon="1" |
264 |
fi |
265 |
|
266 |
# direct deps: gsf, ide |
267 |
- if use netbeans_modules_webcommon && ! ( \ |
268 |
- use netbeans_modules_gsf && \ |
269 |
- use netbeans_modules_ide ) ; then |
270 |
- eerror "'webcommon' module requires 'gsf' and 'ide' modules" |
271 |
- die |
272 |
+ if use netbeans_modules_webcommon ; then |
273 |
+ need_gsf="1" |
274 |
+ need_ide="1" |
275 |
fi |
276 |
|
277 |
# direct deps: ide |
278 |
- if use netbeans_modules_websvccommon && ! use netbeans_modules_ide ; then |
279 |
- eerror "'websvccommon' module requires 'ide' module" |
280 |
- die |
281 |
+ if use netbeans_modules_websvccommon ; then |
282 |
+ need_ide="1" |
283 |
fi |
284 |
|
285 |
# direct deps: ide |
286 |
- if use netbeans_modules_xml && ! use netbeans_modules_ide ; then |
287 |
- eerror "'xml' module requires 'ide' module" |
288 |
- die |
289 |
+ if use netbeans_modules_xml ; then |
290 |
+ need_ide="1" |
291 |
+ fi |
292 |
+ |
293 |
+ check_use_flag "apisupport" ${need_apisupport} |
294 |
+ check_use_flag "groovy" ${need_groovy} |
295 |
+ check_use_flag "gsf" ${need_gsf} |
296 |
+ check_use_flag "harness" ${need_harness} |
297 |
+ check_use_flag "ide" ${need_ide} |
298 |
+ check_use_flag "j2ee" ${need_j2ee} |
299 |
+ check_use_flag "java" ${need_java} |
300 |
+ check_use_flag "websvccommon" ${need_websvccommon} |
301 |
+ check_use_flag "xml" ${need_xml} |
302 |
+ |
303 |
+ if [ -n "${JAVA_PKG_NB_MISSING_USE_FLAGS}" ] ; then |
304 |
+ eerror "You need to add these modules to NETBEANS_MODULES because they are needed by modules you have selected" |
305 |
+ eerror " Missing NETBEANS_MODULES: ${JAVA_PKG_NB_MISSING_USE_FLAGS}" |
306 |
+ die "Missing NETBEANS_MODULES" |
307 |
fi |
308 |
|
309 |
if ! use netbeans_modules_nb ; then |
310 |
@@ -1115,3 +1115,20 @@ |
311 |
eant ${1} -Dlocales=${2} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \ |
312 |
-f l10n/build.xml build |
313 |
} |
314 |
+ |
315 |
+# Checks whether USE flag should be set and outputs error if it is not set |
316 |
+# Arguments |
317 |
+# 1 - netbeans module |
318 |
+# 2 - required status (1 = required) |
319 |
+check_use_flag() { |
320 |
+ local module=${1} |
321 |
+ local required=${2} |
322 |
+ |
323 |
+ if [ "${required}" == "1" ] ; then |
324 |
+ if [ -z "${JAVA_PKG_NB_MISSING_USE_FLAGS}" ] ; then |
325 |
+ JAVA_PKG_NB_MISSING_USE_FLAGS="${module}" |
326 |
+ else |
327 |
+ JAVA_PKG_NB_MISSING_USE_FLAGS="${JAVA_PKG_NB_MISSING_USE_FLAGS} ${module}" |
328 |
+ fi |
329 |
+ fi |
330 |
+} |