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

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

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

Revision 1.49 Revision 1.50
4# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org> 4# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org>
5# Copyright (c) 2004-2005, Gentoo Foundation 5# Copyright (c) 2004-2005, Gentoo Foundation
6# 6#
7# Licensed under the GNU General Public License, v2 7# Licensed under the GNU General Public License, v2
8# 8#
9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.49 2007/01/25 11:46:22 caster Exp $ 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.50 2007/01/26 20:24:23 caster Exp $
10 10
11 11
12# ----------------------------------------------------------------------------- 12# -----------------------------------------------------------------------------
13# @eclass-begin 13# @eclass-begin
14# @eclass-shortdesc Java Utility eclass 14# @eclass-shortdesc Java Utility eclass
211 # Create JARDEST if it doesn't exist 211 # Create JARDEST if it doesn't exist
212 dodir ${JAVA_PKG_JARDEST} 212 dodir ${JAVA_PKG_JARDEST}
213 213
214 local jar 214 local jar
215 # for each jar 215 # for each jar
216 for jar in ${@}; do 216 for jar in "${@}"; do
217 local jar_basename=$(basename "${jar}") 217 local jar_basename=$(basename "${jar}")
218 218
219 java-pkg_check-versioned-jar ${jar_basename} 219 java-pkg_check-versioned-jar ${jar_basename}
220 220
221 # check if it exists 221 # check if it exists
298 [[ ${#} -lt 1 ]] && die "at least one argument needed" 298 [[ ${#} -lt 1 ]] && die "at least one argument needed"
299 299
300 java-pkg_init_paths_ 300 java-pkg_init_paths_
301 301
302 local jar jar_dir jar_file 302 local jar jar_dir jar_file
303 for jar in ${@}; do 303 for jar in "${@}"; do
304 # TODO use java-pkg_check-versioned-jar 304 # TODO use java-pkg_check-versioned-jar
305 if [[ -e "${jar}" || -e "${D}${jar}" ]]; then 305 if [[ -e "${jar}" || -e "${D}${jar}" ]]; then
306 [[ -d "${jar}" || -d "${D}${jar}" ]] \ 306 [[ -d "${jar}" || -d "${D}${jar}" ]] \
307 && die "Called ${FUNCNAME} on a directory $*" 307 && die "Called ${FUNCNAME} on a directory $*"
308 # nelchael: we should strip ${D} in this case too, here's why: 308 # nelchael: we should strip ${D} in this case too, here's why:
560 java-pkg_init_paths_ 560 java-pkg_init_paths_
561 561
562 local zip_name="${PN}-src.zip" 562 local zip_name="${PN}-src.zip"
563 local zip_path="${T}/${zip_name}" 563 local zip_path="${T}/${zip_name}"
564 local dir 564 local dir
565 for dir in ${@}; do 565 for dir in "${@}"; do
566 local dir_parent=$(dirname "${dir}") 566 local dir_parent=$(dirname "${dir}")
567 local dir_name=$(basename "${dir}") 567 local dir_name=$(basename "${dir}")
568 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}" 568 pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}"
569 zip -q -r ${zip_path} ${dir_name} -i '*.java' 569 zip -q -r ${zip_path} ${dir_name} -i '*.java'
570 local result=$? 570 local result=$?

Legend:
Removed from v.1.49  
changed lines
  Added in v.1.50

  ViewVC Help
Powered by ViewVC 1.1.20