View | Details | Raw Unified | Return to bug 116724 | Differences between
and this patch

Collapse All | Expand All

(-)bsd.java.mk (-36 / +12 lines)
Lines 25-31 Link Here
25
#
25
#
26
# JAVA_VERSION		List of space-separated suitable java versions for the
26
# JAVA_VERSION		List of space-separated suitable java versions for the
27
#					port. An optional "+" allows you to specify a range of
27
#					port. An optional "+" allows you to specify a range of
28
#					versions. (allowed values: 1.1[+] 1.2[+] 1.3[+] 1.4[+])
28
#					versions. (allowed values: 1.3[+] 1.4[+] 1.5[+] 1.6[+])
29
#
29
#
30
# JAVA_OS			List of space-separated suitable JDK port operating systems
30
# JAVA_OS			List of space-separated suitable JDK port operating systems
31
#					for the port. (allowed values: native linux)
31
#					for the port. (allowed values: native linux)
Lines 70-82 Link Here
70
#					'/usr/local/jdk1.3.1')
70
#					'/usr/local/jdk1.3.1')
71
#
71
#
72
# JAVAC				Path to the Java compiler to use. (e.g.
72
# JAVAC				Path to the Java compiler to use. (e.g.
73
#					'/usr/local/jdk1.1.8/bin/javac' or '/usr/local/bin/jikes')
73
#					'/usr/local/jdk1.5.0/bin/javac' or '/usr/local/bin/jikes')
74
#
74
#
75
# JAR				Path to the JAR tool to use. (e.g.
75
# JAR				Path to the JAR tool to use. (e.g.
76
#					'/usr/local/jdk1.2.2/bin/jar' or '/usr/local/bin/fastjar')
76
#					'/usr/local/jdk1.5.0/bin/jar' or '/usr/local/bin/fastjar')
77
#
77
#
78
# APPLETVIEWER		Path to the appletviewer utility. (e.g.
78
# APPLETVIEWER		Path to the appletviewer utility. (e.g.
79
#					'/usr/local/linux-jdk1.2.2/bin/appletviewer')
79
#					'/usr/local/linux-jdk1.3.1/bin/appletviewer')
80
#
80
#
81
# JAVA				Path to the java executable. Use this for executing Java
81
# JAVA				Path to the java executable. Use this for executing Java
82
#					programs. (e.g. '/usr/local/jdk1.3.1/bin/java')
82
#					programs. (e.g. '/usr/local/jdk1.3.1/bin/java')
Lines 87-99 Link Here
87
#
87
#
88
# JAVAP				Path to the javap program.
88
# JAVAP				Path to the javap program.
89
#
89
#
90
# JAVA_KEYTOOL		Path to the keytool utility program. This settings is
90
# JAVA_KEYTOOL		Path to the keytool utility program.
91
#					availble only if the JDK is Java 1.2 or higher.
92
#
91
#
93
# JAVA_N2A			Path to the native2ascii tool.
92
# JAVA_N2A			Path to the native2ascii tool.
94
#
93
#
95
# JAVA_POLICYTOOL	Path to the policytool program. This variable is available
94
# JAVA_POLICYTOOL	Path to the policytool program.
96
#					only if the JDK is Java 1.2 or higher.
97
#
95
#
98
# JAVA_SERIALVER	Path to the serialver utility program.
96
# JAVA_SERIALVER	Path to the serialver utility program.
99
#
97
#
Lines 101-112 Link Here
101
#
99
#
102
# RMIREGISTRY		Path to the RMI registry program, rmiregistry.
100
# RMIREGISTRY		Path to the RMI registry program, rmiregistry.
103
#
101
#
104
# RMID				Path to the RMI daemon program. This settings is only
102
# RMID				Path to the RMI daemon program.
105
#					available if the JDK is Java 1.2 or higher.
106
#
103
#
107
# JAVA_CLASSES		Path to the archive that contains the JDK class files. On
104
# JAVA_CLASSES		Path to the archive that contains the JDK class files. On
108
#					JDK 1.2 or later, this is ${JAVA_HOME}/jre/lib/rt.jar.
105
#					most JDKs, this is ${JAVA_HOME}/jre/lib/rt.jar.
109
#					Earlier JDK's use ${JAVA_HOME}/lib/classes.zip.
110
#
106
#
111
# JAVASHAREDIR		The base directory for all shared Java resources.
107
# JAVASHAREDIR		The base directory for all shared Java resources.
112
#
108
#
Lines 166-173 Link Here
166
.		endif
162
.		endif
167
163
168
# The complete list of Java versions, os and vendors supported.
164
# The complete list of Java versions, os and vendors supported.
169
__JAVA_VERSION_LIST=	1.1 1.2 1.3 1.4 1.5 1.6
165
__JAVA_VERSION_LIST=	1.3 1.4 1.5 1.6
170
_JAVA_VERSION_LIST=		${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
166
_JAVA_VERSION_LIST=		${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/} 1.1+ 1.2+
171
_JAVA_OS_LIST=			native linux
167
_JAVA_OS_LIST=			native linux
172
_JAVA_VENDOR_LIST=		freebsd bsdjava sun blackdown
168
_JAVA_VENDOR_LIST=		freebsd bsdjava sun blackdown
173
169
Lines 175-184 Link Here
175
# port location, corresponding JAVA_HOME, JDK version, OS, vendor
171
# port location, corresponding JAVA_HOME, JDK version, OS, vendor
176
_JAVA_PORT_NATIVE_FREEBSD_JDK_1_5_INFO=		PORT=java/diablo-jdk15			HOME=${LOCALBASE}/diablo-jdk1.5.0 \
172
_JAVA_PORT_NATIVE_FREEBSD_JDK_1_5_INFO=		PORT=java/diablo-jdk15			HOME=${LOCALBASE}/diablo-jdk1.5.0 \
177
											VERSION=1.5.0	OS=native	VENDOR=freebsd
173
											VERSION=1.5.0	OS=native	VENDOR=freebsd
178
_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1_INFO=		PORT=java/jdk11					HOME=${LOCALBASE}/jdk1.1.8 \
179
											VERSION=1.1.8	OS=native	VENDOR=bsdjava
180
_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_2_INFO=		PORT=java/jdk12					HOME=${LOCALBASE}/jdk1.2.2 \
181
											VERSION=1.2.2	OS=native	VENDOR=bsdjava
182
_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3_INFO=		PORT=java/jdk13					HOME=${LOCALBASE}/jdk1.3.1 \
174
_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3_INFO=		PORT=java/jdk13					HOME=${LOCALBASE}/jdk1.3.1 \
183
											VERSION=1.3.1	OS=native	VENDOR=bsdjava
175
											VERSION=1.3.1	OS=native	VENDOR=bsdjava
184
_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4_INFO=		PORT=java/jdk14					HOME=${LOCALBASE}/jdk1.4.2 \
176
_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4_INFO=		PORT=java/jdk14					HOME=${LOCALBASE}/jdk1.4.2 \
Lines 187-198 Link Here
187
											VERSION=1.5.0	OS=native	VENDOR=bsdjava
179
											VERSION=1.5.0	OS=native	VENDOR=bsdjava
188
_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6_INFO=		PORT=java/jdk16					HOME=${LOCALBASE}/jdk1.6.0 \
180
_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6_INFO=		PORT=java/jdk16					HOME=${LOCALBASE}/jdk1.6.0 \
189
											VERSION=1.6.0	OS=native	VENDOR=bsdjava
181
											VERSION=1.6.0	OS=native	VENDOR=bsdjava
190
_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_2_INFO=	PORT=java/linux-blackdown-jdk12	HOME=${LOCALBASE}/linux-blackdown-jdk1.2.2 \
191
											VERSION=1.2.2	OS=linux	VENDOR=blackdown
192
_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4_INFO=	PORT=java/linux-blackdown-jdk14	HOME=${LOCALBASE}/linux-blackdown-jdk1.4.2 \
182
_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4_INFO=	PORT=java/linux-blackdown-jdk14	HOME=${LOCALBASE}/linux-blackdown-jdk1.4.2 \
193
											VERSION=1.4.2	OS=linux	VENDOR=blackdown
183
											VERSION=1.4.2	OS=linux	VENDOR=blackdown
194
_JAVA_PORT_LINUX_SUN_JDK_1_2_INFO=			PORT=java/linux-sun-jdk12		HOME=${LOCALBASE}/linux-sun-jdk1.2.2 \
195
											VERSION=1.2.2	OS=linux	VENDOR=sun
196
_JAVA_PORT_LINUX_SUN_JDK_1_3_INFO=			PORT=java/linux-sun-jdk13		HOME=${LOCALBASE}/linux-sun-jdk1.3.1 \
184
_JAVA_PORT_LINUX_SUN_JDK_1_3_INFO=			PORT=java/linux-sun-jdk13		HOME=${LOCALBASE}/linux-sun-jdk1.3.1 \
197
											VERSION=1.3.1	OS=linux	VENDOR=sun
185
											VERSION=1.3.1	OS=linux	VENDOR=sun
198
_JAVA_PORT_LINUX_SUN_JDK_1_4_INFO=			PORT=java/linux-sun-jdk14		HOME=${LOCALBASE}/linux-sun-jdk1.4.2 \
186
_JAVA_PORT_LINUX_SUN_JDK_1_4_INFO=			PORT=java/linux-sun-jdk14		HOME=${LOCALBASE}/linux-sun-jdk1.4.2 \
Lines 226-240 Link Here
226
					JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 \
214
					JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 \
227
					JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4 \
215
					JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4 \
228
					JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3 \
216
					JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3 \
229
					JAVA_PORT_NATIVE_BSDJAVA_JDK_1_2 \
230
					JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1 \
231
					JAVA_PORT_LINUX_SUN_JDK_1_6 \
217
					JAVA_PORT_LINUX_SUN_JDK_1_6 \
232
					JAVA_PORT_LINUX_SUN_JDK_1_5 \
218
					JAVA_PORT_LINUX_SUN_JDK_1_5 \
233
					JAVA_PORT_LINUX_SUN_JDK_1_4 \
219
					JAVA_PORT_LINUX_SUN_JDK_1_4 \
234
					JAVA_PORT_LINUX_SUN_JDK_1_3 \
220
					JAVA_PORT_LINUX_SUN_JDK_1_3 \
235
					JAVA_PORT_LINUX_SUN_JDK_1_2 \
221
					JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4
236
					JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4 \
237
					JAVA_PORT_LINUX_BLACKDOWN_JDK_1_2
238
_JAVA_PORTS_ALL=	${JAVA_PREFERRED_PORTS} \
222
_JAVA_PORTS_ALL=	${JAVA_PREFERRED_PORTS} \
239
					${_JAVA_PREFERRED_PORTS} \
223
					${_JAVA_PREFERRED_PORTS} \
240
					${__JAVA_PORTS_ALL}
224
					${__JAVA_PORTS_ALL}
Lines 308-314 Link Here
308
.		undef _JAVA_PORTS_INSTALLED
292
.		undef _JAVA_PORTS_INSTALLED
309
.		undef _JAVA_PORTS_POSSIBLE
293
.		undef _JAVA_PORTS_POSSIBLE
310
.		if defined(JAVA_VERSION)
294
.		if defined(JAVA_VERSION)
311
_JAVA_VERSION=	${JAVA_VERSION:S/1.1+/1.1 1.2 1.3 1.4 1.5 1.6/:S/1.2+/1.2 1.3 1.4 1.5 1.6/:S/1.3+/1.3 1.4 1.5 1.6/:S/1.4+/1.4 1.5 1.6/:S/1.5+/1.5 1.6/:S/1.6+/1.6/}
295
_JAVA_VERSION=	${JAVA_VERSION:S/1.1+/1.3+/:S/1.2+/1.3+/:S/1.3+/1.3 1.4+/:S/1.4+/1.4 1.5+/:S/1.5+/1.5 1.6+/:S/1.6+/1.6/}
312
.		else
296
.		else
313
_JAVA_VERSION=	${__JAVA_VERSION_LIST}
297
_JAVA_VERSION=	${__JAVA_VERSION_LIST}
314
.		endif
298
.		endif
Lines 490-509 Link Here
490
JAVA_SERIALVER?=${JAVA_HOME}/bin/serialver
474
JAVA_SERIALVER?=${JAVA_HOME}/bin/serialver
491
RMIC?=			${JAVA_HOME}/bin/rmic
475
RMIC?=			${JAVA_HOME}/bin/rmic
492
RMIREGISTRY?=	${JAVA_HOME}/bin/rmiregistry
476
RMIREGISTRY?=	${JAVA_HOME}/bin/rmiregistry
493
494
# Some executables only exists in JDK 1.2 and up
495
.		if ${_JAVA_PORT} != "JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1"
496
JAVA_KEYTOOL?=		${JAVA_HOME}/bin/keytool
477
JAVA_KEYTOOL?=		${JAVA_HOME}/bin/keytool
497
JAVA_POLICYTOOL?=	${JAVA_HOME}/bin/policytool
478
JAVA_POLICYTOOL?=	${JAVA_HOME}/bin/policytool
498
RMID?=				${JAVA_HOME}/bin/rmid
479
RMID?=				${JAVA_HOME}/bin/rmid
499
.		endif
500
480
501
# Set the location of the ZIP or JAR file with all standard Java classes.
481
# Set the location of the ZIP or JAR file with all standard Java classes.
502
.		if ${_JAVA_PORT} == "JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1"
503
JAVA_CLASSES=	${JAVA_HOME}/lib/classes.zip
504
.		else
505
JAVA_CLASSES=	${JAVA_HOME}/jre/lib/rt.jar
482
JAVA_CLASSES=	${JAVA_HOME}/jre/lib/rt.jar
506
.		endif
507
483
508
484
509
#-------------------------------------------------------------------------------
485
#-------------------------------------------------------------------------------

Return to bug 116724