/[gentoo-x86]/eclass/java-ant-2.eclass
Gentoo

Diff of /eclass/java-ant-2.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.17 Revision 1.18
8# and xml-rewrite.py because they were so slow 8# and xml-rewrite.py because they were so slow
9# Petteri Räty (betelgeuse@gentoo.org) 9# Petteri Räty (betelgeuse@gentoo.org)
10# 10#
11# Licensed under the GNU General Public License, v2 11# Licensed under the GNU General Public License, v2
12# 12#
13# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.17 2007/01/30 21:51:15 caster Exp $ 13# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.18 2007/03/01 14:01:02 betelgeuse Exp $
14 14
15inherit java-utils-2 15inherit java-utils-2
16 16
17# This eclass provides functionality for Java packages which use 17# This eclass provides functionality for Java packages which use
18# ant to build. In particular, it will attempt to fix build.xml files, so that 18# ant to build. In particular, it will attempt to fix build.xml files, so that
244 fi 244 fi
245 245
246 files="${files} -f '${file}'" 246 files="${files} -f '${file}'"
247 247
248 if [[ -z "${using_new}" ]]; then 248 if [[ -z "${using_new}" ]]; then
249 vecho "Rewriting $file (using xml-rewrite.py)" 249 echo "Rewriting $file (using xml-rewrite.py)"
250 # Doing this twice because otherwise the source attributes would 250 # Doing this twice because otherwise the source attributes would
251 # get added to target tags too and javadoc does not like target 251 # get added to target tags too and javadoc does not like target
252 xml-rewrite.py -f "${file}" \ 252 xml-rewrite.py -f "${file}" \
253 -c -e ${JAVA_PKG_BSFIX_SOURCE_TAGS// / -e } \ 253 -c -e ${JAVA_PKG_BSFIX_SOURCE_TAGS// / -e } \
254 -a source -v ${want_source} || _bsfix_die "xml-rewrite failed: ${file}" 254 -a source -v ${want_source} || _bsfix_die "xml-rewrite failed: ${file}"
257 -a target -v ${want_target} || _bsfix_die "xml-rewrite failed: ${file}" 257 -a target -v ${want_target} || _bsfix_die "xml-rewrite failed: ${file}"
258 fi 258 fi
259 done 259 done
260 260
261 if [[ "${using_new}" ]]; then 261 if [[ "${using_new}" ]]; then
262 # Play nice with paludis
263 if [[ $(type -t quiet_mode) = function ]] && quiet_mode; then
262 quiet_mode && local output=">/dev/null" 264 local output=">/dev/null"
265 fi
263 vecho "Rewriting source attributes" 266 eval echo "Rewriting source attributes" ${output}
264 eval xml-rewrite-2.py ${files} \ 267 eval xml-rewrite-2.py ${files} \
265 -c -e ${JAVA_PKG_BSFIX_SOURCE_TAGS// / -e } \ 268 -c -e ${JAVA_PKG_BSFIX_SOURCE_TAGS// / -e } \
266 -a source -v ${want_source} ${output} || _bsfix_die "xml-rewrite2 failed: ${file}" 269 -a source -v ${want_source} ${output} || _bsfix_die "xml-rewrite2 failed: ${file}"
267 270
268 vecho "Rewriting target attributes" 271 eval echo "Rewriting target attributes" ${output}
269 eval xml-rewrite-2.py ${files} \ 272 eval xml-rewrite-2.py ${files} \
270 -c -e ${JAVA_PKG_BSFIX_TARGET_TAGS// / -e } \ 273 -c -e ${JAVA_PKG_BSFIX_TARGET_TAGS// / -e } \
271 -a target -v ${want_target} ${output} || _bsfix_die "xml-rewrite2 failed: ${file}" 274 -a target -v ${want_target} ${output} || _bsfix_die "xml-rewrite2 failed: ${file}"
272 fi 275 fi
273 276

Legend:
Removed from v.1.17  
changed lines
  Added in v.1.18

  ViewVC Help
Powered by ViewVC 1.1.20