Re: [gentoo-java] RFC: solving jdk-1.6 compatibility with bootclasspath

[Vlastimil Babka <caster@gentoo.org>]

[-- Attachment #1: Type: text/plain, Size: 740 bytes --]

Petteri Räty wrote:
> Vlastimil Babka wrote:
>> If it looks sane, I can commit it.
>>
> 
> Maybe register the jars for sun-bootclasspath and use java-pkg_getjars
> --build-only? Users might find java-config -p sun-bootclasspath useful
> for their own purposes.

Too bad, I've read the dlj licence and it seems packaging just rt.jar 
would violate it. So I've tried using gnu-classpath instead and seems to 
work for everything except two packages (which I've solved differently).

The attached eclass patch thus uses gnu-classpath. I've also added a 
JAVA_PKG_WANT_BOOTCLASSPATH variable to pull the needed dep.
gnu-classpath will just need a revbump to register the classes to 
package.env

> Regards,
> Petteri
> 


[-- Attachment #2: bootclasspath.patch --]
[-- Type: text/plain, Size: 3175 bytes --]

? ejavac.patch
Index: java-ant-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v
retrieving revision 1.45
diff -u -B -r1.45 java-ant-2.eclass
--- java-ant-2.eclass	15 Feb 2009 01:24:59 -0000	1.45
+++ java-ant-2.eclass	8 Nov 2009 20:18:50 -0000
@@ -451,3 +451,49 @@
 		die "xml-rewrite not found"
 	fi
 }
+
+# ------------------------------------------------------------------------------
+# @public java-ant_rewrite-bootclasspath
+#
+# Adds bootclasspath to javac-like tasks in build.xml filled with jars of a
+# bootclasspath package of given version.
+#
+# Affected by:
+#	JAVA_PKG_BSFIX_TARGET_TAGS - the tags of javac tasks
+#
+# @param $1 - the version of bootclasspath (e.g. 1.5), 'auto' for bootclasspath
+#             of the current JDK
+# @param $2 - path to desired build.xml file, defaults to 'build.xml'
+# @param $3 - (optional) what to prepend the bootclasspath with (to override)
+# @param $4 - (optional) what to append to the bootclasspath
+# ------------------------------------------------------------------------------
+
+java-ant_rewrite-bootclasspath() {
+	local version="${1}"
+	local file="${2-build.xml}"
+	local extra_before="${3}"
+	local extra_after="${4}"
+
+	local bcp
+	case "${version}" in 
+		auto)
+			bcp="$(java-config -g BOOTCLASSPATH)"
+			;;
+		1.5)
+			bcp="$(java-pkg_getjars --build-only gnu-classpath-0.98)"
+			;;
+		*)
+			eerror "unknown parameter of java-ant_rewrite-bootclasspath"
+			die "unknown parameter of java-ant_rewrite-bootclasspath"
+			;;
+	esac
+	if [[ -n "${extra_before}" ]]; then
+		bcp="${extra_before}:${bcp}"
+	fi
+	if [[ -n "${extra_after}" ]]; then
+		bcp="${bcp}:${extra_after}"
+	fi
+
+	java-ant_xml-rewrite -f "${file}" -c -e ${JAVA_PKG_BSFIX_TARGET_TAGS// / -e } \
+		-a bootclasspath -v "${bcp}"
+}
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.129
diff -u -B -r1.129 java-utils-2.eclass
--- java-utils-2.eclass	7 Jun 2009 08:22:42 -0000	1.129
+++ java-utils-2.eclass	8 Nov 2009 20:18:51 -0000
@@ -76,6 +76,22 @@
 hasq source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source? ( app-arch/zip )"
 
 # -----------------------------------------------------------------------------
+# @variable-preinherit JAVA_PKG_WANT_BOOTCLASSPATH
+#
+# The version of bootclasspath the package needs to work. Translates to a proper
+# dependency. The bootclasspath has to be obtained by java-ant_rewrite-bootclasspath
+# -----------------------------------------------------------------------------
+
+if [[ -n "${JAVA_PKG_WANT_BOOTCLASSPATH}" ]]; then
+	if [[ "${JAVA_PKG_WANT_BOOTCLASSPATH}" == "1.5" ]]; then
+		JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} >=dev-java/gnu-classpath-0.98-r1:0.98"
+	else
+		eerror "Unknown value of JAVA_PKG_WANT_BOOTCLASSPATH"
+		die "Unknown value of JAVA_PKG_WANT_BOOTCLASSPATH"
+	fi
+fi
+
+# -----------------------------------------------------------------------------
 # @variable-external JAVA_PKG_ALLOW_VM_CHANGE
 # @variable-default yes
 #