/[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.23 Revision 1.45
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2012 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.23 2008/08/29 19:10:19 caster Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.45 2012/07/18 16:54:55 sera Exp $
4 4
5# ----------------------------------------------------------------------------- 5# @ECLASS: java-vm-2.eclass
6# @eclass-begin 6# @MAINTAINER:
7# @eclass-shortdesc Java Virtual Machine eclass 7# java@gentoo.org
8# @eclass-maintainer java@gentoo.org 8# @BLURB: Java Virtual Machine eclass
9# 9# @DESCRIPTION:
10# This eclass provides functionality which assists with installing 10# This eclass provides functionality which assists with installing
11# virtual machines, and ensures that they are recognized by java-config. 11# virtual machines, and ensures that they are recognized by java-config.
12#
13# -----------------------------------------------------------------------------
14 12
15inherit eutils fdo-mime 13inherit eutils fdo-mime multilib pax-utils prefix
16 14
17DEPEND=" 15EXPORT_FUNCTIONS pkg_setup pkg_postinst pkg_prerm pkg_postrm
18 =dev-java/java-config-2* 16
19 >=sys-apps/portage-2.1"
20RDEPEND=" 17RDEPEND="
21 =dev-java/java-config-2* 18 =dev-java/java-config-2*
22 =dev-java/java-config-1.3*" 19 || ( app-admin/eselect-java <dev-java/java-config-2.2 )"
20DEPEND="${RDEPEND}"
21has "${EAPI}" 0 1 && DEPEND="${DEPEND} >=sys-apps/portage-2.1"
23 22
24export WANT_JAVA_CONFIG=2 23export WANT_JAVA_CONFIG=2
25 24
25
26# @ECLASS-VARIABLE: JAVA_VM_CONFIG_DIR
27# @INTERNAL
28# @DESCRIPTION:
29# Where to place the vm env file.
26JAVA_VM_CONFIG_DIR="/usr/share/java-config-2/vm" 30JAVA_VM_CONFIG_DIR="/usr/share/java-config-2/vm"
31
32# @ECLASS-VARIABLE: JAVA_VM_DIR
33# @INTERNAL
34# @DESCRIPTION:
35# Base directory for vm links.
27JAVA_VM_DIR="/usr/lib/jvm" 36JAVA_VM_DIR="/usr/lib/jvm"
28 37
29EXPORT_FUNCTIONS pkg_setup pkg_postinst pkg_prerm pkg_postrm 38# @ECLASS-VARIABLE: JAVA_VM_SYSTEM
39# @INTERNAL
40# @DESCRIPTION:
41# Link for system-vm
42JAVA_VM_SYSTEM="/etc/java-config-2/current-system-vm"
43
44# @ECLASS-VARIABLE: JAVA_VM_BUILD_ONLY
45# @DESCRIPTION:
46# Set to YES to mark a vm as build-only.
47JAVA_VM_BUILD_ONLY="${JAVA_VM_BUILD_ONLY:-FALSE}"
48
49
50# @FUNCTION: java-vm-2_pkg_setup
51# @DESCRIPTION:
52# default pkg_setup
53#
54# Initialize vm handle.
30 55
31java-vm-2_pkg_setup() { 56java-vm-2_pkg_setup() {
32 if [[ "${SLOT}" != "0" ]]; then 57 if [[ "${SLOT}" != "0" ]]; then
33 VMHANDLE=${PN}-${SLOT} 58 VMHANDLE=${PN}-${SLOT}
34 else 59 else
35 VMHANDLE=${PN} 60 VMHANDLE=${PN}
36 fi 61 fi
37} 62}
38 63
64
65# @FUNCTION: java-vm-2_pkg_postinst
66# @DESCRIPTION:
67# default pkg_postinst
68#
69# Set the generation-2 system VM and Java plugin, if it isn't set or the
70# setting is invalid. Also update mime database.
71
39java-vm-2_pkg_postinst() { 72java-vm-2_pkg_postinst() {
40 # Set the generation-2 system VM, if it isn't set 73 # Note that we cannot rely on java-config here, as it will silently recognize
41 if [[ -z "$(java-config-2 -f)" ]]; then 74 # e.g. icedtea6-bin as valid system VM if icedtea6 is set but invalid (e.g. due
75 # to the migration to icedtea-6)
76 if [[ ! -L "${ROOT}${JAVA_VM_SYSTEM}" ]]; then
42 java_set_default_vm_ 77 java_set_default_vm_
43 fi
44
45 # support both variables for now
46 if [[ ${JAVA_SUPPORTS_GENERATION_1} == 'true' && ${JAVA_VM_NO_GENERATION1} != 'true' ]]; then
47 local systemvm1="$(java-config-1 -f 2>/dev/null)"
48 # no generation-1 system-vm was previously set
49 if [[ -z "${systemvm1}" ]]; then
50 # if 20java exists, must be using old VM
51 if [[ -f /etc/env.d/20java ]]; then
52 ewarn "The current generation-1 system-vm is using an out-of-date VM,"
53 ewarn "as in, it hasn't been updated for use with the new Java sytem."
54 # othewise, it must not have been set before
55 else 78 else
56 ewarn "No generation-1 system-vm previously set." 79 local current_vm_path=$(readlink "${ROOT}${JAVA_VM_SYSTEM}")
57 fi 80 local current_vm=$(basename "${ROOT}${current_vm_path}")
58 ewarn "Setting generation-1 system-vm to ${VMHANDLE}" 81 if [[ ! -L "${ROOT}${JAVA_VM_DIR}/${current_vm}" ]]; then
59 java-config-1 --set-system-vm=${P} 2>/dev/null 82 java_set_default_vm_
60 # dirty check to see if we are upgrading current generation-1 system vm
61 elif [[ "${systemvm1}" = ${VMHANDLE}* ]]; then
62 einfo "Emerging the current generation-1 system-vm..."
63 einfo "Updating its config files."
64 java-config-1 --set-system-vm=${P} 2>/dev/null
65 # dirty check to see if current system vm is a jre - replace it with
66 elif [[ "${systemvm1}" = *jre* ]]; then
67 ewarn "Current generation-1 system-vm is a JRE"
68 ewarn "For the new and old Java systems to coexist,"
69 ewarn "the generation-1 system-vm must be a JDK."
70 ewarn "Setting generation-1 system-vm to ${VMHANDLE}"
71 java-config-1 --set-system-vm=${P} 2>/dev/null
72 fi 83 fi
73 # else... some other VM is being updated, so we don't have to worry
74 else
75 einfo "JREs and 1.5+ JDKs are not supported for use with generation-1."
76 einfo "This is because generation-1 is only for use for building packages."
77 einfo "Only generation-2 should be used by end-users,"
78 einfo "where all JREs and JDKs will be available"
79 fi 84 fi
80
81 echo
82 85
83 java-vm_check-nsplugin 86 java-vm_check-nsplugin
84 java_mozilla_clean_ 87 java_mozilla_clean_
85 fdo-mime_desktop_database_update 88 fdo-mime_desktop_database_update
86} 89}
90
91
92# @FUNCTION: java-vm_check-nsplugin
93# @INTERNAL
94# @DESCRIPTION:
95# Check if the nsplugin needs updating
87 96
88java-vm_check-nsplugin() { 97java-vm_check-nsplugin() {
89 local libdir 98 local libdir
90 if [[ ${VMHANDLE} =~ emul-linux-x86 ]]; then 99 if [[ ${VMHANDLE} =~ emul-linux-x86 ]]; then
91 libdir=lib32 100 libdir=lib32
92 else 101 else
93 libdir=lib 102 libdir=lib
94 fi 103 fi
104
105 has ${EAPI:-0} 0 1 2 && ! use prefix && EPREFIX=
106
95 # Install a default nsplugin if we don't already have one 107 # Install a default nsplugin if we don't already have one
96 if has nsplugin ${IUSE} && use nsplugin; then 108 if in_iuse nsplugin && use nsplugin; then
97 if [[ ! -f /usr/${libdir}/nsbrowser/plugins/javaplugin.so ]]; then 109 if [[ ! -f "${ROOT}${EPREFIX}"/usr/${libdir}/nsbrowser/plugins/javaplugin.so ]]; then
98 einfo "No system nsplugin currently set." 110 einfo "No system nsplugin currently set."
99 java-vm_set-nsplugin 111 java-vm_set-nsplugin
100 else 112 else
101 einfo "System nsplugin is already set, not changing it." 113 einfo "System nsplugin is already set, not changing it."
102 fi 114 fi
103 einfo "You can change nsplugin with eselect java-nsplugin." 115 einfo "You can change nsplugin with eselect java-nsplugin."
104 fi 116 fi
105} 117}
118
119
120# @FUNCTION: java-vm_set-nsplugin
121# @INTERNAL
122# @DESCRIPTION:
123# Set the nsplugin implemetation.
106 124
107java-vm_set-nsplugin() { 125java-vm_set-nsplugin() {
108 local extra_args 126 local extra_args
109 if use amd64; then 127 if use amd64; then
110 if [[ ${VMHANDLE} =~ emul-linux-x86 ]]; then 128 if [[ ${VMHANDLE} =~ emul-linux-x86 ]]; then
117 einfo "Setting nsplugin to ${VMHANDLE}..." 135 einfo "Setting nsplugin to ${VMHANDLE}..."
118 fi 136 fi
119 eselect java-nsplugin set ${extra_args} ${VMHANDLE} 137 eselect java-nsplugin set ${extra_args} ${VMHANDLE}
120} 138}
121 139
140
141# @FUNCTION: java-vm-2_pkg_prerm
142# @DESCRIPTION:
143# default pkg_prerm
144#
145# Warn user if removing system-vm.
146
122java-vm-2_pkg_prerm() { 147java-vm-2_pkg_prerm() {
123 if [[ "$(java-config -f 2>/dev/null)" == "${VMHANDLE}" ]]; then 148 # Although REPLACED_BY_VERSION is EAPI=4, we shouldn't need to check EAPI for this use case
149 if [[ "$(GENTOO_VM="" java-config -f 2>/dev/null)" == "${VMHANDLE}" && -z "${REPLACED_BY_VERSION}" ]]; then
124 ewarn "It appears you are removing your system-vm!" 150 ewarn "It appears you are removing your system-vm!"
125 ewarn "Please run java-config -L to list available VMs," 151 ewarn "Please run java-config -L to list available VMs,"
126 ewarn "then use java-config -S to set a new system-vm!" 152 ewarn "then use java-config -S to set a new system-vm!"
127 fi 153 fi
128} 154}
129 155
156
157# @FUNCTION: java-vm-2_pkg_postrm
158# @DESCRIPTION:
159# default pkg_postrm
160#
161# Update mime database.
162
130java-vm-2_pkg_postrm() { 163java-vm-2_pkg_postrm() {
131 fdo-mime_desktop_database_update 164 fdo-mime_desktop_database_update
132} 165}
133 166
167
168# @FUNCTION: java_set_default_vm_
169# @INTERNAL
170# @DESCRIPTION:
171# Set system-vm.
172
134java_set_default_vm_() { 173java_set_default_vm_() {
135 java-config-2 --set-system-vm="${VMHANDLE}" 174 java-config-2 --set-system-vm="${VMHANDLE}"
136 175
137 einfo " ${P} set as the default system-vm." 176 einfo " ${P} set as the default system-vm."
138} 177}
178
179
180# @FUNCTION: get_system_arch
181# @DESCRIPTION:
182# Get Java specific arch name.
139 183
140get_system_arch() { 184get_system_arch() {
141 local sarch 185 local sarch
142 sarch=$(echo ${ARCH} | sed -e s/[i]*.86/i386/ -e s/x86_64/amd64/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/) 186 sarch=$(echo ${ARCH} | sed -e s/[i]*.86/i386/ -e s/x86_64/amd64/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/)
143 if [ -z "${sarch}" ]; then 187 if [ -z "${sarch}" ]; then
144 sarch=$(uname -m | sed -e s/[i]*.86/i386/ -e s/x86_64/amd64/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/) 188 sarch=$(uname -m | sed -e s/[i]*.86/i386/ -e s/x86_64/amd64/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/)
145 fi 189 fi
146 echo ${sarch} 190 echo ${sarch}
147} 191}
148 192
193
194# @FUNCTION: set_java_env
195# @DESCRIPTION:
196# Installs a vm env file.
197
149# TODO rename to something more evident, like install_env_file 198# TODO rename to something more evident, like install_env_file
150set_java_env() { 199set_java_env() {
151 debug-print-function ${FUNCNAME} $* 200 debug-print-function ${FUNCNAME} $*
201
202 if has ${EAPI:-0} 0 1 2 && ! use prefix ; then
203 ED="${D}"
204 EPREFIX=""
205 fi
206
152 local platform="$(get_system_arch)" 207 local platform="$(get_system_arch)"
153 local env_file="${D}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}" 208 local env_file="${ED}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}"
154 local old_env_file="${D}/etc/env.d/java/20${P}" 209 local old_env_file="${ED}/etc/env.d/java/20${P}"
155 if [[ ${1} ]]; then 210 if [[ ${1} ]]; then
156 local source_env_file="${1}" 211 local source_env_file="${1}"
157 else 212 else
158 local source_env_file="${FILESDIR}/${VMHANDLE}.env" 213 local source_env_file="${FILESDIR}/${VMHANDLE}.env"
159 fi 214 fi
166 sed \ 221 sed \
167 -e "s/@P@/${P}/g" \ 222 -e "s/@P@/${P}/g" \
168 -e "s/@PN@/${PN}/g" \ 223 -e "s/@PN@/${PN}/g" \
169 -e "s/@PV@/${PV}/g" \ 224 -e "s/@PV@/${PV}/g" \
170 -e "s/@PF@/${PF}/g" \ 225 -e "s/@PF@/${PF}/g" \
226 -e "s/@SLOT@/${SLOT}/g" \
171 -e "s/@PLATFORM@/${platform}/g" \ 227 -e "s/@PLATFORM@/${platform}/g" \
228 -e "s/@LIBDIR@/$(get_libdir)/g" \
172 -e "/^LDPATH=.*lib\\/\\\"/s|\"\\(.*\\)\"|\"\\1${platform}/:\\1${platform}/server/\"|" \ 229 -e "/^LDPATH=.*lib\\/\\\"/s|\"\\(.*\\)\"|\"\\1${platform}/:\\1${platform}/server/\"|" \
173 < ${source_env_file} \ 230 < "${source_env_file}" \
174 > ${env_file} || die "sed failed" 231 > "${env_file}" || die "sed failed"
175 232
233 (
176 echo "VMHANDLE=\"${VMHANDLE}\"" >> ${env_file} 234 echo "VMHANDLE=\"${VMHANDLE}\""
235 echo "BUILD_ONLY=\"${JAVA_VM_BUILD_ONLY}\""
236 ) >> "${env_file}"
177 237
178 # generation-1 compatibility 238 eprefixify ${env_file}
179 # respect both variables for now...
180 if [[ ${JAVA_SUPPORTS_GENERATION_1} == 'true' && ${JAVA_VM_NO_GENERATION1} != 'true' ]]; then
181 einfo "Enabling generation-1 compatibility..."
182 dodir /etc/env.d/java # generation-1 compatibility
183 # We need to strip some things out of the new style env,
184 # because these end up going in the env
185 sed -e 's/.*CLASSPATH.*//' \
186 -e 's/.*PROVIDES.*//' \
187 ${env_file} \
188 > ${old_env_file} || die "failed to create generation-1 env file"
189 else
190 ewarn "Disabling generation-1 compatibility..."
191 fi
192 239
193 [[ -n ${JAVA_PROVIDE} ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" >> ${env_file} 240 [[ -n ${JAVA_PROVIDE} ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" >> ${env_file}
194 241
195 local java_home=$(source ${env_file}; echo ${JAVA_HOME}) 242 local java_home=$(source "${env_file}"; echo ${JAVA_HOME})
196 [[ -z ${java_home} ]] && die "No JAVA_HOME defined in ${env_file}" 243 [[ -z ${java_home} ]] && die "No JAVA_HOME defined in ${env_file}"
197 244
198 # Make the symlink 245 # Make the symlink
246 dodir "${JAVA_VM_DIR}"
199 dosym ${java_home} ${JAVA_VM_DIR}/${VMHANDLE} \ 247 dosym ${java_home#${EPREFIX}} ${JAVA_VM_DIR}/${VMHANDLE} \
200 || die "Failed to make VM symlink at ${JAVA_VM_DIR}/${VMHANDLE}" 248 || die "Failed to make VM symlink at ${JAVA_VM_DIR}/${VMHANDLE}"
201} 249}
202 250
203# ----------------------------------------------------------------------------- 251
204# @ebuild-function java-vm_revdep-mask 252# @FUNCTION: java-vm_set-pax-markings
253# @DESCRIPTION:
254# Set PaX markings on all JDK/JRE executables to allow code-generation on
255# the heap by the JIT compiler.
256#
257# The markings need to be set prior to the first invocation of the the freshly
258# built / installed VM. Be it before creating the Class Data Sharing archive or
259# generating cacerts. Otherwise a PaX enabled kernel will kill the VM.
260# Bug #215225 #389751
205# 261#
262# @CODE
263# Parameters:
264# $1 - JDK/JRE base directory.
265#
266# Examples:
267# java-vm_set-pax-markings "${S}"
268# java-vm_set-pax-markings "${ED}"/opt/${P}
269# @CODE
270
271java-vm_set-pax-markings() {
272 debug-print-function ${FUNCNAME} "$*"
273 [[ $# -ne 1 ]] && die "${FUNCNAME}: takes exactly one argument"
274 [[ ! -f "${1}"/bin/java ]] \
275 && die "${FUNCNAME}: argument needs to be JDK/JRE base directory"
276
277 local executables=( "${1}"/bin/* )
278 [[ -d "${1}"/jre ]] && executables+=( "${1}"/jre/bin/* )
279
280 # Usally disabeling MPROTECT is sufficent
281 local pax_markings="m"
282 # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
283 use x86 && pax_markings="msp"
284
285 pax-mark ${pax_markings} $(list-paxables "${executables[@]}")
286}
287
288
289# @FUNCTION: java-vm_revdep-mask
290# @DESCRIPTION:
206# Installs a revdep-rebuild control file which SEARCH_DIR_MASK set to the path 291# Installs a revdep-rebuild control file which SEARCH_DIR_MASK set to the path
207# where the VM is installed. Prevents pointless rebuilds - see bug #177925. 292# where the VM is installed. Prevents pointless rebuilds - see bug #177925.
208# Also gives a notice to the user. 293# Also gives a notice to the user.
209# 294#
210# @example 295# @CODE
211# java-vm_revdep-mask 296# Parameters:
212# java-vm_revdep-mask /path/to/jdk/
213#
214# @param $1 - Path of the VM (defaults to /opt/${P} if not set) 297# $1 - Path of the VM (defaults to /opt/${P} if not set)
215# ------------------------------------------------------------------------------ 298#
299# Examples:
300# java-vm_revdep-mask
301# java-vm_revdep-mask /path/to/jdk/
302#
303# @CODE
304
216java-vm_revdep-mask() { 305java-vm_revdep-mask() {
306 if has ${EAPI:-0} 0 1 2 && ! use prefix; then
307 ED="${D}"
308 EPREFIX=
309 fi
310
217 local VMROOT="${1-/opt/${P}}" 311 local VMROOT="${1-"${EPREFIX}"/opt/${P}}"
218 312
219 dodir /etc/revdep-rebuild/ 313 dodir /etc/revdep-rebuild/
220 echo "SEARCH_DIRS_MASK=\"${VMROOT}\""> "${D}/etc/revdep-rebuild/61-${VMHANDLE}" 314 echo "SEARCH_DIRS_MASK=\"${VMROOT}\""> "${ED}/etc/revdep-rebuild/61-${VMHANDLE}"
221
222 elog "A revdep-rebuild control file was installed to prevent reinstalls due to"
223 elog "missing dependencies (see bug #177925 for more info). Note that some parts"
224 elog "of the JVM may require dependencies that are pulled only through respective"
225 elog "USE flags (typically X, alsa, odbc) and some Java code may fail without them."
226} 315}
316
317
318# @FUNCTION: java-vm_sandbox-predict
319# @DESCRIPTION:
320# Install a sandbox control file. Specified paths won't cause a sandbox
321# violation if opened read write but no write takes place. See bug 388937#c1
322#
323# @CODE
324# Examples:
325# java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
326# @CODE
327
328java-vm_sandbox-predict() {
329 debug-print-function ${FUNCNAME} "$*"
330 [[ -z "${1}" ]] && die "${FUNCNAME} takes at least one argument"
331
332 has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
333
334 local path path_arr=("$@")
335 # subshell this to prevent IFS bleeding out dependant on bash version.
336 # could use local, which *should* work, but that requires a lot of testing.
337 path=$(IFS=":"; echo "${path_arr[*]}")
338 dodir /etc/sandbox.d
339 echo "SANDBOX_PREDICT=\"${path}\"" > "${ED}/etc/sandbox.d/20${VMHANDLE}" \
340 || die "Failed to write sandbox control file"
341}
342
343
344# @FUNCTION: java_get_plugin_dir_
345# @INTERNAL
346# @DESCRIPTION:
347# Get the java plugin dir.
227 348
228java_get_plugin_dir_() { 349java_get_plugin_dir_() {
350 has ${EAPI:-0} 0 1 2 && ! use prefix && EPREFIX=
229 echo /usr/$(get_libdir)/nsbrowser/plugins 351 echo "${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins
230} 352}
353
354
355# @FUNCTION: install_mozilla_plugin
356# @DESCRIPTION:
357# Register a netscape java-plugin.
231 358
232install_mozilla_plugin() { 359install_mozilla_plugin() {
233 local plugin="${1}" 360 local plugin="${1}"
234 local variant="${2}" 361 local variant="${2}"
235 362
363 has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
236 if [[ ! -f "${D}/${plugin}" ]]; then 364 if [[ ! -f "${ED}/${plugin}" ]]; then
237 die "Cannot find mozilla plugin at ${D}/${plugin}" 365 die "Cannot find mozilla plugin at ${ED}/${plugin}"
238 fi 366 fi
239 367
240 if [[ -n "${variant}" ]]; then 368 if [[ -n "${variant}" ]]; then
241 variant="-${variant}" 369 variant="-${variant}"
242 fi 370 fi
244 local plugin_dir="/usr/share/java-config-2/nsplugin" 372 local plugin_dir="/usr/share/java-config-2/nsplugin"
245 dodir "${plugin_dir}" 373 dodir "${plugin_dir}"
246 dosym "${plugin}" "${plugin_dir}/${VMHANDLE}${variant}-javaplugin.so" 374 dosym "${plugin}" "${plugin_dir}/${VMHANDLE}${variant}-javaplugin.so"
247} 375}
248 376
377
378# @FUNCTION: java_mozilla_clean_
379# @INTERNAL
380# @DESCRIPTION:
381# Because previously some ebuilds installed symlinks outside of pkg_install
382# and are left behind, which forces you to manualy remove them to select the
383# jdk/jre you want to use for java
384
249java_mozilla_clean_() { 385java_mozilla_clean_() {
250 # Because previously some ebuilds installed symlinks outside of pkg_install
251 # and are left behind, which forces you to manualy remove them to select the
252 # jdk/jre you want to use for java
253 local plugin_dir=$(java_get_plugin_dir_) 386 local plugin_dir=$(java_get_plugin_dir_)
254 for file in ${plugin_dir}/javaplugin_*; do 387 for file in ${plugin_dir}/javaplugin_*; do
255 rm -f ${file} 388 rm -f ${file}
256 done 389 done
257 for file in ${plugin_dir}/libjavaplugin*; do 390 for file in ${plugin_dir}/libjavaplugin*; do
258 rm -f ${file} 391 rm -f ${file}
259 done 392 done
260} 393}
261
262# ------------------------------------------------------------------------------
263# @eclass-end
264# ------------------------------------------------------------------------------

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

  ViewVC Help
Powered by ViewVC 1.1.20