Re: [gentoo-java] Running java-pkg_ensure-no-bundled-jars automatically with JAVA_PKG_STRICT

["Petteri Räty" <betelgeuse@gentoo.org>]

[-- Attachment #1.1: Type: text/plain, Size: 728 bytes --]

Joshua Nichols kirjoitti:
> 
> * Some packages are weird, and jar up their sources inside of their
> upstream distfile, which we then unpack. So, we'd either need to remove
> those jars after unpacking, or perhaps add some checks to ensure the
> bundled jars don't contain class files
> * Some packages have jars for like tests, or examples, or whatnot. Maybe
> we need a variable to say what jars are ok?
> * In some cases, we may be only replacing some jars with jar-from... but
> perhaps not all of them, or maybe they are meant to replace a jar, but
> the jar changed names, so both the symlink from jar-from and the
> original are around.
> 

Probably best to go with the attached then.

Regards,
Petteri

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: no-bundled-jars.patch --]
[-- Type: text/x-patch; name="no-bundled-jars.patch", Size: 1323 bytes --]

Index: java-pkg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v
retrieving revision 1.8
diff -u -r1.8 java-pkg-2.eclass
--- java-pkg-2.eclass	18 Dec 2006 10:18:56 -0000	1.8
+++ java-pkg-2.eclass	6 Jan 2007 13:08:20 -0000
@@ -84,6 +84,7 @@
 }
 
 pre_src_compile() {
+	is-java-strict && java-pkg_ensure-no-bundled-jars --warn
 	java-pkg-2_pkg_setup
 }
 
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.39
diff -u -r1.39 java-utils-2.eclass
--- java-utils-2.eclass	3 Jan 2007 09:18:20 -0000	1.39
+++ java-utils-2.eclass	6 Jan 2007 13:08:21 -0000
@@ -1017,6 +1017,10 @@
 	debug-print-function ${FUNCNAME} $*
 	pushd ${WORKDIR} >/dev/null 2>/dev/null
 
+	if [[ "${1}" == "--warn" ]]; then
+		local warn="true"
+	fi
+
 	local bundled_jars=$(find . -name "*.jar" -type f)
 	if [[ -n ${bundled_jars} ]]; then
 		echo "Bundled jars found:"
@@ -1024,8 +1028,9 @@
 		for jar in ${bundled_jars}; do
 			echo $(pwd)${jar/./}
 		done
-		die "Bundled jars found!"
-
+		if [[ -z "${warn}" ]]; then
+			die "Bundled jars found!"
+		fi
 	fi
 	popd >/dev/null 2>/dev/null
 }

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 252 bytes --]