Merge

Mon, 05 Mar 2012 17:02:11 -0800

author
lana
date
Mon, 05 Mar 2012 17:02:11 -0800
changeset 410
f2fd74a8e54e
parent 407
909bbce8f683
parent 409
d74f01115fb8
child 412
41460de04258

Merge

     1.1 --- a/make/sanity-rules.gmk	Thu Mar 01 12:23:01 2012 -0800
     1.2 +++ b/make/sanity-rules.gmk	Mon Mar 05 17:02:11 2012 -0800
     1.3 @@ -38,7 +38,7 @@
     1.4  endif
     1.5  
     1.6  ifeq ($(BUILD_JDK), true)
     1.7 -  sanity:: jdk-sanity 
     1.8 +  sanity:: jdk-sanity
     1.9  endif
    1.10  
    1.11  # Only need these sanity rules when not doing a debug build
    1.12 @@ -64,7 +64,7 @@
    1.13  purge-sanity: $(ERROR_FILE) $(WARNING_FILE) $(MESSAGE_FILE)
    1.14  	-@$(RM) $(ERROR_FILE) $(WARNING_FILE) $(MESSAGE_FILE)
    1.15  
    1.16 -pre-sanity: purge-sanity 
    1.17 +pre-sanity: purge-sanity
    1.18  
    1.19  # this should be the last rule in any target's sanity rule.
    1.20  post-sanity post-sanity-hotspot post-sanity-jdk post-sanity-install post-sanity-deploy:
    1.21 @@ -132,7 +132,7 @@
    1.22  	   "        $* defined. Please unset it and restart your build. \n" \
    1.23  	   "" >> $(ERROR_FILE)
    1.24  
    1.25 -# Check the environment variables	
    1.26 +# Check the environment variables
    1.27  environment: $(DO_NOT_SET_LIST:%=%.do_not_set)
    1.28  ifeq ($(LANGTOOLS_SRC_AVAILABLE), true)
    1.29    ifneq ($(BUILD_LANGTOOLS), true)
    1.30 @@ -205,7 +205,15 @@
    1.31    endif
    1.32  endif
    1.33  ifeq ($(GENERATE_DOCS),false)
    1.34 -	@$(ECHO) "WARNING: This build does not include running javadoc.\n" \
    1.35 +	@$(ECHO) "WARNING: This build does not include generating javadoc.\n" \
    1.36 +	   "" >> $(WARNING_FILE)
    1.37 +endif
    1.38 +ifdef NO_DEMOS
    1.39 +	@$(ECHO) "WARNING: This build and any install images will not include demos.\n" \
    1.40 +	   "" >> $(WARNING_FILE)
    1.41 +endif
    1.42 +ifdef NO_SAMPLES
    1.43 +	@$(ECHO) "WARNING: This build and any install images will not include samples.\n" \
    1.44  	   "" >> $(WARNING_FILE)
    1.45  endif
    1.46  ifdef NO_IMAGES
    1.47 @@ -231,7 +239,7 @@
    1.48      HOSTNAME := $(shell hostname)
    1.49    endif
    1.50  endif
    1.51 -settings:: 
    1.52 +settings::
    1.53  	@$(ECHO) "Build Machine Information:" >> $(MESSAGE_FILE)
    1.54  ifeq ($(PLATFORM), windows)
    1.55  	@$(ECHO) "   build machine = $(COMPUTERNAME)"  >> $(MESSAGE_FILE)

mercurial