Mercurial > hg > icedtea9-forest
changeset 448:28f2fe471725
7143162: Allow disable building of jdk demos and samples
Reviewed-by: ohair
author | mduigou |
---|---|
date | Mon, 27 Feb 2012 18:09:47 -0800 |
parents | 1533dfab9903 |
children | d74f01115fb8 |
files | make/sanity-rules.gmk |
diffstat | 1 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/make/sanity-rules.gmk Thu Feb 16 13:01:17 2012 -0800 +++ b/make/sanity-rules.gmk Mon Feb 27 18:09:47 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)