Wed, 16 Apr 2014 14:22:03 -0700
Merge
1.1 --- a/make/Javadoc.gmk Wed Apr 16 12:32:15 2014 -0700 1.2 +++ b/make/Javadoc.gmk Wed Apr 16 14:22:03 2014 -0700 1.3 @@ -72,6 +72,7 @@ 1.4 TREEAPI_FIRST_COPYRIGHT_YEAR = 2005 1.5 JNLP_FIRST_COPYRIGHT_YEAR = 1998 1.6 PLUGIN2_FIRST_COPYRIGHT_YEAR = 2007 1.7 +JDKNET_FIRST_COPYRIGHT_YEAR = 2014 1.8 1.9 # Oracle name 1.10 FULL_COMPANY_NAME = Oracle and/or its affiliates 1.11 @@ -1147,6 +1148,57 @@ 1.12 1.13 ############################################################# 1.14 # 1.15 +# jdk.net docs 1.16 +# 1.17 + 1.18 +ALL_OTHER_TARGETS += jdknetdocs 1.19 + 1.20 +JDKNET_DOCDIR := $(JRE_API_DOCSDIR)/net/socketoptions/spec 1.21 +JDKNET2COREAPI := ../../../$(JDKJRE2COREAPI) 1.22 +JDKNET_DOCTITLE := jdk.net API 1.23 +JDKNET_WINDOWTITLE := jdk.net API 1.24 +JDKNET_HEADER := <strong>jdk.net API</strong> 1.25 +JDKNET_BOTTOM := $(call CommonBottom,$(JDKNET_FIRST_COPYRIGHT_YEAR)) 1.26 +JDKNET_PKGS := jdk.net 1.27 + 1.28 +JDKNET_INDEX_HTML = $(JDKNET_DOCDIR)/index.html 1.29 +JDKNET_OPTIONS_FILE = $(DOCSTMPDIR)/jdknet.options 1.30 +JDKNET_PACKAGES_FILE = $(DOCSTMPDIR)/jdknet.packages 1.31 + 1.32 +jdknetdocs: $(JDKNET_INDEX_HTML) 1.33 + 1.34 +# Set relative location to core api document root 1.35 +$(JDKNET_INDEX_HTML): GET2DOCSDIR=$(JDKNET2COREAPI)/.. 1.36 + 1.37 +# Run javadoc if the index file is out of date or missing 1.38 +$(JDKNET_INDEX_HTML): $(JDKNET_OPTIONS_FILE) $(JDKNET_PACKAGES_FILE) coredocs 1.39 + $(prep-javadoc) 1.40 + $(call JavadocSummary,$(JDKNET_OPTIONS_FILE),$(JDKNET_PACKAGES_FILE)) 1.41 + $(JAVADOC_CMD) -d $(@D) \ 1.42 + @$(JDKNET_OPTIONS_FILE) @$(JDKNET_PACKAGES_FILE) 1.43 + 1.44 +# Create file with javadoc options in it 1.45 +$(JDKNET_OPTIONS_FILE): 1.46 + $(prep-target) 1.47 + @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \ 1.48 + $(call OptionOnly,-Xdoclint:none) ; \ 1.49 + $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \ 1.50 + $(call OptionPair,-encoding,ascii) ; \ 1.51 + $(call OptionOnly,-nodeprecatedlist) ; \ 1.52 + $(call OptionPair,-doctitle,$(JDKNET_DOCTITLE)) ; \ 1.53 + $(call OptionPair,-windowtitle,$(JDKNET_WINDOWTITLE) $(DRAFT_WINTITLE)); \ 1.54 + $(call OptionPair,-header,$(JDKNET_HEADER)$(DRAFT_HEADER)); \ 1.55 + $(call OptionPair,-bottom,$(JDKNET_BOTTOM)$(DRAFT_BOTTOM)); \ 1.56 + $(call OptionTrip,-linkoffline,$(JDKNET2COREAPI),$(COREAPI_DOCSDIR)/); \ 1.57 + ) >> $@ 1.58 + 1.59 +# Create a file with the package names in it 1.60 +$(JDKNET_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JDKNET_PKGS)) 1.61 + $(prep-target) 1.62 + $(call PackageFilter,$(JDKNET_PKGS)) 1.63 + 1.64 +############################################################# 1.65 +# 1.66 # Get a cache of all the directories 1.67 1.68 $(DIRECTORY_CACHE): $(ALL_EXISTING_SOURCE_DIRS)
2.1 --- a/make/common/NON_CORE_PKGS.gmk Wed Apr 16 12:32:15 2014 -0700 2.2 +++ b/make/common/NON_CORE_PKGS.gmk Wed Apr 16 14:22:03 2014 -0700 2.3 @@ -94,7 +94,8 @@ 2.4 com.apple.eio 2.5 endif 2.6 2.7 -JDK_PKGS = jdk 2.8 +JDK_PKGS = jdk \ 2.9 + jdk.net 2.10 2.11 # non-core packages in rt.jar 2.12 NON_CORE_PKGS = $(DOMAPI_PKGS) \