make/Main.gmk

@@ -159,10 +159,16 @@
 docs-only: start-make
         @$(call TargetEnter)
         @($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs)
         @$(call TargetExit)
 
+docs-zip: docs docs-zip-only
+docs-zip-only: start-make
+        @$(call TargetEnter)
+        @($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-zip)
+        @$(call TargetExit)
+
 sign-jars: jdk sign-jars-only
 sign-jars-only: start-make
         @$(call TargetEnter)
         @($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk sign-jars)
         @$(call TargetExit)

@@ -233,10 +239,12 @@
 clean-bootcycle-build:
         $(call CleanComponent,bootcycle-build)
 clean-docs:
         $(call CleanComponent,docs)
         $(call CleanComponent,docstemp)
+clean-docs-zip:
+        $(call CleanComponent,bundles/jdk-*-docs.zip)
 clean-test:
         $(call CleanComponent,testoutput)
         
 reconfigure:
         ifneq ($(CONFIGURE_COMMAND_LINE), )

@@ -244,14 +252,14 @@
         else
           @$(ECHO) "Re-running configure using default settings"
         endif
         @( cd $(OUTPUT_ROOT) && $(BASH) $(TOPDIR)/configure $(CONFIGURE_COMMAND_LINE) )
 
-.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs
-.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only
+.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs docs-zip
+.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only docs-zip-only
 .PHONY: default all clean dist-clean bootcycle-images start-make
-.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-test clean-overlay-images clean-bootcycle-build
+.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-docs-zip clean-test clean-overlay-images clean-bootcycle-build
 .PHONY: profiles profiles-only
 
 include $(root_dir)/make/Jprt.gmk
 
 FRC: # Force target