/[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.44 Revision 1.45
12# and xml-rewrite.py because they were so slow 12# and xml-rewrite.py because they were so slow
13# Petteri Räty (betelgeuse@gentoo.org) 13# Petteri Räty (betelgeuse@gentoo.org)
14# 14#
15# Licensed under the GNU General Public License, v2 15# Licensed under the GNU General Public License, v2
16# 16#
17# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.44 2009/02/08 15:50:21 maekke Exp $ 17# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.45 2009/02/15 01:24:59 betelgeuse Exp $
18 18
19inherit java-utils-2 19inherit java-utils-2
20 20
21# This eclass provides functionality for Java packages which use 21# This eclass provides functionality for Java packages which use
22# ant to build. In particular, it will attempt to fix build.xml files, so that 22# ant to build. In particular, it will attempt to fix build.xml files, so that
305 debug-print "Using third generation rewriter" 305 debug-print "Using third generation rewriter"
306 eval echo "Rewriting attributes" ${output} 306 eval echo "Rewriting attributes" ${output}
307 local bsfix_extra_args="" 307 local bsfix_extra_args=""
308 # WARNING KEEP THE ORDER, ESPECIALLY FOR CHANGED ATTRIBUTES! 308 # WARNING KEEP THE ORDER, ESPECIALLY FOR CHANGED ATTRIBUTES!
309 if [[ -n ${JAVA_ANT_REWRITE_CLASSPATH} ]]; then 309 if [[ -n ${JAVA_ANT_REWRITE_CLASSPATH} ]]; then
310 local cp_tags="${JAVA_ANT_CLASSPATH_TAGS// / -e }"
310 bsfix_extra_args="${bsfix_extra_args} -g -e javac -e xjavac " 311 bsfix_extra_args="${bsfix_extra_args} -g -e ${cp_tags}"
311 bsfix_extra_args="${bsfix_extra_args} -a classpath -v '\${gentoo.classpath}'" 312 bsfix_extra_args="${bsfix_extra_args} -a classpath -v '\${gentoo.classpath}'"
312 fi 313 fi
313 if [[ -n ${JAVA_ANT_JAVADOC_INPUT_DIRS} ]]; then 314 if [[ -n ${JAVA_ANT_JAVADOC_INPUT_DIRS} ]]; then
314 if [[ -n ${JAVA_ANT_JAVADOC_OUTPUT_DIR} ]]; then 315 if [[ -n ${JAVA_ANT_JAVADOC_OUTPUT_DIR} ]]; then
315 die "Do not define JAVA_ANT_JAVADOC_OUTPUT_DIR!" 316 die "Do not define JAVA_ANT_JAVADOC_OUTPUT_DIR!"
345 fi 346 fi
346 347
347 [[ -n ${JAVA_ANT_BSFIX_EXTRA_ARGS} ]] \ 348 [[ -n ${JAVA_ANT_BSFIX_EXTRA_ARGS} ]] \
348 && bsfix_extra_args="${bsfix_extra_args} ${JAVA_ANT_BSFIX_EXTRA_ARGS}" 349 && bsfix_extra_args="${bsfix_extra_args} ${JAVA_ANT_BSFIX_EXTRA_ARGS}"
349 350
351 debug-print "bsfix_extra_args: ${bsfix_extra_args}"
352
350 eval ${rewriter3} ${files} \ 353 eval ${rewriter3} ${files} \
351 -c --source-element ${JAVA_PKG_BSFIX_SOURCE_TAGS// / --source-element } \ 354 -c --source-element ${JAVA_PKG_BSFIX_SOURCE_TAGS// / --source-element } \
352 --source-attribute source --source-value ${want_source} \ 355 --source-attribute source --source-value ${want_source} \
353 --target-element ${JAVA_PKG_BSFIX_TARGET_TAGS// / --target-element } \ 356 --target-element ${JAVA_PKG_BSFIX_TARGET_TAGS// / --target-element } \
354 --target-attribute target --target-value ${want_target} \ 357 --target-attribute target --target-value ${want_target} \

Legend:
Removed from v.1.44  
changed lines
  Added in v.1.45

  ViewVC Help
Powered by ViewVC 1.1.20