diff options
| author | mduigou <none@none> | 2012-02-27 18:09:47 -0800 |
|---|---|---|
| committer | mduigou <none@none> | 2012-02-27 18:09:47 -0800 |
| commit | 659435741058401cb05132757e5b0c2077eaeb64 (patch) | |
| tree | 07bb67259fc46cab1d860c814b66874653fac769 /make | |
| parent | 25917c0bbd6084c4cc9459de70b9cb74f65bae75 (diff) | |
7143162: Allow disable building of jdk demos and samples
Reviewed-by: ohair
Diffstat (limited to 'make')
| -rw-r--r-- | make/sanity-rules.gmk | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/make/sanity-rules.gmk b/make/sanity-rules.gmk index fece2a9..544dba1 100644 --- a/make/sanity-rules.gmk +++ b/make/sanity-rules.gmk @@ -38,7 +38,7 @@ ifeq ($(BUILD_DEPLOY), true) 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 @@ $(ERROR_FILE) $(WARNING_FILE) $(MESSAGE_FILE): 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 @@ endif " $* 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 @@ ifeq ($(SPONSORS_SRC_AVAILABLE), true) 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 @@ ifneq ($(PLATFORM), windows) HOSTNAME := $(shell hostname) endif endif -settings:: +settings:: @$(ECHO) "Build Machine Information:" >> $(MESSAGE_FILE) ifeq ($(PLATFORM), windows) @$(ECHO) " build machine = $(COMPUTERNAME)" >> $(MESSAGE_FILE) |