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

8168772: Convert javadoc generation to build-infra standards

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Magnus Ihse Bursie 2016-10-26 16:00:26 +02:00
parent 5e736e7d8f
commit d0df4968b9
5 changed files with 915 additions and 1598 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/autoconf/generated-configure.sh
View File

@ -5093,7 +5093,7 @@ VS_SDK_PLATFORM_NAME_2013=
#CUSTOM_AUTOCONF_INCLUDE #CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks: # Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1477108079 DATE_WHEN_GENERATED=1477490418
############################################################################### ###############################################################################
# #

6
common/autoconf/spec.gmk.in
View File

@ -265,6 +265,10 @@ IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images
BUNDLES_OUTPUTDIR=$(BUILD_OUTPUT)/bundles BUNDLES_OUTPUTDIR=$(BUILD_OUTPUT)/bundles
TESTMAKE_OUTPUTDIR=$(BUILD_OUTPUT)/test-make TESTMAKE_OUTPUTDIR=$(BUILD_OUTPUT)/test-make
MAKESUPPORT_OUTPUTDIR=$(BUILD_OUTPUT)/make-support MAKESUPPORT_OUTPUTDIR=$(BUILD_OUTPUT)/make-support
# By default, output javadoc directly into image
JAVADOC_OUTPUTDIR = $(DOCS_IMAGE_DIR)
# This does not get overridden in a bootcycle build # This does not get overridden in a bootcycle build
CONFIGURESUPPORT_OUTPUTDIR:=@CONFIGURESUPPORT_OUTPUTDIR@ CONFIGURESUPPORT_OUTPUTDIR:=@CONFIGURESUPPORT_OUTPUTDIR@
BUILDJDK_OUTPUTDIR=$(BUILD_OUTPUT)/buildjdk BUILDJDK_OUTPUTDIR=$(BUILD_OUTPUT)/buildjdk
@ -788,7 +792,7 @@ INTERIM_IMAGE_DIR := $(SUPPORT_OUTPUTDIR)/interim-image
# Docs image # Docs image
DOCS_IMAGE_SUBDIR := docs DOCS_IMAGE_SUBDIR := docs
DOCS_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/$(DOCS_IMAGE_SUBDIR) DOCS_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(DOCS_IMAGE_SUBDIR)
# Macosx bundles directory definitions # Macosx bundles directory definitions
JDK_MACOSX_BUNDLE_SUBDIR=jdk-bundle JDK_MACOSX_BUNDLE_SUBDIR=jdk-bundle

2462
make/Javadoc.gmk
View File

File diff suppressed because it is too large Load Diff

25
make/Main.gmk
View File

