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

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

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

Revision 1.30 Revision 1.31
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2004 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.30 2010/03/27 22:23:57 caster Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.31 2010/04/17 08:30:36 betelgeuse Exp $
4 4
5# ----------------------------------------------------------------------------- 5# -----------------------------------------------------------------------------
6# @eclass-begin 6# @eclass-begin
7# @eclass-shortdesc Java Virtual Machine eclass 7# @eclass-shortdesc Java Virtual Machine eclass
8# @eclass-maintainer java@gentoo.org 8# @eclass-maintainer java@gentoo.org
131 -e "s/@PV@/${PV}/g" \ 131 -e "s/@PV@/${PV}/g" \
132 -e "s/@PF@/${PF}/g" \ 132 -e "s/@PF@/${PF}/g" \
133 -e "s/@PLATFORM@/${platform}/g" \ 133 -e "s/@PLATFORM@/${platform}/g" \
134 -e "s/@LIBDIR@/$(get_libdir)/g" \ 134 -e "s/@LIBDIR@/$(get_libdir)/g" \
135 -e "/^LDPATH=.*lib\\/\\\"/s|\"\\(.*\\)\"|\"\\1${platform}/:\\1${platform}/server/\"|" \ 135 -e "/^LDPATH=.*lib\\/\\\"/s|\"\\(.*\\)\"|\"\\1${platform}/:\\1${platform}/server/\"|" \
136 < ${source_env_file} \ 136 < "${source_env_file}" \
137 > ${env_file} || die "sed failed" 137 > "${env_file}" || die "sed failed"
138 138
139 ( 139 (
140 echo "VMHANDLE=\"${VMHANDLE}\"" 140 echo "VMHANDLE=\"${VMHANDLE}\""
141 echo "BUILD_ONLY=\"${JAVA_VM_BUILD_ONLY}\"" 141 echo "BUILD_ONLY=\"${JAVA_VM_BUILD_ONLY}\""
142 ) >> ${env_file} 142 ) >> "${env_file}"
143 143
144 [[ -n ${JAVA_PROVIDE} ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" >> ${env_file} 144 [[ -n ${JAVA_PROVIDE} ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" >> ${env_file}
145 145
146 local java_home=$(source ${env_file}; echo ${JAVA_HOME}) 146 local java_home=$(source "${env_file}"; echo ${JAVA_HOME})
147 [[ -z ${java_home} ]] && die "No JAVA_HOME defined in ${env_file}" 147 [[ -z ${java_home} ]] && die "No JAVA_HOME defined in ${env_file}"
148 148
149 # Make the symlink 149 # Make the symlink
150 dosym ${java_home} ${JAVA_VM_DIR}/${VMHANDLE} \ 150 dosym ${java_home} ${JAVA_VM_DIR}/${VMHANDLE} \
151 || die "Failed to make VM symlink at ${JAVA_VM_DIR}/${VMHANDLE}" 151 || die "Failed to make VM symlink at ${JAVA_VM_DIR}/${VMHANDLE}"

Legend:
Removed from v.1.30  
changed lines
  Added in v.1.31

  ViewVC Help
Powered by ViewVC 1.1.20