Commit debian/0.1.21 - java-wrappers

[java-wrappers] Severely trim down the list of valid JVMs + ensure the likes of find_java_runtime default-jre are spotted in due time Vincent Fourmond 13 years ago

3 changed file(s) with 21 addition(s) and 25 deletion(s). Raw diff Collapse all Expand all

-2

debian/changelog less more

1	1
2	2	* Final form of the find_jar_classpath function that now only performs
3	3	path expansion for the argument, but not for the elements found in the
4		manifests that should be full paths anyway.
	4	manifests that should be full paths anyway (closes: #563197)
	5	* Trim down significantly the number of JVMs available, as fortunately
	6	the dozens-of-jvms dark age is long gone (closes: #612903)
	7	* Make it sure that mistakes such as find_java_runtime default-jre won't
	8	go unnoticed.
5	9
6		-- Vincent Fourmond <fourmond@debian.org> Mon, 04 Apr 2011 20:31:36 +0200
	10	-- Vincent Fourmond <fourmond@debian.org> Mon, 04 Apr 2011 21:08:31 +0200
7	11
8	12	java-wrappers (0.1.20) experimental; urgency=low
9	13

-5

java-wrappers.sh less more

104	104
105	105	while test "$1"
106	106	do
107		found_jvm=$(eval "echo -n \$__jvm_$1")
108		if [ -z "$found_jvm" ]; then
109		java_warning "JVM flavor '${1:-none}' not understood"
	107	if echo $1 \| egrep -- '[^0-9A-Za-z_]'; then
	108	java_warning "JVM flavor '${1}' contains illegal characters"
110	109	else
111		DIRS="$DIRS $found_jvm"
112		shift
	110	found_jvm=$(eval "echo -n \$__jvm_$1")
	111	if [ -z "$found_jvm" ] ; then
	112	java_warning "JVM flavor '${1:-none}' not understood"
	113	else
	114	DIRS="$DIRS $found_jvm"
	115	fi
113	116	fi
	117	shift
114	118	done
115	119	# Nothing means everything
116	120	if [ -z "$DIRS" ]; then

-18

jvm-list.sh less more

25	25	__jvm_default="/usr/lib/jvm/default-java"
26	26
27	27	# Sun runtimes
28		__jvm_sun4="/usr/lib/j2*1.4-sun"
29		__jvm_sun5="/usr/lib/jvm/java-1.5.0-sun /usr/lib/j2*1.5-sun"
30	28	__jvm_sun6="/usr/lib/jvm/java-6-sun /usr/lib/j2*1.6-sun"
31	29
32	30	# all sun runtimes
33		__jvm_sun="$__jvm_sun4 $__jvm_sun5 $__jvm_sun6"
	31	__jvm_sun="$__jvm_sun6"
34	32	# Sun version at least 5:
35		__jvm_sunmin5="$__jvm_sun5 $__jvm_sun6"
36
37		# IBM runtimes. This comes from argouml.sh
38		# I'm not quite sure it is still useful, but, we never know !
39		__jvm_ibm="/usr/lib/j2*1.[456]-ibm"
40
	33	__jvm_sunmin5="$__jvm_sun6"
41	34
42	35	# Now, free runtimes:
43	36	__jvm_gcj2="/usr/lib/jvm/java--gcj-4. "
44	37	__jvm_gcj5="/usr/lib/jvm/java-1.5-gcj-4. "
45		__jvm_sablevm="/usr/lib/sablevm" # Probably should be dropped, only in etch
46		__jvm_kaffe="/usr/lib/kaffe /usr/lib/kaffe/pthreads /usr/lib/kaffe/jthreads"
47		__jvm_icedtea="/usr/lib/jvm/java-7-icedtea" # Probably should be dropped...
48		__jvm_cacao="/usr/lib/jvm/cacao"
49	38	__jvm_openjdk6="/usr/lib/jvm/java-6-openjdk"
50		__jvm_cacaooj6="/usr/lib/jvm/java-6-cacao/jre"
51	39
52	40	# And a few aliases
53	41	__jvm_gcj="$__jvm_gcj2"
54		__jvm_openjdk="$__jvm_openjdk6 $__jvm_cacaooj6"
	42	__jvm_openjdk="$__jvm_openjdk6"
55	43
56	44	# The java* runtimes:
57	45	# -> corresponds to Provides: java6-runtime
58		__jvm_java6="$__jvm_openjdk6 $__jvm_cacaooj6 $__jvm_sun6"
	46	__jvm_java6="$__jvm_openjdk6 $__jvm_sun6"
59	47	# -> corresponds to Provides: java5-runtime
60		__jvm_java5="$__jvm_gcj5 $__jvm_java6 $__jvm_sun5"
	48	__jvm_java5="$__jvm_gcj5 $__jvm_java6"
61	49	# -> corresponds to Provides: java2-runtime
62	50	__jvm_java2="$__jvm_java5 $__jvm_gcj2"
63	51

65	53	__jvm_alt=$(readlink /etc/alternatives/java\|sed -n 's/$\/usr\/lib\/jvm\/[^\/]$\/./\1/p')
66	54
67	55	# All JVMs
68		__jvm_all="$__jvm_default /usr/lib/jvm/* $__jvm_ibm $__jvm_sun4 $__jvm_sablevm $__jvm_kaffe"
	56	__jvm_all="$__jvm_default /usr/lib/jvm/*"
69	57
70	58	# Probably here should come a few meaningful global aliases.