@ -341,15 +341,15 @@ ALL_TARGETS += source-tips create-hgtip-files bootcycle-images zip-security \
# Docs targets # Docs targets
docs-javadoc: docs-javadoc:
+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs) +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-javadoc)
docs-jvmtidoc: docs-copy:
+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk jvmtidocs) +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-copy)
zip-docs: docs-zip:
+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk zip-docs) +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-zip)
ALL_TARGETS += docs-javadoc docs-jvmtidoc zip-docs ALL_TARGETS += docs-javadoc docs-copy docs-zip
################################################################################ ################################################################################
# Cross compilation support # Cross compilation support
@ -683,9 +683,9 @@ else
docs-javadoc: $(GENSRC_TARGETS) rmic docs-javadoc: $(GENSRC_TARGETS) rmic
docs-jvmtidoc: hotspot docs-copy: hotspot
zip-docs: docs-javadoc docs-jvmtidoc docs-zip: docs-javadoc docs-copy
test: jdk-image test-image test: jdk-image test-image
@ -812,7 +812,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
endif endif
# This target builds the documentation image # This target builds the documentation image
docs-image: docs-javadoc docs-jvmtidoc docs-image: docs-javadoc docs-copy
# This target builds the test image # This target builds the test image
test-image: prepare-test-image test-image-hotspot-jtreg-native \ test-image: prepare-test-image test-image-hotspot-jtreg-native \
@ -860,7 +860,7 @@ CLEAN_SUPPORT_DIRS += demos
CLEAN_SUPPORT_DIR_TARGETS := $(addprefix clean-, $(CLEAN_SUPPORT_DIRS)) CLEAN_SUPPORT_DIR_TARGETS := $(addprefix clean-, $(CLEAN_SUPPORT_DIRS))
CLEAN_TESTS += hotspot-jtreg-native jdk-jtreg-native lib CLEAN_TESTS += hotspot-jtreg-native jdk-jtreg-native lib
CLEAN_TEST_TARGETS += $(addprefix clean-test-, $(CLEAN_TESTS)) CLEAN_TEST_TARGETS += $(addprefix clean-test-, $(CLEAN_TESTS))
CLEAN_PHASES := gensrc java native include docs CLEAN_PHASES := gensrc java native include
CLEAN_PHASE_TARGETS := $(addprefix clean-, $(CLEAN_PHASES)) CLEAN_PHASE_TARGETS := $(addprefix clean-, $(CLEAN_PHASES))
CLEAN_MODULE_TARGETS := $(addprefix clean-, $(ALL_MODULES)) CLEAN_MODULE_TARGETS := $(addprefix clean-, $(ALL_MODULES))
# Construct targets of the form clean-$module-$phase # Construct targets of the form clean-$module-$phase
@ -872,6 +872,9 @@ clean: $(CLEAN_DIR_TARGETS)
($(CD) $(OUTPUT_ROOT) && $(RM) -r build*.log*) ($(CD) $(OUTPUT_ROOT) && $(RM) -r build*.log*)
$(ECHO) Cleaned all build artifacts. $(ECHO) Cleaned all build artifacts.
clean-docs:
$(call CleanDocs)
$(CLEAN_DIR_TARGETS): $(CLEAN_DIR_TARGETS):
$(call CleanDir,$(patsubst clean-%, %, $@)) $(call CleanDir,$(patsubst clean-%, %, $@))
@ -911,7 +914,7 @@ dist-clean: clean
) )
$(ECHO) Cleaned everything, you will have to re-run configure. $(ECHO) Cleaned everything, you will have to re-run configure.
ALL_TARGETS += clean dist-clean $(CLEAN_DIR_TARGETS) $(CLEAN_SUPPORT_DIR_TARGETS) \ ALL_TARGETS += clean clean-docs dist-clean $(CLEAN_DIR_TARGETS) $(CLEAN_SUPPORT_DIR_TARGETS) \
$(CLEAN_TEST_TARGETS) $(CLEAN_PHASE_TARGETS) $(CLEAN_MODULE_TARGETS) \ $(CLEAN_TEST_TARGETS) $(CLEAN_PHASE_TARGETS) $(CLEAN_MODULE_TARGETS) \
$(CLEAN_MODULE_PHASE_TARGETS) $(CLEAN_MODULE_PHASE_TARGETS)

18
make/MainSupport.gmk
View File

@ -41,6 +41,15 @@ define RunTests
JOBS=$(JOBS) $1) || true JOBS=$(JOBS) $1) || true
endef endef
define CleanDocs
@$(PRINTF) "Cleaning docs ..."
@$(PRINTF) "\n" $(LOG_DEBUG)
$(RM) -r $(SUPPORT_OUTPUTDIR)/docs
$(RM) -r $(SUPPORT_OUTPUTDIR)/javadoc
$(RM) -r $(IMAGES_OUTPUTDIR)/docs
@$(PRINTF) " done\n"
endef
# Cleans the dir given as $1 # Cleans the dir given as $1
define CleanDir define CleanDir
@$(PRINTF) "Cleaning $(strip $1) build artifacts ..." @$(PRINTF) "Cleaning $(strip $1) build artifacts ..."
@ -99,15 +108,6 @@ define Clean-include
@$(PRINTF) " done\n" @$(PRINTF) " done\n"
endef endef
define Clean-docs
@$(PRINTF) "Cleaning docs ..."
@$(PRINTF) "\n" $(LOG_DEBUG)
$(RM) -r $(SUPPORT_OUTPUTDIR)/docs
$(RM) -r $(IMAGES_OUTPUTDIR)/docs
$(RM) $(OUTPUT_ROOT)/bundles/jdk-*-docs.zip
@$(PRINTF) " done\n"
endef
define CleanModule define CleanModule
$(call Clean-gensrc, $1) $(call Clean-gensrc, $1)
$(call Clean-java, $1) $(call Clean-java, $1)