| 1 |
betelgeuse 08/07/01 19:02:21 |
| 2 |
|
| 3 |
Modified: java-ant-2.eclass |
| 4 |
Log: |
| 5 |
Add support for JAVA_ANT_ENCODING using build-xml-rewrite. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.36 eclass/java-ant-2.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-ant-2.eclass?rev=1.36&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-ant-2.eclass?rev=1.36&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-ant-2.eclass?r1=1.35&r2=1.36 |
| 13 |
|
| 14 |
Index: java-ant-2.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v |
| 17 |
retrieving revision 1.35 |
| 18 |
retrieving revision 1.36 |
| 19 |
diff -u -r1.35 -r1.36 |
| 20 |
--- java-ant-2.eclass 20 Jun 2008 10:32:15 -0000 1.35 |
| 21 |
+++ java-ant-2.eclass 1 Jul 2008 19:02:21 -0000 1.36 |
| 22 |
@@ -14,7 +14,7 @@ |
| 23 |
# |
| 24 |
# Licensed under the GNU General Public License, v2 |
| 25 |
# |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.35 2008/06/20 10:32:15 ali_bush Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.36 2008/07/01 19:02:21 betelgeuse Exp $ |
| 28 |
|
| 29 |
inherit java-utils-2 |
| 30 |
|
| 31 |
@@ -240,12 +240,22 @@ |
| 32 |
|
| 33 |
# for javadoc target and all in one pass, we need the new rewriter. |
| 34 |
local rewriter3="/usr/share/javatoolkit/xml-rewrite-3.py" |
| 35 |
- |
| 36 |
if [[ ! -f ${rewriter3} ]]; then |
| 37 |
rewriter3="/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-3.py" |
| 38 |
fi |
| 39 |
|
| 40 |
- if [[ ! -f ${rewriter3} ]]; then |
| 41 |
+ local rewriter4="/usr/$(get_libdir)/javatoolkit/bin/build-xml-rewrite" |
| 42 |
+ |
| 43 |
+ if [[ -x ${rewriter4} && ${JAVA_ANT_ENCODING} ]]; then |
| 44 |
+ [[ ${JAVA_ANT_REWRITE_CLASSPATH} ]] && local gcp="-g" |
| 45 |
+ [[ ${JAVA_ANT_ENCODING} ]] && local enc="-e ${JAVA_ANT_ENCODING}" |
| 46 |
+ eval echo "cElementTree rewriter" ${output} |
| 47 |
+ debug-print "${rewriter4} extra args: ${gcp} ${enc}" |
| 48 |
+ ${rewriter4} ${gcp} ${enc} \ |
| 49 |
+ -c "${JAVA_PKG_BSFIX_SOURCE_TAGS}" source ${want_source} \ |
| 50 |
+ -c "${JAVA_PKG_BSFIX_TARGET_TAGS}" target ${want_target} \ |
| 51 |
+ "${@}" || die "build-xml-rewrite failed" |
| 52 |
+ elif [[ ! -f ${rewriter3} ]]; then |
| 53 |
debug-print "Using second generation rewriter" |
| 54 |
eval echo "Rewriting source attributes" ${output} |
| 55 |
eval xml-rewrite-2.py ${files} \ |
| 56 |
@@ -392,9 +402,8 @@ |
| 57 |
# ------------------------------------------------------------------------------ |
| 58 |
java-ant_ignore-system-classes() { |
| 59 |
debug-print-function ${FUNCNAME} $* |
| 60 |
- local file="${1}" |
| 61 |
- [[ -z "${1}" ]] && file=build.xml |
| 62 |
- echo "Changing ignoresystemclasses to true for available tasks" |
| 63 |
+ local file=${1:-build.xml} |
| 64 |
+ echo "Changing ignoresystemclasses to true for available tasks in ${file}" |
| 65 |
java-ant_xml-rewrite -f "${file}" --change \ |
| 66 |
-e available -a ignoresystemclasses -v "true" |
| 67 |
} |
| 68 |
|
| 69 |
|
| 70 |
|
| 71 |
-- |
| 72 |
gentoo-commits@l.g.o mailing list |
Archives