提交 14f75104 编写于 作者: E erikj

8041487: Fix proper dependencies for correct incremental build of javadocs

Reviewed-by: tbell
上级 6df1f92c
...@@ -25,6 +25,18 @@ ...@@ -25,6 +25,18 @@
include $(SPEC) include $(SPEC)
include MakeBase.gmk include MakeBase.gmk
#################################################################
#
# CORE_PKGS environment variable has been moved to the following file
#
include CORE_PKGS.gmk
#
# Load environment variables for API package names that are not part of
# the Java SE platform
#
include NON_CORE_PKGS.gmk
.SUFFIXES: # Delete the default suffixes .SUFFIXES: # Delete the default suffixes
.SUFFIXES: .java .SUFFIXES: .java
...@@ -165,20 +177,9 @@ define prep-javadoc ...@@ -165,20 +177,9 @@ define prep-javadoc
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
endef endef
# A cache of the directories in ALL_SOURCE_DIRS $(eval $(call FillCacheFind, $(ALL_SOURCE_DIRS)))
DIRECTORY_CACHE = $(DOCSTMPDIR)/directory.cache define PackageDependencies
$(call CacheFind, $(foreach p, $(subst .,/,$1), $(addsuffix /$p, $(ALL_SOURCE_DIRS))))
# Given a list of packages, return a list of files or dirs to be dependent on
# (Currently only returning a list of directories)
define PackageDependencies # packages
$(shell \
if [ "$1" != "" -a -f $(DIRECTORY_CACHE) ] ; then \
for p in $1 ; do \
pd=`$(ECHO) $${p} | $(SED) -e 's@[.]@/@g'`; \
$(CAT) $(DIRECTORY_CACHE) | $(GREP) "/$${pd}/" ; \
done; \
fi \
)
endef endef
# Given a list of packages, add packages that exist to $@, print summary # Given a list of packages, add packages that exist to $@, print summary
...@@ -203,9 +204,9 @@ endef ...@@ -203,9 +204,9 @@ endef
# Print out a summary of the javadoc command about to be run # Print out a summary of the javadoc command about to be run
define JavadocSummary # optionsfile packagesfile define JavadocSummary # optionsfile packagesfile
@$(ECHO) "# Summary for $@"; \ @$(ECHO) "# Running javadoc for $(patsubst $(OUTPUT_ROOT)/%,%,$@)" $(LOG_WARN)
$(ECHO) "# Options (`$(BASENAME) $1`):"; $(SED) -e 's@^@# @' $1; \ @($(ECHO) "# Options (`$(BASENAME) $1`):"; $(SED) -e 's@^@# @' $1) $(LOG_DEBUG)
$(ECHO) "# Packages (`$(BASENAME) $2`):";$(SED) -e 's@^@# @' $2 @($(ECHO) "# Packages (`$(BASENAME) $2`):";$(SED) -e 's@^@# @' $2) $(LOG_DEBUG)
endef endef
# #
...@@ -299,19 +300,6 @@ endif ...@@ -299,19 +300,6 @@ endif
################################################################# #################################################################
#
# CORE_PKGS environment variable has been moved to the following file
#
include CORE_PKGS.gmk
#
# Load environment variables for API package names that are not part of
# the Java SE platform
#
include NON_CORE_PKGS.gmk
#################################################################
# #
# Default target is same as docs target, create core api and all others it can # Default target is same as docs target, create core api and all others it can
# #
...@@ -415,7 +403,7 @@ $(COREAPI_OPTIONS_FILE): $(COREAPI_OVERVIEW) ...@@ -415,7 +403,7 @@ $(COREAPI_OPTIONS_FILE): $(COREAPI_OVERVIEW)
endif endif
# Create a file with the package names in it # Create a file with the package names in it
$(COREAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(CORE_PKGS)) $(COREAPI_PACKAGES_FILE): $(call PackageDependencies,$(CORE_PKGS))
$(prep-target) $(prep-target)
$(call PackageFilter,$(CORE_PKGS)) $(call PackageFilter,$(CORE_PKGS))
...@@ -447,7 +435,7 @@ docletapidocs: $(DOCLETAPI_INDEX_FILE) ...@@ -447,7 +435,7 @@ docletapidocs: $(DOCLETAPI_INDEX_FILE)
$(DOCLETAPI_INDEX_FILE): GET2DOCSDIR=$(DOCLETAPI2COREAPI)/.. $(DOCLETAPI_INDEX_FILE): GET2DOCSDIR=$(DOCLETAPI2COREAPI)/..
# Run javadoc if the index file is out of date or missing # Run javadoc if the index file is out of date or missing
$(DOCLETAPI_INDEX_FILE): $(DOCLETAPI_OPTIONS_FILE) $(DOCLETAPI_PACKAGES_FILE) coredocs $(DOCLETAPI_INDEX_FILE): $(DOCLETAPI_OPTIONS_FILE) $(DOCLETAPI_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
$(prep-javadoc) $(prep-javadoc)
$(call JavadocSummary,$(DOCLETAPI_OPTIONS_FILE),$(DOCLETAPI_PACKAGES_FILE)) $(call JavadocSummary,$(DOCLETAPI_OPTIONS_FILE),$(DOCLETAPI_PACKAGES_FILE))
$(JAVADOC_CMD) -d $(@D) \ $(JAVADOC_CMD) -d $(@D) \
...@@ -470,7 +458,7 @@ $(DOCLETAPI_OPTIONS_FILE): ...@@ -470,7 +458,7 @@ $(DOCLETAPI_OPTIONS_FILE):
) >> $@ ) >> $@
# Create a file with the package names in it # Create a file with the package names in it
$(DOCLETAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(DOCLETAPI_PKGS)) $(DOCLETAPI_PACKAGES_FILE): $(call PackageDependencies,$(DOCLETAPI_PKGS))
$(prep-target) $(prep-target)
$(call PackageFilter,$(DOCLETAPI_PKGS)) $(call PackageFilter,$(DOCLETAPI_PKGS))
...@@ -489,7 +477,7 @@ TAGLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(TAGLETAPI_FIRST_COPYRIGHT_YEA ...@@ -489,7 +477,7 @@ TAGLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(TAGLETAPI_FIRST_COPYRIGHT_YEA
TAGLETAPI_TEMPDIR = $(DOCSTMPDIR)/taglets_temp TAGLETAPI_TEMPDIR = $(DOCSTMPDIR)/taglets_temp
# The index.html, options, and packages files # The index.html, options, and packages files
TAGLETAPI_INDEX_FILE = $(TAGLETAPI_DOCDIR)/index.html TAGLETAPI_INDEX_FILE = $(TAGLETAPI_DOCDIR)/com/sun/tools/doclets/Taglet.html
TAGLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/tagletapi.options TAGLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/tagletapi.options
TAGLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/tagletapi.packages TAGLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/tagletapi.packages
...@@ -499,15 +487,15 @@ tagletapidocs: $(TAGLETAPI_INDEX_FILE) ...@@ -499,15 +487,15 @@ tagletapidocs: $(TAGLETAPI_INDEX_FILE)
$(TAGLETAPI_INDEX_FILE): GET2DOCSDIR=$(TAGLETAPI2COREAPI)/.. $(TAGLETAPI_INDEX_FILE): GET2DOCSDIR=$(TAGLETAPI2COREAPI)/..
# Run javadoc if the index file is out of date or missing # Run javadoc if the index file is out of date or missing
$(TAGLETAPI_INDEX_FILE): $(TAGLETAPI_OPTIONS_FILE) $(TAGLETAPI_PACKAGES_FILE) coredocs $(TAGLETAPI_INDEX_FILE): $(TAGLETAPI_OPTIONS_FILE) $(TAGLETAPI_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
$(prep-javadoc) $(prep-javadoc)
$(RM) -r $(TAGLETAPI_TEMPDIR) $(RM) -r $(TAGLETAPI_TEMPDIR)
$(MKDIR) -p $(TAGLETAPI_TEMPDIR) $(MKDIR) -p $(TAGLETAPI_TEMPDIR)
$(call JavadocSummary,$(TAGLETAPI_OPTIONS_FILE),$(TAGLETAPI_PACKAGES_FILE)) $(call JavadocSummary,$(TAGLETAPI_OPTIONS_FILE),$(TAGLETAPI_PACKAGES_FILE))
$(JAVADOC_CMD) -d $(TAGLETAPI_TEMPDIR) \ $(JAVADOC_CMD) -d $(TAGLETAPI_TEMPDIR) \
@$(TAGLETAPI_OPTIONS_FILE) @$(TAGLETAPI_PACKAGES_FILE) @$(TAGLETAPI_OPTIONS_FILE) @$(TAGLETAPI_PACKAGES_FILE)
cp -r $(TAGLETAPI_TEMPDIR)/com $(@D) cp -r $(TAGLETAPI_TEMPDIR)/com $(TAGLETAPI_DOCDIR)
cp $(TAGLETAPI_TEMPDIR)/stylesheet.css $(@D) cp $(TAGLETAPI_TEMPDIR)/stylesheet.css $(TAGLETAPI_DOCDIR)
$(RM) -r $(TAGLETAPI_TEMPDIR) $(RM) -r $(TAGLETAPI_TEMPDIR)
# Create file with javadoc options in it # Create file with javadoc options in it
...@@ -524,7 +512,7 @@ $(TAGLETAPI_OPTIONS_FILE): ...@@ -524,7 +512,7 @@ $(TAGLETAPI_OPTIONS_FILE):
) >> $@ ) >> $@
# Create a file with the package names in it # Create a file with the package names in it
$(TAGLETAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TAGLETAPI_PKGS)) $(TAGLETAPI_PACKAGES_FILE): $(call PackageDependencies,$(TAGLETAPI_PKGS))
$(prep-target) $(prep-target)
@($(ECHO) "$(JDK_IMPSRC)/$(TAGLETAPI_FILE)" ) > $@ @($(ECHO) "$(JDK_IMPSRC)/$(TAGLETAPI_FILE)" ) > $@
...@@ -556,7 +544,7 @@ domapidocs: $(DOMAPI_INDEX_FILE) ...@@ -556,7 +544,7 @@ domapidocs: $(DOMAPI_INDEX_FILE)
$(DOMAPI_INDEX_FILE): GET2DOCSDIR=$(DOMAPI2COREAPI)/.. $(DOMAPI_INDEX_FILE): GET2DOCSDIR=$(DOMAPI2COREAPI)/..
# Run javadoc if the index file is out of date or missing # Run javadoc if the index file is out of date or missing
$(DOMAPI_INDEX_FILE): $(DOMAPI_OPTIONS_FILE) $(DOMAPI_PACKAGES_FILE) coredocs $(DOMAPI_INDEX_FILE): $(DOMAPI_OPTIONS_FILE) $(DOMAPI_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
$(prep-javadoc) $(prep-javadoc)
$(call JavadocSummary,$(DOMAPI_OPTIONS_FILE),$(DOMAPI_PACKAGES_FILE)) $(call JavadocSummary,$(DOMAPI_OPTIONS_FILE),$(DOMAPI_PACKAGES_FILE))
$(JAVADOC_CMD) -d $(@D) \ $(JAVADOC_CMD) -d $(@D) \
...@@ -579,7 +567,7 @@ $(DOMAPI_OPTIONS_FILE): ...@@ -579,7 +567,7 @@ $(DOMAPI_OPTIONS_FILE):
) >> $@ ) >> $@
# Create a file with the package names in it # Create a file with the package names in it
$(DOMAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(DOMAPI_PKGS)) $(DOMAPI_PACKAGES_FILE): $(call PackageDependencies,$(DOMAPI_PKGS))
$(prep-target) $(prep-target)
$(call PackageFilter,$(DOMAPI_PKGS)) $(call PackageFilter,$(DOMAPI_PKGS))
...@@ -619,7 +607,7 @@ jdidocs: $(JDI_INDEX_FILE) ...@@ -619,7 +607,7 @@ jdidocs: $(JDI_INDEX_FILE)
$(JDI_INDEX_FILE): GET2DOCSDIR=$(JDI2COREAPI)/.. $(JDI_INDEX_FILE): GET2DOCSDIR=$(JDI2COREAPI)/..
# Run javadoc if the index file is out of date or missing # Run javadoc if the index file is out of date or missing
$(JDI_INDEX_FILE): $(JDI_OPTIONS_FILE) $(JDI_PACKAGES_FILE) coredocs $(JDI_INDEX_FILE): $(JDI_OPTIONS_FILE) $(JDI_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
$(prep-javadoc) $(prep-javadoc)
$(call JavadocSummary,$(JDI_OPTIONS_FILE),$(JDI_PACKAGES_FILE)) $(call JavadocSummary,$(JDI_OPTIONS_FILE),$(JDI_PACKAGES_FILE))
$(JAVADOC_CMD) -d $(@D) \ $(JAVADOC_CMD) -d $(@D) \
...@@ -641,7 +629,7 @@ $(JDI_OPTIONS_FILE): $(JDI_OVERVIEW) ...@@ -641,7 +629,7 @@ $(JDI_OPTIONS_FILE): $(JDI_OVERVIEW)
) >> $@ ) >> $@
# Create a file with the package names in it # Create a file with the package names in it
$(JDI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JDI_PKGS)) $(JDI_PACKAGES_FILE): $(call PackageDependencies,$(JDI_PKGS))
$(prep-target) $(prep-target)
$(call PackageFilter,$(JDI_PKGS)) $(call PackageFilter,$(JDI_PKGS))
...@@ -674,7 +662,6 @@ jvmtidocs: $(JVMTI_DOCDIR)/jvmti.html ...@@ -674,7 +662,6 @@ jvmtidocs: $(JVMTI_DOCDIR)/jvmti.html
$(JVMTI_DOCDIR)/jvmti.html: $(JVMTI_DOCDIR)/jvmti.html:
@$(prep-javadoc) @$(prep-javadoc)
@if [ -f $(JVMTI_HTML) ] ; then \ @if [ -f $(JVMTI_HTML) ] ; then \
$(ECHO) "$(CP) $(JVMTI_HTML) $@"; \
$(CP) $(JVMTI_HTML) $@; \ $(CP) $(JVMTI_HTML) $@; \
else \ else \
$(ECHO) "WARNING: Generated file does not exist: $(JVMTI_HTML)"; \ $(ECHO) "WARNING: Generated file does not exist: $(JVMTI_HTML)"; \
...@@ -707,7 +694,7 @@ jaasdocs: $(JAAS_INDEX_FILE) ...@@ -707,7 +694,7 @@ jaasdocs: $(JAAS_INDEX_FILE)
$(JAAS_INDEX_FILE): GET2DOCSDIR=$(JAAS2COREAPI)/.. $(JAAS_INDEX_FILE): GET2DOCSDIR=$(JAAS2COREAPI)/..
# Run javadoc if the index file is out of date or missing # Run javadoc if the index file is out of date or missing
$(JAAS_INDEX_FILE): $(JAAS_OPTIONS_FILE) $(JAAS_PACKAGES_FILE) coredocs $(JAAS_INDEX_FILE): $(JAAS_OPTIONS_FILE) $(JAAS_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
$(prep-javadoc) $(prep-javadoc)
$(call JavadocSummary,$(JAAS_OPTIONS_FILE),$(JAAS_PACKAGES_FILE)) $(call JavadocSummary,$(JAAS_OPTIONS_FILE),$(JAAS_PACKAGES_FILE))
$(JAVADOC_CMD) -d $(@D) \ $(JAVADOC_CMD) -d $(@D) \
...@@ -729,7 +716,7 @@ $(JAAS_OPTIONS_FILE): $(JAAS_OVERVIEW) ...@@ -729,7 +716,7 @@ $(JAAS_OPTIONS_FILE): $(JAAS_OVERVIEW)
) >> $@ ) >> $@
# Create a file with the package names in it # Create a file with the package names in it
$(JAAS_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JAAS_PKGS)) $(JAAS_PACKAGES_FILE): $(call PackageDependencies,$(JAAS_PKGS))
$(prep-target) $(prep-target)
$(call PackageFilter,$(JAAS_PKGS)) $(call PackageFilter,$(JAAS_PKGS))
...@@ -760,7 +747,7 @@ jgssdocs: $(JGSS_INDEX_FILE) ...@@ -760,7 +747,7 @@ jgssdocs: $(JGSS_INDEX_FILE)
$(JGSS_INDEX_FILE): GET2DOCSDIR=$(JGSS2COREAPI)/.. $(JGSS_INDEX_FILE): GET2DOCSDIR=$(JGSS2COREAPI)/..
# Run javadoc if the index file is out of date or missing # Run javadoc if the index file is out of date or missing
$(JGSS_INDEX_FILE): $(JGSS_OPTIONS_FILE) $(JGSS_PACKAGES_FILE) coredocs $(JGSS_INDEX_FILE): $(JGSS_OPTIONS_FILE) $(JGSS_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
$(prep-javadoc) $(prep-javadoc)
$(call JavadocSummary,$(JGSS_OPTIONS_FILE),$(JGSS_PACKAGES_FILE)) $(call JavadocSummary,$(JGSS_OPTIONS_FILE),$(JGSS_PACKAGES_FILE))
$(JAVADOC_CMD) -d $(@D) \ $(JAVADOC_CMD) -d $(@D) \
...@@ -783,7 +770,7 @@ $(JGSS_OPTIONS_FILE): $(JGSS_OVERVIEW) ...@@ -783,7 +770,7 @@ $(JGSS_OPTIONS_FILE): $(JGSS_OVERVIEW)
) >> $@ ) >> $@
# Create a file with the package names in it # Create a file with the package names in it
$(JGSS_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JGSS_PKGS)) $(JGSS_PACKAGES_FILE): $(call PackageDependencies,$(JGSS_PKGS))
$(prep-target) $(prep-target)
$(call PackageFilter,$(JGSS_PKGS)) $(call PackageFilter,$(JGSS_PKGS))
...@@ -813,7 +800,7 @@ smartcardiodocs: $(SMARTCARDIO_INDEX_FILE) ...@@ -813,7 +800,7 @@ smartcardiodocs: $(SMARTCARDIO_INDEX_FILE)
$(SMARTCARDIO_INDEX_FILE): GET2DOCSDIR=$(SMARTCARDIO2COREAPI)/.. $(SMARTCARDIO_INDEX_FILE): GET2DOCSDIR=$(SMARTCARDIO2COREAPI)/..
# Run javadoc if the index file is out of date or missing # Run javadoc if the index file is out of date or missing
$(SMARTCARDIO_INDEX_FILE): $(SMARTCARDIO_OPTIONS_FILE) $(SMARTCARDIO_PACKAGES_FILE) coredocs $(SMARTCARDIO_INDEX_FILE): $(SMARTCARDIO_OPTIONS_FILE) $(SMARTCARDIO_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
$(prep-javadoc) $(prep-javadoc)
$(call JavadocSummary,$(SMARTCARDIO_OPTIONS_FILE),$(SMARTCARDIO_PACKAGES_FILE)) $(call JavadocSummary,$(SMARTCARDIO_OPTIONS_FILE),$(SMARTCARDIO_PACKAGES_FILE))
$(JAVADOC_CMD) -d $(@D) \ $(JAVADOC_CMD) -d $(@D) \
...@@ -835,7 +822,7 @@ $(SMARTCARDIO_OPTIONS_FILE): ...@@ -835,7 +822,7 @@ $(SMARTCARDIO_OPTIONS_FILE):
) >> $@ ) >> $@
# Create a file with the package names in it # Create a file with the package names in it
$(SMARTCARDIO_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SMARTCARDIO_PKGS)) $(SMARTCARDIO_PACKAGES_FILE): $(call PackageDependencies,$(SMARTCARDIO_PKGS))
$(prep-target) $(prep-target)
$(call PackageFilter,$(SMARTCARDIO_PKGS)) $(call PackageFilter,$(SMARTCARDIO_PKGS))
...@@ -864,7 +851,7 @@ httpserverdocs: $(HTTPSERVER_INDEX_HTML) ...@@ -864,7 +851,7 @@ httpserverdocs: $(HTTPSERVER_INDEX_HTML)
$(HTTPSERVER_INDEX_HTML): GET2DOCSDIR=$(HTTPSERVER2COREAPI)/.. $(HTTPSERVER_INDEX_HTML): GET2DOCSDIR=$(HTTPSERVER2COREAPI)/..
# Run javadoc if the index file is out of date or missing # Run javadoc if the index file is out of date or missing
$(HTTPSERVER_INDEX_HTML): $(HTTPSERVER_OPTIONS_FILE) $(HTTPSERVER_PACKAGES_FILE) coredocs $(HTTPSERVER_INDEX_HTML): $(HTTPSERVER_OPTIONS_FILE) $(HTTPSERVER_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
$(prep-javadoc) $(prep-javadoc)
$(call JavadocSummary,$(HTTPSERVER_OPTIONS_FILE),$(HTTPSERVER_PACKAGES_FILE)) $(call JavadocSummary,$(HTTPSERVER_OPTIONS_FILE),$(HTTPSERVER_PACKAGES_FILE))
$(JAVADOC_CMD) -d $(@D) \ $(JAVADOC_CMD) -d $(@D) \
...@@ -886,7 +873,7 @@ $(HTTPSERVER_OPTIONS_FILE): ...@@ -886,7 +873,7 @@ $(HTTPSERVER_OPTIONS_FILE):
) >> $@ ) >> $@
# Create a file with the package names in it # Create a file with the package names in it
$(HTTPSERVER_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(HTTPSERVER_PKGS)) $(HTTPSERVER_PACKAGES_FILE): $(call PackageDependencies,$(HTTPSERVER_PKGS))
$(prep-target) $(prep-target)
$(call PackageFilter,$(HTTPSERVER_PKGS)) $(call PackageFilter,$(HTTPSERVER_PKGS))
...@@ -919,10 +906,9 @@ mgmtdocs: $(MGMT_INDEX_FILE) ...@@ -919,10 +906,9 @@ mgmtdocs: $(MGMT_INDEX_FILE)
$(MGMT_INDEX_FILE): GET2DOCSDIR=$(MGMT2COREAPI)/.. $(MGMT_INDEX_FILE): GET2DOCSDIR=$(MGMT2COREAPI)/..
# Run javadoc if the index file is out of date or missing # Run javadoc if the index file is out of date or missing
$(MGMT_INDEX_FILE): $(MGMT_OPTIONS_FILE) $(MGMT_PACKAGES_FILE) coredocs $(MGMT_INDEX_FILE): $(MGMT_OPTIONS_FILE) $(MGMT_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
$(prep-javadoc) $(prep-javadoc)
@if [ -f $(JVM_MIB_SRC) ] ; then \ @if [ -f $(JVM_MIB_SRC) ] ; then \
$(ECHO) "$(CP) $(JVM_MIB_SRC) $(@D)/.."; \
$(CP) $(JVM_MIB_SRC) $(@D)/.. ; \ $(CP) $(JVM_MIB_SRC) $(@D)/.. ; \
else \ else \
$(ECHO) "WARNING: File $(JVM_MIB_NAME) not available."; \ $(ECHO) "WARNING: File $(JVM_MIB_NAME) not available."; \
...@@ -948,7 +934,7 @@ $(MGMT_OPTIONS_FILE): $(MGMT_OVERVIEW) ...@@ -948,7 +934,7 @@ $(MGMT_OPTIONS_FILE): $(MGMT_OVERVIEW)
) >> $@ ) >> $@
# Create a file with the package names in it # Create a file with the package names in it
$(MGMT_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(MGMT_PKGS)) $(MGMT_PACKAGES_FILE): $(call PackageDependencies,$(MGMT_PKGS))
$(prep-target) $(prep-target)
$(call PackageFilter,$(MGMT_PKGS)) $(call PackageFilter,$(MGMT_PKGS))
...@@ -977,7 +963,7 @@ attachdocs: $(ATTACH_INDEX_HTML) ...@@ -977,7 +963,7 @@ attachdocs: $(ATTACH_INDEX_HTML)
$(ATTACH_INDEX_HTML): GET2DOCSDIR=$(ATTACH2COREAPI)/.. $(ATTACH_INDEX_HTML): GET2DOCSDIR=$(ATTACH2COREAPI)/..
# Run javadoc if the index file is out of date or missing # Run javadoc if the index file is out of date or missing
$(ATTACH_INDEX_HTML): $(ATTACH_OPTIONS_FILE) $(ATTACH_PACKAGES_FILE) coredocs $(ATTACH_INDEX_HTML): $(ATTACH_OPTIONS_FILE) $(ATTACH_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
$(prep-javadoc) $(prep-javadoc)
$(call JavadocSummary,$(ATTACH_OPTIONS_FILE),$(ATTACH_PACKAGES_FILE)) $(call JavadocSummary,$(ATTACH_OPTIONS_FILE),$(ATTACH_PACKAGES_FILE))
$(JAVADOC_CMD) -d $(@D) \ $(JAVADOC_CMD) -d $(@D) \
...@@ -999,7 +985,7 @@ $(ATTACH_OPTIONS_FILE): ...@@ -999,7 +985,7 @@ $(ATTACH_OPTIONS_FILE):
) >> $@ ) >> $@
# Create a file with the package names in it # Create a file with the package names in it
$(ATTACH_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(ATTACH_PKGS)) $(ATTACH_PACKAGES_FILE): $(call PackageDependencies,$(ATTACH_PKGS))
$(prep-target) $(prep-target)
$(call PackageFilter,$(ATTACH_PKGS)) $(call PackageFilter,$(ATTACH_PKGS))
...@@ -1028,7 +1014,7 @@ jconsoledocs: $(JCONSOLE_INDEX_HTML) ...@@ -1028,7 +1014,7 @@ jconsoledocs: $(JCONSOLE_INDEX_HTML)
$(JCONSOLE_INDEX_HTML): GET2DOCSDIR=$(JCONSOLE2COREAPI)/.. $(JCONSOLE_INDEX_HTML): GET2DOCSDIR=$(JCONSOLE2COREAPI)/..
# Run javadoc if the index file is out of date or missing # Run javadoc if the index file is out of date or missing
$(JCONSOLE_INDEX_HTML): $(JCONSOLE_OPTIONS_FILE) $(JCONSOLE_PACKAGES_FILE) coredocs $(JCONSOLE_INDEX_HTML): $(JCONSOLE_OPTIONS_FILE) $(JCONSOLE_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
$(prep-javadoc) $(prep-javadoc)
$(call JavadocSummary,$(JCONSOLE_OPTIONS_FILE),$(JCONSOLE_PACKAGES_FILE)) $(call JavadocSummary,$(JCONSOLE_OPTIONS_FILE),$(JCONSOLE_PACKAGES_FILE))
$(JAVADOC_CMD) -d $(@D) \ $(JAVADOC_CMD) -d $(@D) \
...@@ -1050,7 +1036,7 @@ $(JCONSOLE_OPTIONS_FILE): ...@@ -1050,7 +1036,7 @@ $(JCONSOLE_OPTIONS_FILE):
) >> $@ ) >> $@
# Create a file with the package names in it # Create a file with the package names in it
$(JCONSOLE_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JCONSOLE_PKGS)) $(JCONSOLE_PACKAGES_FILE): $(call PackageDependencies,$(JCONSOLE_PKGS))
$(prep-target) $(prep-target)
$(call PackageFilter,$(JCONSOLE_PKGS)) $(call PackageFilter,$(JCONSOLE_PKGS))
...@@ -1081,7 +1067,7 @@ treeapidocs: $(TREEAPI_INDEX_HTML) ...@@ -1081,7 +1067,7 @@ treeapidocs: $(TREEAPI_INDEX_HTML)
$(TREEAPI_INDEX_HTML): GET2DOCSDIR=$(TREEAPI2COREAPI)/.. $(TREEAPI_INDEX_HTML): GET2DOCSDIR=$(TREEAPI2COREAPI)/..
# Run javadoc if the index file is out of date or missing # Run javadoc if the index file is out of date or missing
$(TREEAPI_INDEX_HTML): $(TREEAPI_OPTIONS_FILE) $(TREEAPI_PACKAGES_FILE) coredocs $(TREEAPI_INDEX_HTML): $(TREEAPI_OPTIONS_FILE) $(TREEAPI_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
$(prep-javadoc) $(prep-javadoc)
$(call JavadocSummary,$(TREEAPI_OPTIONS_FILE),$(TREEAPI_PACKAGES_FILE)) $(call JavadocSummary,$(TREEAPI_OPTIONS_FILE),$(TREEAPI_PACKAGES_FILE))
$(JAVADOC_CMD) -d $(@D) \ $(JAVADOC_CMD) -d $(@D) \
...@@ -1104,7 +1090,7 @@ $(TREEAPI_OPTIONS_FILE): ...@@ -1104,7 +1090,7 @@ $(TREEAPI_OPTIONS_FILE):
) >> $@ ) >> $@
# Create a file with the package names in it # Create a file with the package names in it
$(TREEAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TREEAPI_PKGS)) $(TREEAPI_PACKAGES_FILE): $(call PackageDependencies,$(TREEAPI_PKGS))
$(prep-target) $(prep-target)
$(call PackageFilter,$(TREEAPI_PKGS)) $(call PackageFilter,$(TREEAPI_PKGS))
...@@ -1133,7 +1119,7 @@ sctpdocs: $(SCTPAPI_INDEX_HTML) ...@@ -1133,7 +1119,7 @@ sctpdocs: $(SCTPAPI_INDEX_HTML)
$(SCTPAPI_INDEX_HTML): GET2DOCSDIR=$(SCTPAPI2COREAPI)/.. $(SCTPAPI_INDEX_HTML): GET2DOCSDIR=$(SCTPAPI2COREAPI)/..
# Run javadoc if the index file is out of date or missing # Run javadoc if the index file is out of date or missing
$(SCTPAPI_INDEX_HTML): $(SCTPAPI_OPTIONS_FILE) $(SCTPAPI_PACKAGES_FILE) coredocs $(SCTPAPI_INDEX_HTML): $(SCTPAPI_OPTIONS_FILE) $(SCTPAPI_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
$(prep-javadoc) $(prep-javadoc)
$(call JavadocSummary,$(SCTPAPI_OPTIONS_FILE),$(SCTPAPI_PACKAGES_FILE)) $(call JavadocSummary,$(SCTPAPI_OPTIONS_FILE),$(SCTPAPI_PACKAGES_FILE))
$(JAVADOC_CMD) -d $(@D) \ $(JAVADOC_CMD) -d $(@D) \
...@@ -1155,7 +1141,7 @@ $(SCTPAPI_OPTIONS_FILE): ...@@ -1155,7 +1141,7 @@ $(SCTPAPI_OPTIONS_FILE):
) >> $@ ) >> $@
# Create a file with the package names in it # Create a file with the package names in it
$(SCTPAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SCTPAPI_PKGS)) $(SCTPAPI_PACKAGES_FILE): $(call PackageDependencies,$(SCTPAPI_PKGS))
$(prep-target) $(prep-target)
$(call PackageFilter,$(SCTPAPI_PKGS)) $(call PackageFilter,$(SCTPAPI_PKGS))
...@@ -1184,7 +1170,7 @@ jdknetdocs: $(JDKNET_INDEX_HTML) ...@@ -1184,7 +1170,7 @@ jdknetdocs: $(JDKNET_INDEX_HTML)
$(JDKNET_INDEX_HTML): GET2DOCSDIR=$(JDKNET2COREAPI)/.. $(JDKNET_INDEX_HTML): GET2DOCSDIR=$(JDKNET2COREAPI)/..
# Run javadoc if the index file is out of date or missing # Run javadoc if the index file is out of date or missing
$(JDKNET_INDEX_HTML): $(JDKNET_OPTIONS_FILE) $(JDKNET_PACKAGES_FILE) coredocs $(JDKNET_INDEX_HTML): $(JDKNET_OPTIONS_FILE) $(JDKNET_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
$(prep-javadoc) $(prep-javadoc)
$(call JavadocSummary,$(JDKNET_OPTIONS_FILE),$(JDKNET_PACKAGES_FILE)) $(call JavadocSummary,$(JDKNET_OPTIONS_FILE),$(JDKNET_PACKAGES_FILE))
$(JAVADOC_CMD) -d $(@D) \ $(JAVADOC_CMD) -d $(@D) \
...@@ -1206,21 +1192,10 @@ $(JDKNET_OPTIONS_FILE): ...@@ -1206,21 +1192,10 @@ $(JDKNET_OPTIONS_FILE):
) >> $@ ) >> $@
# Create a file with the package names in it # Create a file with the package names in it
$(JDKNET_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JDKNET_PKGS)) $(JDKNET_PACKAGES_FILE): $(call PackageDependencies,$(JDKNET_PKGS))
$(prep-target) $(prep-target)
$(call PackageFilter,$(JDKNET_PKGS)) $(call PackageFilter,$(JDKNET_PKGS))
#############################################################
#
# Get a cache of all the directories
$(DIRECTORY_CACHE): $(ALL_EXISTING_SOURCE_DIRS)
$(prep-target)
@for cp in $(ALL_EXISTING_SOURCE_DIRS) ; do \
$(ECHO) "$(FIND) $${cp} -type f >> $@"; \
$(FIND) $${cp} -type f >> $@; \
done
############################################################# #############################################################
#release version of core packages ######## #release version of core packages ########
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册