diff options
| author |   Joshua Nichols <nichoj@gentoo.org> | 2006-09-11 04:37:57 +0000 |
|---|---|---|
| committer | Joshua Nichols <nichoj@gentoo.org> | 2006-09-11 04:37:57 +0000 |
| commit | cc9dca09d0af9e2219ccc63c302acf74e2968c99 (patch) | |
| tree | 54f98c7ce4659c70ff0542f8064a77a713544470 /eclass | |
| parent | Pruned old versions, leaving the target versions for stabilization. (diff) | |
| download | gentoo-2-cc9dca09d0af9e2219ccc63c302acf74e2968c99.tar.gz gentoo-2-cc9dca09d0af9e2219ccc63c302acf74e2968c99.tar.bz2 gentoo-2-cc9dca09d0af9e2219ccc63c302acf74e2968c99.zip | |
Fixes variable names. Also cleans up building of find_args. Courtesy of Caster, bug #146479.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/java-ant-2.eclass | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass index 001f0bda442d..c7a412197d4a 100644 --- a/eclass/java-ant-2.eclass +++ b/eclass/java-ant-2.eclass @@ -16,23 +16,23 @@ inherit java-utils-2 DEPEND=">=dev-java/javatoolkit-0.1.5 ${JAVA_PKG_PORTAGE_DEP}" # ------------------------------------------------------------------------------ -# @global JAVA_ANT_BSFIX +# @global JAVA_PKG_BSFIX # # Should we attempt to 'fix' ant build files to include the source/target # attributes when calling javac? # # default: on # ------------------------------------------------------------------------------ -JAVA_ANT_BSFIX=${JAVA_PKG_BSFIX:="on"} +JAVA_PKG_BSFIX=${JAVA_PKG_BSFIX:-"on"} # ------------------------------------------------------------------------------ -# @global JAVA_ANT_BSFIX_ALL +# @global JAVA_PKG_BSFIX_ALL # # If we're fixing build files, should we try to fix all the ones we can find? # # default: yes # ------------------------------------------------------------------------------ -JAVA_ANT_BSFIX_ALL=${JAVA_PKG_BSFIX_ALL:="yes"} +JAVA_PKG_BSFIX_ALL=${JAVA_PKG_BSFIX_ALL:-"yes"} # ------------------------------------------------------------------------------ # @global JAVA_PKG_BSFIX_NAME @@ -41,25 +41,25 @@ JAVA_ANT_BSFIX_ALL=${JAVA_PKG_BSFIX_ALL:="yes"} # # default: build.xml # ------------------------------------------------------------------------------ -JAVA_PKG_BSFIX_NAME=${JAVA_PKG_BSFIX_NAME:="build.xml"} +JAVA_PKG_BSFIX_NAME=${JAVA_PKG_BSFIX_NAME:-"build.xml"} # ------------------------------------------------------------------------------ -# @global JAVA_ANT_BSFIX_TARGETS_TAGS +# @global JAVA_PKG_BSFIX_TARGETS_TAGS # # Targets to fix the 'source' attribute in # # default: javac xjavac javac.preset # ------------------------------------------------------------------------------ -JAVA_ANT_BSFIX_TARGET_TAGS=${JAVA_PKG_BSFIX_TARGET_TAGS:="javac xjavac javac.preset"} +JAVA_PKG_BSFIX_TARGET_TAGS=${JAVA_PKG_BSFIX_TARGET_TAGS:-"javac xjavac javac.preset"} # ------------------------------------------------------------------------------ -# @global JAVA_ANT_BSFIX_SOURCE_TAGS +# @global JAVA_PKG_BSFIX_SOURCE_TAGS # # Targets to fix the 'target' attribute in # # default: javacdoc javac xjavac javac.preset # ------------------------------------------------------------------------------ -JAVA_ANT_BSFIX_SOURCE_TAGS=${JAVA_PKG_BSFIX_SOURCE_TAGS:="javadoc javac xjavac javac.preset"} +JAVA_PKG_BSFIX_SOURCE_TAGS=${JAVA_PKG_BSFIX_SOURCE_TAGS:-"javadoc javac xjavac javac.preset"} # ------------------------------------------------------------------------------ # @public java-ant_src_unpack @@ -106,12 +106,10 @@ java-ant_bsfix() { cd "${S}" - local find_args="-type f" - if [[ "${JAVA_PKG_BSFIX_ALL}" == "yes" ]]; then - find_args="${find_args} -name ${JAVA_PKG_BSFIX_NAME// / -o -name }" - else - find_args="${find_args} -maxdepth 1 -name ${JAVA_PKG_BSFIX_NAME// / -o -name } " - fi + local find_args="" + [[ "${JAVA_PKG_BSFIX_ALL}" == "yes" ]] || find_args="-maxdepth 1" + + find_args="${find_args} -type f -name ${JAVA_PKG_BSFIX_NAME// / -o -name } " local i=0 local -a bsfix_these |