View | Details | Raw Unified | Return to bug 220737
Collapse All | Expand All

(-)Mk/bsd.java.mk (-6 / +12 lines)
Lines 213-245 Link Here
213
.		endfor
213
.		endfor
214
214
215
# Error checking: JAVA_VERSION
215
# Error checking: JAVA_VERSION
216
.if defined(JAVA_VERSION)
216
.if !defined(_JAVA_VERSION_LIST_REGEXP)
217
.if !defined(_JAVA_VERSION_LIST_REGEXP)
217
_JAVA_VERSION_LIST_REGEXP=	${_JAVA_VERSION_LIST:C/\+/\\+/:ts|}
218
_JAVA_VERSION_LIST_REGEXP=	${_JAVA_VERSION_LIST:C/\+/\\+/:ts|}
218
.endif
219
.endif
219
220
220
check-makevars::
221
check-makevars::
221
	@test ! -z "${JAVA_VERSION}" && ( ${ECHO_CMD} "${JAVA_VERSION}" | ${TR} " " "\n" | ${GREP} -Eq "${_JAVA_VERSION_LIST_REGEXP}" || \
222
	@( test ! -z "${JAVA_VERSION}" && ( ${ECHO_CMD} "${JAVA_VERSION}" | ${TR} " " "\n" | ${GREP} -Eq "${_JAVA_VERSION_LIST_REGEXP}")) || \
222
	(${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_VERSION}\" is not a valid value for JAVA_VERSION. It should be one or more of: ${__JAVA_VERSION_LIST} (with an optional \"+\" suffix.)"; ${FALSE})) || true
223
	(${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_VERSION}\" is not a valid value for JAVA_VERSION. It should be one or more of: ${__JAVA_VERSION_LIST} (with an optional \"+\" suffix.)"; ${FALSE})
224
.endif
223
225
224
# Error checking: JAVA_VENDOR
226
# Error checking: JAVA_VENDOR
227
.if defined(JAVA_VENDOR)
225
.if !defined(_JAVA_VENDOR_LIST_REGEXP)
228
.if !defined(_JAVA_VENDOR_LIST_REGEXP)
226
_JAVA_VENDOR_LIST_REGEXP=	${_JAVA_VENDOR_LIST:ts|}
229
_JAVA_VENDOR_LIST_REGEXP=	${_JAVA_VENDOR_LIST:ts|}
227
.endif
230
.endif
228
231
229
check-makevars::
232
check-makevars::
230
	@test ! -z "${JAVA_VENDOR}" && ( ${ECHO_CMD} "${JAVA_VENDOR}" | ${TR} " " "\n" | ${GREP} -Eq "${_JAVA_VENDOR_LIST_REGEXP}" || \
233
	@( test ! -z "${JAVA_VENDOR}" && ( ${ECHO_CMD} "${JAVA_VENDOR}" | ${TR} " " "\n" | ${GREP} -Eq "${_JAVA_VENDOR_LIST_REGEXP}" )) || \
231
	(${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_VENDOR}\" is not a valid value for JAVA_VENDOR. It should be one or more of: ${_JAVA_VENDOR_LIST}"; \
234
	(${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_VENDOR}\" is not a valid value for JAVA_VENDOR. It should be one or more of: ${_JAVA_VENDOR_LIST}"; \
232
	${FALSE})) || true
235
	${FALSE})
236
.endif
233
237
234
# Error checking: JAVA_OS
238
# Error checking: JAVA_OS
239
.if defined(JAVA_OS)
235
.if !defined(_JAVA_OS_LIST_REGEXP)
240
.if !defined(_JAVA_OS_LIST_REGEXP)
236
_JAVA_OS_LIST_REGEXP=	${_JAVA_OS_LIST:ts|}
241
_JAVA_OS_LIST_REGEXP=	${_JAVA_OS_LIST:ts|}
237
.endif
242
.endif
238
243
239
check-makevars::
244
check-makevars::
240
	@test ! -z "${JAVA_OS}" && ( ${ECHO_CMD} "${JAVA_OS}" | ${TR} " " "\n" | ${GREP} -Eq "${_JAVA_OS_LIST_REGEXP}" || \
245
	@( test ! -z "${JAVA_OS}" && ( ${ECHO_CMD} "${JAVA_OS}" | ${TR} " " "\n" | ${GREP} -Eq "${_JAVA_OS_LIST_REGEXP}")) || \
241
	(${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_OS}\" is not a valid value for JAVA_OS. It should be one or more of: ${_JAVA_OS_LIST}"; \
246
	(${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_OS}\" is not a valid value for JAVA_OS. It should be one or more of: ${_JAVA_OS_LIST}"; \
242
	${FALSE})) || true
247
	${FALSE})
248
.endif
243
249
244
# Set default values for JAVA_BUILD and JAVA_RUN
250
# Set default values for JAVA_BUILD and JAVA_RUN
245
# When nothing is set, assume JAVA_BUILD=jdk and JAVA_RUN=jre
251
# When nothing is set, assume JAVA_BUILD=jdk and JAVA_RUN=jre

Return to bug 220737