1.1 --- a/common/makefiles/Main.gmk Mon Jan 21 00:29:59 2013 -0500 1.2 +++ b/common/makefiles/Main.gmk Mon Jan 21 01:50:40 2013 -0500 1.3 @@ -122,7 +122,9 @@ 1.4 @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk demos) 1.5 @$(call TargetExit) 1.6 1.7 -images: source-tips demos images-only 1.8 +# Note: This double-colon rule is intentional, to support 1.9 +# custom make file integration. 1.10 +images:: source-tips demos images-only 1.11 images-only: start-make 1.12 @$(call TargetEnter) 1.13 @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk images) 1.14 @@ -134,6 +136,17 @@ 1.15 @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk overlay-images) 1.16 @$(call TargetExit) 1.17 1.18 +profiles: profiles-oscheck source-tips jdk hotspot profiles-only 1.19 +profiles-only: start-make 1.20 + @$(call TargetEnter) 1.21 + @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk profiles) 1.22 + @$(call TargetExit) 1.23 + 1.24 +profiles-oscheck: 1.25 +ifneq ($(OPENJDK_TARGET_OS), linux) 1.26 + @echo "Error: The Java SE 8 Compact Profiles are only implemented for Linux at this time" && exit 1 1.27 +endif 1.28 + 1.29 install: images install-only 1.30 install-only: start-make 1.31 @$(call TargetEnter) 1.32 @@ -217,5 +230,6 @@ 1.33 .PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only images-only overlay-images-only install-only 1.34 .PHONY: all test clean dist-clean bootcycle-images start-make 1.35 .PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-images clean-overlay-images clean-bootcycle-build 1.36 +.PHONY: profiles profiles-only profiles-oscheck 1.37 1.38 FRC: # Force target