| 1 |
fordfrog 09/05/02 23:13:31 |
| 2 |
|
| 3 |
Modified: ChangeLog Manifest netbeans-6.7_beta-r1.ebuild |
| 4 |
Log: |
| 5 |
netbeans-6.7_beta-r1: Fixed and improved documentation building |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.107 dev-util/netbeans/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?rev=1.107&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?rev=1.107&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?r1=1.106&r2=1.107 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v |
| 17 |
retrieving revision 1.106 |
| 18 |
retrieving revision 1.107 |
| 19 |
diff -u -r1.106 -r1.107 |
| 20 |
--- ChangeLog 2 May 2009 19:09:23 -0000 1.106 |
| 21 |
+++ ChangeLog 2 May 2009 23:13:31 -0000 1.107 |
| 22 |
@@ -1,6 +1,10 @@ |
| 23 |
# ChangeLog for dev-util/netbeans |
| 24 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.106 2009/05/02 19:09:23 fordfrog Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.107 2009/05/02 23:13:31 fordfrog Exp $ |
| 27 |
+ |
| 28 |
+ 02 May 2009; Miroslav Šulc <fordfrog@g.o> |
| 29 |
+ netbeans-6.7_beta-r1.ebuild: |
| 30 |
+ Fixed and improved documentation building |
| 31 |
|
| 32 |
02 May 2009; Miroslav Šulc <fordfrog@g.o> |
| 33 |
netbeans-6.7_beta-r1.ebuild: |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.136 dev-util/netbeans/Manifest |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/Manifest?rev=1.136&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/Manifest?rev=1.136&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/Manifest?r1=1.135&r2=1.136 |
| 42 |
|
| 43 |
Index: Manifest |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/netbeans/Manifest,v |
| 46 |
retrieving revision 1.135 |
| 47 |
retrieving revision 1.136 |
| 48 |
diff -u -r1.135 -r1.136 |
| 49 |
--- Manifest 2 May 2009 19:10:17 -0000 1.135 |
| 50 |
+++ Manifest 2 May 2009 23:13:31 -0000 1.136 |
| 51 |
@@ -24,6 +24,6 @@ |
| 52 |
EBUILD netbeans-3.6-r1.ebuild 3140 RMD160 ccfc3af6a20cad06d1a41965ea607322ff123cd9 SHA1 26281fb533e287171dc8d9408e63b4e8d8b9a646 SHA256 94a9463eb85659b0a3d224a4e7e1d071125f55c2d361db6a32221391a46746bb |
| 53 |
EBUILD netbeans-5.5.1-r1.ebuild 15127 RMD160 4197f51f7ea021f28b52baab5e14e3c339a3a61b SHA1 c820a49082aa073b5515d8ea204fee24df054040 SHA256 6ef719e19de09aff5e02fd21de7c065f68f75084e5e6d2368f25ff0d3c6c78fd |
| 54 |
EBUILD netbeans-6.5-r4.ebuild 39591 RMD160 aeda3cbba875f25e1223bf5ccac8aa937bc910db SHA1 6ca138e59d05bbf9c98fde6d9fb359f4bb2974cf SHA256 faf9d88505cae8d9b098a2501cb36eaf9d7490db5fbc56f1c293778939d1ff66 |
| 55 |
-EBUILD netbeans-6.7_beta-r1.ebuild 38559 RMD160 d87cf83763778425f00052b840c4b096e0c03265 SHA1 dc8a28310f46f3860845ef928fb6fd773863c7a4 SHA256 80bb4a77406a9c4e92c5985a847ddc2d3cda11432e488dfd2533f1dc218ef289 |
| 56 |
-MISC ChangeLog 19107 RMD160 4fd5cc61972fb76abe661aeaf7102d7710357ac6 SHA1 fd3ff377083f38f73897e1d583d01e159bc8f016 SHA256 466d564eea010f7a0d5660d997abe1169d89326a241579f5276e5e4af4765347 |
| 57 |
+EBUILD netbeans-6.7_beta-r1.ebuild 39521 RMD160 a64d139f230cb735d167fa12f4f5f9e163dd5540 SHA1 f469964042bf1b70dda3c9405c9904f34f9fefcf SHA256 5f5f4405686c56e9b71acdbcc05491a977da3c457dcd0bfe0134084f87cc300f |
| 58 |
+MISC ChangeLog 19235 RMD160 33e9fa50b0eaf9cfc8765a86c38b34dda82010da SHA1 748c4d1bb89a0e9163aa0ed8d8b776b1b519c5b7 SHA256 7f6ae89585a47c6e6d7869d203811554fd061dfa2b09654169786109ab67eb15 |
| 59 |
MISC metadata.xml 1301 RMD160 1e12597c731e35626197ed6ff4efc2094aa12e61 SHA1 8b0614fb5db9568c8b489908d62fcafc9b636f84 SHA256 14d98dfb63646fb6bc7d433f9626ffa7801ff1de38535167f9b0528dac0182a9 |
| 60 |
|
| 61 |
|
| 62 |
|
| 63 |
1.3 dev-util/netbeans/netbeans-6.7_beta-r1.ebuild |
| 64 |
|
| 65 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-6.7_beta-r1.ebuild?rev=1.3&view=markup |
| 66 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-6.7_beta-r1.ebuild?rev=1.3&content-type=text/plain |
| 67 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-6.7_beta-r1.ebuild?r1=1.2&r2=1.3 |
| 68 |
|
| 69 |
Index: netbeans-6.7_beta-r1.ebuild |
| 70 |
=================================================================== |
| 71 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.7_beta-r1.ebuild,v |
| 72 |
retrieving revision 1.2 |
| 73 |
retrieving revision 1.3 |
| 74 |
diff -u -r1.2 -r1.3 |
| 75 |
--- netbeans-6.7_beta-r1.ebuild 2 May 2009 19:09:23 -0000 1.2 |
| 76 |
+++ netbeans-6.7_beta-r1.ebuild 2 May 2009 23:13:31 -0000 1.3 |
| 77 |
@@ -1,6 +1,6 @@ |
| 78 |
# Copyright 1999-2009 Gentoo Foundation |
| 79 |
# Distributed under the terms of the GNU General Public License v2 |
| 80 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.7_beta-r1.ebuild,v 1.2 2009/05/02 19:09:23 fordfrog Exp $ |
| 81 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.7_beta-r1.ebuild,v 1.3 2009/05/02 23:13:31 fordfrog Exp $ |
| 82 |
|
| 83 |
EAPI="2" |
| 84 |
WANT_SPLIT_ANT="true" |
| 85 |
@@ -216,14 +216,20 @@ |
| 86 |
|
| 87 |
pkg_setup() { |
| 88 |
local need_apisupport="" |
| 89 |
+ local need_cnd="" |
| 90 |
local need_dlight="" |
| 91 |
local need_enterprise="" |
| 92 |
+ local need_ergonomics="" |
| 93 |
local need_groovy="" |
| 94 |
local need_harness="" |
| 95 |
local need_ide="" |
| 96 |
+ local need_identity="" |
| 97 |
local need_java="" |
| 98 |
+ local need_mobility="" |
| 99 |
local need_nb="" |
| 100 |
+ local need_php="" |
| 101 |
local need_profiler="" |
| 102 |
+ local need_ruby="" |
| 103 |
local need_webcommon="" |
| 104 |
local need_websvccommon="" |
| 105 |
|
| 106 |
@@ -321,6 +327,28 @@ |
| 107 |
need_ide="1" |
| 108 |
fi |
| 109 |
|
| 110 |
+ # currently we require all clusters when building javadoc, can be tested |
| 111 |
+ # what clusters are really needed to build javadoc |
| 112 |
+ if use doc ; then |
| 113 |
+ need_apisupport="1" |
| 114 |
+ need_cnd="1" |
| 115 |
+ need_dlight="1" |
| 116 |
+ need_enterprise="1" |
| 117 |
+ need_ergonomics="1" |
| 118 |
+ need_groovy="1" |
| 119 |
+ need_harness="1" |
| 120 |
+ need_ide="1" |
| 121 |
+ need_identity="1" |
| 122 |
+ need_java="1" |
| 123 |
+ need_mobility="1" |
| 124 |
+ need_nb="1" |
| 125 |
+ need_php="1" |
| 126 |
+ need_profiler="1" |
| 127 |
+ need_ruby="1" |
| 128 |
+ need_webcommon="1" |
| 129 |
+ need_websvccommon="1" |
| 130 |
+ fi |
| 131 |
+ |
| 132 |
if [ -n "${need_apisupport}" ] ; then |
| 133 |
need_harness="1" |
| 134 |
need_ide="1" |
| 135 |
@@ -368,14 +396,20 @@ |
| 136 |
|
| 137 |
local missing="" |
| 138 |
[ -n "${need_apisupport}" ] && ! use netbeans_modules_apisupport && missing="${missing} apisupport" |
| 139 |
+ [ -n "${need_cnd}" ] && ! use netbeans_modules_cnd && missing="${missing} cnd" |
| 140 |
[ -n "${need_dlight}" ] && ! use netbeans_modules_dlight && missing="${missing} dlight" |
| 141 |
[ -n "${need_enterprise}" ] && ! use netbeans_modules_enterprise && missing="${missing} enterprise" |
| 142 |
+ [ -n "${need_ergonomics}" ] && ! use netbeans_modules_ergonomics && missing="${missing} ergonomics" |
| 143 |
[ -n "${need_groovy}" ] && ! use netbeans_modules_groovy && missing="${missing} groovy" |
| 144 |
[ -n "${need_harness}" ] && ! use netbeans_modules_harness && missing="${missing} harness" |
| 145 |
[ -n "${need_ide}" ] && ! use netbeans_modules_ide && missing="${missing} ide" |
| 146 |
+ [ -n "${need_identity}" ] && ! use netbeans_modules_identity && missing="${missing} identity" |
| 147 |
[ -n "${need_java}" ] && ! use netbeans_modules_java && missing="${missing} java" |
| 148 |
+ [ -n "${need_mobility}" ] && ! use netbeans_modules_mobility && missing="${missing} mobility" |
| 149 |
[ -n "${need_nb}" ] && ! use netbeans_modules_nb && missing="${missing} nb" |
| 150 |
+ [ -n "${need_php}" ] && ! use netbeans_modules_php && missing="${missing} php" |
| 151 |
[ -n "${need_profiler}" ] && ! use netbeans_modules_profiler && missing="${missing} profiler" |
| 152 |
+ [ -n "${need_ruby}" ] && ! use netbeans_modules_ruby && missing="${missing} ruby" |
| 153 |
[ -n "${need_webcommon}" ] && ! use netbeans_modules_webcommon && missing="${missing} webcommon" |
| 154 |
[ -n "${need_websvccommon}" ] && ! use netbeans_modules_websvccommon && missing="${missing} websvccommon" |
| 155 |
|
| 156 |
@@ -536,8 +570,8 @@ |
| 157 |
java-pkg_filter-compiler ecj-3.2 ecj-3.3 ecj-3.4 |
| 158 |
|
| 159 |
# Build the clusters |
| 160 |
- ANT_TASKS="ant-nodeps ant-trax" |
| 161 |
- ANT_OPTS="-Xmx1g -Djava.awt.headless=true" eant ${antflags} ${clusters} -f nbbuild/build.xml ${build_target} |
| 162 |
+ ANT_TASKS="ant-nodeps ant-trax" ANT_OPTS="-Xmx1g -Djava.awt.headless=true" \ |
| 163 |
+ eant ${antflags} ${clusters} -f nbbuild/build.xml ${build_target} $(use_doc build-javadoc) |
| 164 |
|
| 165 |
local locales="" |
| 166 |
for lang in ${IUSE_LINGUAS} ; do |
| 167 |
@@ -557,12 +591,6 @@ |
| 168 |
-f l10n/build.xml build |
| 169 |
fi |
| 170 |
|
| 171 |
- # Running build-javadoc from the same command line as build-nozip doesn't work |
| 172 |
- # so we must run it separately |
| 173 |
- if use doc ; then |
| 174 |
- ANT_TASKS="ant-nodeps ant-trax" ANT_OPTS="-Xmx1g" eant ${antflags} ${clusters} -f nbbuild/build.xml build-javadoc |
| 175 |
- fi |
| 176 |
- |
| 177 |
# Remove non-Linux binaries |
| 178 |
einfo "Removing libraries and scripts for non-linux archs..." |
| 179 |
find "${BUILDDESTINATION}" -type f \ |
| 180 |
@@ -680,7 +708,10 @@ |
| 181 |
dohtml CREDITS.html README.html netbeans.css |
| 182 |
rm -f build_info CREDITS.html README.html netbeans.css |
| 183 |
|
| 184 |
- use doc && java-pkg_dojavadoc "${S}"/nbbuild/build/javadoc |
| 185 |
+ if use doc ; then |
| 186 |
+ rm "${S}"/nbbuild/build/javadoc/*.zip |
| 187 |
+ java-pkg_dojavadoc "${S}"/nbbuild/build/javadoc |
| 188 |
+ fi |
| 189 |
|
| 190 |
# Icons and shortcuts |
| 191 |
if use netbeans_modules_nb ; then |
Archives