/[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.43 Revision 1.44
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.43 2007/01/15 21:03:24 betelgeuse Exp $ 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.44 2007/01/20 11:14:31 betelgeuse 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
299 local original_jar="${1}" 299 local original_jar="${1}"
300 local new_jar="${2:-${PN}.jar}" 300 local new_jar="${2:-${PN}.jar}"
301 local new_jar_dest="${T}/${new_jar}" 301 local new_jar_dest="${T}/${new_jar}"
302 302
303 [[ -z ${original_jar} ]] && die "Must specify a jar to install" 303 [[ -z ${original_jar} ]] && die "Must specify a jar to install"
304 [[ ! -f ${original_jar} ]] && die "${original_jar} does not exist!" 304 [[ ! -f ${original_jar} ]] \
305 && die "${original_jar} does not exist or is not a file!"
305 306
306 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}" 307 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}"
307 cp "${original_jar}" "${new_jar_dest}" \ 308 cp "${original_jar}" "${new_jar_dest}" \
308 || die "Failed to copy ${original_jar} to ${new_jar_dest}" 309 || die "Failed to copy ${original_jar} to ${new_jar_dest}"
309 java-pkg_dojar "${new_jar_dest}" 310 java-pkg_dojar "${new_jar_dest}"
1413 # It seems ant does not like single quotes around ${cp} 1414 # It seems ant does not like single quotes around ${cp}
1414 antflags="${antflags} -Dgentoo.classpath=\"${cp}\"" 1415 antflags="${antflags} -Dgentoo.classpath=\"${cp}\""
1415 fi 1416 fi
1416 1417
1417 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" 1418 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
1419 debug-print "Calling ant: ${antflags} ${@}"
1418 ant ${antflags} "${@}" || die "eant failed" 1420 ant ${antflags} "${@}" || die "eant failed"
1419 1421
1420} 1422}
1421 1423
1422# ------------------------------------------------------------------------------ 1424# ------------------------------------------------------------------------------

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

  ViewVC Help
Powered by ViewVC 1.1.20