[gentoo-commits] gentoo-x86 commit in eclass: java-vm-2.eclass

[Petteri Raty (betelgeuse)]

betelgeuse    08/03/03 17:20:41

  Modified:             java-vm-2.eclass
  Log:
  Add the ability to tell where the env file is located to set_java_env.

Revision  Changes    Path
1.20                 eclass/java-vm-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-vm-2.eclass?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-vm-2.eclass?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-vm-2.eclass?r1=1.19&r2=1.20

Index: java-vm-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- java-vm-2.eclass	16 Dec 2007 17:11:01 -0000	1.19
+++ java-vm-2.eclass	3 Mar 2008 17:20:41 -0000	1.20
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.19 2007/12/16 17:11:01 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.20 2008/03/03 17:20:41 betelgeuse Exp $
 
 # -----------------------------------------------------------------------------
 # @eclass-begin
@@ -148,10 +148,15 @@
 
 # TODO rename to something more evident, like install_env_file
 set_java_env() {
+	debug-print-function ${FUNCNAME} $*
 	local platform="$(get_system_arch)"
 	local env_file="${D}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}"
 	local old_env_file="${D}/etc/env.d/java/20${P}"
-	local source_env_file="${FILESDIR}/${VMHANDLE}.env"
+	if [[ ${1} ]]; then
+		local source_env_file="${1}"
+	else
+		local source_env_file="${FILESDIR}/${VMHANDLE}.env"
+	fi
 
 	if [[ ! -f ${source_env_file} ]]; then
 		die "Unable to find the env file: ${source_env_file}"



-- 
gentoo-commits@l.g.o mailing list