stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7143162: Allow disable building of jdk demos and samples

Browse Source 
Reviewed-by: ohair
This commit is contained in:
Mike Duigou 2012-02-27 18:10:03 -08:00
parent fd805805a8
commit 0193199d57
3 changed files with 20 additions and 7 deletions

13
jdk/make/Makefile

@ -234,7 +234,17 @@ all build:: sanity-all post-sanity-all
SUBDIRS = tools java javax sun com SUBDIRS = tools java javax sun com
SUBDIRS_tools = launchers SUBDIRS_tools = launchers
SUBDIRS_misc = org sunw jpda mkdemo mksample SUBDIRS_misc = org sunw jpda
# demos
ifndef NO_DEMOS
SUBDIRS_misc += mkdemo
endif
# samples
ifndef NO_SAMPLES
SUBDIRS_misc += mksample
endif
# Alternate classes implementation # Alternate classes implementation
ifndef OPENJDK ifndef OPENJDK
@ -383,4 +393,3 @@ include jprt.gmk
.PHONY: all build clean clobber optimized debug fastdebug create_links \ .PHONY: all build clean clobber optimized debug fastdebug create_links \
import import_product import_fastdebug import_debug \ import import_product import_fastdebug import_debug \
test test_run test_start test_clean test_summary test test_run test_start test_clean test_summary

5
jdk/make/common/Release.gmk

@ -1095,8 +1095,12 @@ initial-image-jdk:: initial-image-jdk-setup \
@# @#
@# demo, include @# demo, include
@# @#
ifndef NO_DEMOS
$(CP) -r -f $(DEMODIR) $(JDK_IMAGE_DIR) $(CP) -r -f $(DEMODIR) $(JDK_IMAGE_DIR)
endif
ifndef NO_SAMPLES
$(CP) -r -f $(SAMPLEDIR) $(JDK_IMAGE_DIR) $(CP) -r -f $(SAMPLEDIR) $(JDK_IMAGE_DIR)
endif
$(CP) -r $(INCLUDEDIR) $(JDK_IMAGE_DIR) $(CP) -r $(INCLUDEDIR) $(JDK_IMAGE_DIR)
@# @#
@# Swing BeanInfo generation @# Swing BeanInfo generation
@ -1359,4 +1363,3 @@ images images-clobber::
# Force rule # Force rule
FRC: FRC:

3
jdk/make/common/shared/Sanity-Settings.gmk

@ -134,6 +134,8 @@ ALL_SETTINGS+=$(call addOptionalSetting,USE_HOTSPOT_INTERPRETER_MODE)
ALL_SETTINGS+=$(call addOptionalSetting,PEDANTIC) ALL_SETTINGS+=$(call addOptionalSetting,PEDANTIC)
ALL_SETTINGS+=$(call addOptionalSetting,DEV_ONLY) ALL_SETTINGS+=$(call addOptionalSetting,DEV_ONLY)
ALL_SETTINGS+=$(call addOptionalSetting,NO_DOCS) ALL_SETTINGS+=$(call addOptionalSetting,NO_DOCS)
ALL_SETTINGS+=$(call addOptionalSetting,NO_DEMOS)
ALL_SETTINGS+=$(call addOptionalSetting,NO_SAMPLES)
ALL_SETTINGS+=$(call addOptionalSetting,NO_IMAGES) ALL_SETTINGS+=$(call addOptionalSetting,NO_IMAGES)
ALL_SETTINGS+=$(call addOptionalSetting,TOOLS_ONLY) ALL_SETTINGS+=$(call addOptionalSetting,TOOLS_ONLY)
ALL_SETTINGS+=$(call addOptionalSetting,INSANE) ALL_SETTINGS+=$(call addOptionalSetting,INSANE)
@ -263,4 +265,3 @@ ifdef OPENJDK
ALL_SETTINGS+=$(call addAltSetting,PREVIOUS_JRE_FILE) ALL_SETTINGS+=$(call addAltSetting,PREVIOUS_JRE_FILE)
ALL_SETTINGS+=$(call addAltSetting,PREVIOUS_RELEASE_IMAGE) ALL_SETTINGS+=$(call addAltSetting,PREVIOUS_RELEASE_IMAGE)
endif endif