Unnamed Fossil Project

Diff
Login

Diff

Differences From Artifact [521279991a]:

To Artifact [899672c495]:


210
211
212
213
214
215
216

217





218


219
220
221
222
223
224

225





226
227
228
229
230
231
232
233

234





235
236
237
238
239
240
241
210
211
212
213
214
215
216
217

218
219
220
221
222
223
224
225
226
227
228
229
230
231
232

233
234
235
236
237
238
239
240
241
242
243
244
245
246

247
248
249
250
251
252
253
254
255
256
257
258







+
-
+
+
+
+
+

+
+






+
-
+
+
+
+
+








+
-
+
+
+
+
+







	@${ECHO_CMD} "${PKGNAME}: Environment error: \"${variable}\" should not be defined -- clearing."
.undef				${variable}
.			endif
.		endfor

# Error checking: JAVA_VERSION
.if !defined(_JAVA_VERSION_LIST_REGEXP)
.	for v in ${_JAVA_VERSION_LIST}
_JAVA_VERSION_LIST_REGEXP!=		${ECHO_CMD} "${_JAVA_VERSION_LIST}" | ${SED} "s/ /\\\|/g"
.		if defined(_JAVA_VERSION_LIST_REGEXP)
_JAVA_VERSION_LIST_REGEXP:=		${_JAVA_VERSION_LIST_REGEXP}\|
.		endif
_JAVA_VERSION_LIST_REGEXP:=		${_JAVA_VERSION_LIST_REGEXP}$v
.	endfor
.endif


check-makevars::
	@test ! -z "${JAVA_VERSION}" && ( ${ECHO_CMD} "${JAVA_VERSION}" | ${TR} " " "\n" | ${GREP} -q "${_JAVA_VERSION_LIST_REGEXP}" || \
	(${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

# Error checking: JAVA_VENDOR
.if !defined(_JAVA_VENDOR_LIST_REGEXP)
.	for v in ${_JAVA_VENDOR_LIST}
_JAVA_VENDOR_LIST_REGEXP!=		${ECHO_CMD} "${_JAVA_VENDOR_LIST}" | ${SED} "s/ /\\\|/g"
.		if defined(_JAVA_VENDOR_LIST_REGEXP)
_JAVA_VENDOR_LIST_REGEXP:=		${_JAVA_VENDOR_LIST_REGEXP}\|
.		endif
_JAVA_VENDOR_LIST_REGEXP:=		${_JAVA_VENDOR_LIST_REGEXP}$v
.	endfor
.endif
check-makevars::
	@test ! -z "${JAVA_VENDOR}" && ( ${ECHO_CMD} "${JAVA_VENDOR}" | ${TR} " " "\n" | ${GREP} -q "${_JAVA_VENDOR_LIST_REGEXP}" || \
	(${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}"; \
	${FALSE})) || true

# Error checking: JAVA_OS
.if !defined(_JAVA_OS_LIST_REGEXP)
.	for v in ${_JAVA_OS_LIST}
_JAVA_OS_LIST_REGEXP!=		${ECHO_CMD} "${_JAVA_OS_LIST}" | ${SED} "s/ /\\\|/g"
.		if defined(_JAVA_OS_LIST_REGEXP)
_JAVA_OS_LIST_REGEXP:=		${_JAVA_OS_LIST_REGEXP}\|
.		endif
_JAVA_OS_LIST_REGEXP:=		${_JAVA_OS_LIST_REGEXP}$v
.	endfor
.endif
check-makevars::
	@test ! -z "${JAVA_OS}" && ( ${ECHO_CMD} "${JAVA_OS}" | ${TR} " " "\n" | ${GREP} -q "${_JAVA_OS_LIST_REGEXP}" || \
	(${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}"; \
	${FALSE})) || true

# Set default values for JAVA_BUILD and JAVA_RUN