/[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.19 Revision 1.23
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.19 2007/12/16 17:11:01 caster Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.23 2008/08/29 19:10:19 caster 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
146 echo ${sarch} 146 echo ${sarch}
147} 147}
148 148
149# TODO rename to something more evident, like install_env_file 149# TODO rename to something more evident, like install_env_file
150set_java_env() { 150set_java_env() {
151 debug-print-function ${FUNCNAME} $*
151 local platform="$(get_system_arch)" 152 local platform="$(get_system_arch)"
152 local env_file="${D}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}" 153 local env_file="${D}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}"
153 local old_env_file="${D}/etc/env.d/java/20${P}" 154 local old_env_file="${D}/etc/env.d/java/20${P}"
155 if [[ ${1} ]]; then
156 local source_env_file="${1}"
157 else
154 local source_env_file="${FILESDIR}/${VMHANDLE}.env" 158 local source_env_file="${FILESDIR}/${VMHANDLE}.env"
159 fi
155 160
156 if [[ ! -f ${source_env_file} ]]; then 161 if [[ ! -f ${source_env_file} ]]; then
157 die "Unable to find the env file: ${source_env_file}" 162 die "Unable to find the env file: ${source_env_file}"
158 fi 163 fi
159 164
223java_get_plugin_dir_() { 228java_get_plugin_dir_() {
224 echo /usr/$(get_libdir)/nsbrowser/plugins 229 echo /usr/$(get_libdir)/nsbrowser/plugins
225} 230}
226 231
227install_mozilla_plugin() { 232install_mozilla_plugin() {
228 local plugin=${1} 233 local plugin="${1}"
234 local variant="${2}"
229 235
230 if [ ! -f "${D}/${plugin}" ] ; then 236 if [[ ! -f "${D}/${plugin}" ]]; then
231 die "Cannot find mozilla plugin at ${D}/${plugin}" 237 die "Cannot find mozilla plugin at ${D}/${plugin}"
232 fi 238 fi
233 239
240 if [[ -n "${variant}" ]]; then
241 variant="-${variant}"
242 fi
243
234 local plugin_dir=/usr/share/java-config-2/nsplugin 244 local plugin_dir="/usr/share/java-config-2/nsplugin"
235 dodir ${plugin_dir} 245 dodir "${plugin_dir}"
236 dosym ${plugin} ${plugin_dir}/${VMHANDLE}-javaplugin.so 246 dosym "${plugin}" "${plugin_dir}/${VMHANDLE}${variant}-javaplugin.so"
237} 247}
238 248
239java_mozilla_clean_() { 249java_mozilla_clean_() {
240 # Because previously some ebuilds installed symlinks outside of pkg_install 250 # Because previously some ebuilds installed symlinks outside of pkg_install
241 # and are left behind, which forces you to manualy remove them to select the 251 # and are left behind, which forces you to manualy remove them to select the

Legend:
Removed from v.1.19  
changed lines
  Added in v.1.23

  ViewVC Help
Powered by ViewVC 1.1.20