/[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.5 Revision 1.6
276 local original_jar="${1}" 276 local original_jar="${1}"
277 local new_jar="${2:-${PN}.jar}" 277 local new_jar="${2:-${PN}.jar}"
278 local new_jar_dest="${T}/${new_jar}" 278 local new_jar_dest="${T}/${new_jar}"
279 279
280 [[ -z ${original_jar} ]] && die "Must specify a jar to install" 280 [[ -z ${original_jar} ]] && die "Must specify a jar to install"
281 [[ ! -f ${original_jar} ]] && die "${new_jar} does not exist!" 281 [[ ! -f ${original_jar} ]] && die "${original_jar} does not exist!"
282 282
283 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}" 283 rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}"
284 cp "${original_jar}" "${new_jar_dest}" \ 284 cp "${original_jar}" "${new_jar_dest}" \
285 || die "Failed to copy ${original_jar} to ${new_jar_dest}" 285 || die "Failed to copy ${original_jar} to ${new_jar_dest}"
286 java-pkg_dojar "${new_jar_dest}" 286 java-pkg_dojar "${new_jar_dest}"
1231# @param $@ - Arguments to be passed to the compiler 1231# @param $@ - Arguments to be passed to the compiler
1232# ------------------------------------------------------------------------------ 1232# ------------------------------------------------------------------------------
1233ejavac() { 1233ejavac() {
1234 debug-print-function ${FUNCNAME} $* 1234 debug-print-function ${FUNCNAME} $*
1235 1235
1236 # FIXME using get-javac ends up printing stuff with einfo
1236 local compiler_executable=$(java-pkg_get-javac) 1237# local compiler_executable=$(java-pkg_get-javac)
1238 local compiler_executable="javac"
1237 1239
1238 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} $(java-pkg_javac-args) "${@}" 1240 [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} $(java-pkg_javac-args) "${@}"
1239 ${compiler_executable} $(java-pkg_javac-args) "${@}" || die "ejavac failed" 1241 ${compiler_executable} $(java-pkg_javac-args) "${@}" || die "ejavac failed"
1240} 1242}
1241 1243

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6

  ViewVC Help
Powered by ViewVC 1.1.20