# HG changeset patch
# User lana
# Date 1330995731 28800
# Node ID f2fd74a8e54e694f8095daf630d1cfda6b6f9974
# Parent  909bbce8f6831952e757d7efac244cce433170fe# Parent  d74f01115fb850526c18fac12f78a7b0d1b81c57
Merge

diff -r 909bbce8f683 -r f2fd74a8e54e make/sanity-rules.gmk
--- a/make/sanity-rules.gmk	Thu Mar 01 12:23:01 2012 -0800
+++ b/make/sanity-rules.gmk	Mon Mar 05 17:02:11 2012 -0800
@@ -38,7 +38,7 @@
 endif
 
 ifeq ($(BUILD_JDK), true)
-  sanity:: jdk-sanity 
+  sanity:: jdk-sanity
 endif
 
 # Only need these sanity rules when not doing a debug build
@@ -64,7 +64,7 @@
 purge-sanity: $(ERROR_FILE) $(WARNING_FILE) $(MESSAGE_FILE)
 	-@$(RM) $(ERROR_FILE) $(WARNING_FILE) $(MESSAGE_FILE)
 
-pre-sanity: purge-sanity 
+pre-sanity: purge-sanity
 
 # this should be the last rule in any target's sanity rule.
 post-sanity post-sanity-hotspot post-sanity-jdk post-sanity-install post-sanity-deploy:
@@ -132,7 +132,7 @@
 	   "        $* defined. Please unset it and restart your build. \n" \
 	   "" >> $(ERROR_FILE)
 
-# Check the environment variables	
+# Check the environment variables
 environment: $(DO_NOT_SET_LIST:%=%.do_not_set)
 ifeq ($(LANGTOOLS_SRC_AVAILABLE), true)
   ifneq ($(BUILD_LANGTOOLS), true)
@@ -205,7 +205,15 @@
   endif
 endif
 ifeq ($(GENERATE_DOCS),false)
-	@$(ECHO) "WARNING: This build does not include running javadoc.\n" \
+	@$(ECHO) "WARNING: This build does not include generating javadoc.\n" \
+	   "" >> $(WARNING_FILE)
+endif
+ifdef NO_DEMOS
+	@$(ECHO) "WARNING: This build and any install images will not include demos.\n" \
+	   "" >> $(WARNING_FILE)
+endif
+ifdef NO_SAMPLES
+	@$(ECHO) "WARNING: This build and any install images will not include samples.\n" \
 	   "" >> $(WARNING_FILE)
 endif
 ifdef NO_IMAGES
@@ -231,7 +239,7 @@
     HOSTNAME := $(shell hostname)
   endif
 endif
-settings:: 
+settings::
 	@$(ECHO) "Build Machine Information:" >> $(MESSAGE_FILE)
 ifeq ($(PLATFORM), windows)
 	@$(ECHO) "   build machine = $(COMPUTERNAME)"  >> $(MESSAGE_FILE)