| 1 |
Ok so I was mean't to apply a patch ages ago but it never happened. So |
| 2 |
here is my second (and last) attempt. |
| 3 |
|
| 4 |
Things to note: |
| 5 |
* when calling xml-rewrite-2.py all calls are "routed" thru |
| 6 |
java-ant_xml-rewrite() |
| 7 |
* java-ant_xml-rewrite dies by calling _bsfix_die |
| 8 |
* some calls to xml-rewriter-2.py have therefore lost a little bit of |
| 9 |
flexibility wrt the error message they display. |
| 10 |
|
| 11 |
Have tested, passes with old javatoolkit so no worry there. New layout |
| 12 |
still requires work. |
| 13 |
|
| 14 |
You have 24 hours to complain. |
| 15 |
|
| 16 |
Alistair |
| 17 |
|
| 18 |
diff -Naur /usr/portage/eclass/java-ant-2.eclass |
| 19 |
~/gentoo/cvs/gentoo-x86/eclass/java-ant-2.eclass |
| 20 |
--- /usr/portage/eclass/java-ant-2.eclass 2008-03-06 |
| 21 |
08:36:24.000000000 +1300 |
| 22 |
+++ /home/alistair/gentoo/cvs/gentoo-x86/eclass/java-ant-2.eclass |
| 23 |
2008-04-13 19:13:36.000000000 +1200 |
| 24 |
@@ -240,29 +240,33 @@ |
| 25 |
|
| 26 |
# for javadoc target and all in one pass, we need the |
| 27 |
new rewriter. |
| 28 |
local rewriter3="/usr/share/javatoolkit/xml-rewrite-3.py" |
| 29 |
+ # xml-rewrite will be moving. |
| 30 |
+ if [[ ! -f ${rewriter3} ]]; then |
| 31 |
+ |
| 32 |
rewriter3="/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-3.py" |
| 33 |
+ fi |
| 34 |
+ |
| 35 |
if [[ ! -f ${rewriter3} ]]; then |
| 36 |
debug-print "Using second generation rewriter" |
| 37 |
eval echo "Rewriting source attributes" ${output} |
| 38 |
- eval xml-rewrite-2.py ${files} \ |
| 39 |
+ java-ant_xml-rewrite ${files} \ |
| 40 |
-c -e ${JAVA_PKG_BSFIX_SOURCE_TAGS// / |
| 41 |
-e } \ |
| 42 |
- -a source -v ${want_source} ${output} || |
| 43 |
_bsfix_die "xml-rewrite2 failed: ${file}" |
| 44 |
+ -a source -v ${want_source} ${output} |
| 45 |
|
| 46 |
eval echo "Rewriting target attributes" ${output} |
| 47 |
- eval xml-rewrite-2.py ${files} \ |
| 48 |
+ java-ant_xml-rewrite ${files} \ |
| 49 |
-c -e ${JAVA_PKG_BSFIX_TARGET_TAGS// / |
| 50 |
-e } \ |
| 51 |
- -a target -v ${want_target} ${output} || |
| 52 |
_bsfix_die "xml-rewrite2 failed: ${file}" |
| 53 |
+ -a target -v ${want_target} ${output} |
| 54 |
|
| 55 |
eval echo "Rewriting nowarn attributes" ${output} |
| 56 |
- eval xml-rewrite-2.py ${files} \ |
| 57 |
+ java-ant_xml-rewrite ${files} \ |
| 58 |
-c -e ${JAVA_PKG_BSFIX_TARGET_TAGS// / |
| 59 |
-e } \ |
| 60 |
- -a nowarn -v yes ${output} || _bsfix_die |
| 61 |
"xml-rewrite2 failed: ${file}" |
| 62 |
+ -a nowarn -v yes ${output} |
| 63 |
|
| 64 |
if [[ ${JAVA_ANT_REWRITE_CLASSPATH} ]]; then |
| 65 |
eval echo "Adding gentoo.classpath to |
| 66 |
javac tasks" ${output} |
| 67 |
- eval xml-rewrite-2.py ${files} \ |
| 68 |
+ java-ant_xml-rewrite ${files} \ |
| 69 |
-c -e javac -e xjavac -a |
| 70 |
classpath -v \ |
| 71 |
- '\${gentoo.classpath}' \ |
| 72 |
- || _bsfix_die "xml-rewrite2 failed" |
| 73 |
+ '\${gentoo.classpath}' |
| 74 |
fi |
| 75 |
else |
| 76 |
debug-print "Using third generation rewriter" |
| 77 |
@@ -399,10 +403,14 @@ |
| 78 |
# Run the right xml-rewrite binary with the given arguments |
| 79 |
# |
| 80 |
------------------------------------------------------------------------------ |
| 81 |
java-ant_xml-rewrite() { |
| 82 |
- local gen2="/usr/bin/xml-rewrite-2.py" |
| 83 |
# gen1 is deprecated |
| 84 |
+ local gen2="/usr/bin/xml-rewrite-2.py" |
| 85 |
+ #gen2 xml-rewrite will be moving. |
| 86 |
+ if [[ ! -x "${gen2}" ]]; then |
| 87 |
+ gen2="/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-2.py" |
| 88 |
+ fi |
| 89 |
if [[ -x "${gen2}" ]]; then |
| 90 |
- ${gen2} "${@}" || die "${gen2} failed" |
| 91 |
+ ${gen2} "${@}" || _bsfix_die "xml-rewrite2 failed : ${@}" |
| 92 |
else |
| 93 |
eerror "No binary for rewriting found." |
| 94 |
eerror "Do you have dev-java/javatoolkit installed?" |
| 95 |
-- |
| 96 |
gentoo-java@l.g.o mailing list |
Archives