1.1 --- a/make/sanity-rules.gmk Mon Jun 20 17:28:19 2011 -0700
1.2 +++ b/make/sanity-rules.gmk Thu Jun 30 16:51:35 2011 -0700
1.3 @@ -1,5 +1,5 @@
1.4 #
1.5 -# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 +# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 #
1.9 # This code is free software; you can redistribute it and/or modify it
1.10 @@ -56,7 +56,7 @@
1.11
1.12 sanity:: post-sanity
1.13
1.14 -source-sanity : pre-sanity alt_bootdir bootdir post-sanity
1.15 +source-sanity : pre-sanity post-sanity
1.16
1.17 $(ERROR_FILE) $(WARNING_FILE) $(MESSAGE_FILE):
1.18 @$(prep-target)
1.19 @@ -224,45 +224,6 @@
1.20 endif
1.21
1.22 ######################################################
1.23 -# if specified, ALT_BOOTDIR must point to non-relative path if set
1.24 -######################################################
1.25 -alt_bootdir:
1.26 -ifdef ALT_BOOTDIR
1.27 - @if [ `$(ECHO) $(subst \,/,$(ALT_BOOTDIR)) | $(EGREP) -c '^([A-Za-z]:)?/'` -ne 1 ]; then \
1.28 - $(ECHO) "ERROR: ALT_BOOTDIR must be an Absolute Path Name, \n" \
1.29 - " not a Relative Path Name. \n" \
1.30 - " The current value of ALT_BOOTDIR is \n" \
1.31 - " $(ALT_BOOTDIR) \n" \
1.32 - " Please fix this and continue your build. \n" \
1.33 - "" >> $(ERROR_FILE) ; \
1.34 - fi
1.35 -endif
1.36 -
1.37 -######################################################
1.38 -# BOOTDIR must point to a valid JDK.
1.39 -######################################################
1.40 -JAVA_VERSION := $(shell $(BOOTDIR)/bin/java$(EXE_SUFFIX) -version 2>&1 | $(NAWK) -F'"' '{ print $$2 }')
1.41 -JAVA_VERSION_OK := $(shell $(ECHO) $(JAVA_VERSION) | $(EGREP) -c '^1.[5-6].[0-9]')
1.42 -bootdir:
1.43 - @if [ -x $(BOOTDIR)/bin/java$(EXE_SUFFIX) ]; then \
1.44 - if [ $(JAVA_VERSION_OK) -ne 1 ]; then \
1.45 - $(ECHO) "ERROR: Your BOOTDIR environment variable does not point \n" \
1.46 - " to a valid JDK for bootstrapping this build. \n" \
1.47 - " A JDK $(JDK_MKTG_VERSION) source generation process must be \n" \
1.48 - " bootstrapped using JDK $(PREVIOUS_JDK_VERSION) fcs (or later). \n" \
1.49 - " Apparently, your bootstrap JDK is version $(JAVA_VERSION) \n" \
1.50 - " Please update your ALT_BOOTDIR setting and start your build again. \n" \
1.51 - "" >> $(ERROR_FILE) ; \
1.52 - fi \
1.53 - else \
1.54 - $(ECHO) "ERROR: BOOTDIR does not point to a valid Java 2 SDK \n" \
1.55 - " Check that you have access to \n" \
1.56 - " $(BOOTDIR)/bin/java$(EXE_SUFFIX) \n" \
1.57 - " and/or check your value of ALT_BOOTDIR. \n" \
1.58 - "" >> $(ERROR_FILE) ; \
1.59 - fi
1.60 -
1.61 -######################################################
1.62 # dump out the variable settings...
1.63 ######################################################
1.64 ifneq ($(PLATFORM), windows)
1.65 @@ -350,4 +311,4 @@
1.66 .PHONY: sanity settings pre-sanity insane \
1.67 post-sanity post-sanity-hotspot post-sanity-jdk \
1.68 post-sanity-install post-sanity-deploy \
1.69 - alt_bootdir bootdir environment
1.70 + environment
