Tue, 09 Dec 2014 13:13:58 -0800
Merge
1.1 --- a/THIRD_PARTY_README Wed Dec 03 11:12:40 2014 -0800 1.2 +++ b/THIRD_PARTY_README Tue Dec 09 13:13:58 2014 -0800 1.3 @@ -3385,7 +3385,7 @@ 1.4 included with JRE 8, JDK 8, and OpenJDK 8. 1.5 1.6 Apache Commons Math 3.2 1.7 - Apache Derby 10.10.1.3 1.8 + Apache Derby 10.11.1.2 1.9 Apache Jakarta BCEL 5.1 1.10 Apache Jakarta Regexp 1.4 1.11 Apache Santuario XML Security for Java 1.5.4
2.1 --- a/make/Javadoc.gmk Wed Dec 03 11:12:40 2014 -0800 2.2 +++ b/make/Javadoc.gmk Tue Dec 09 13:13:58 2014 -0800 2.3 @@ -70,6 +70,7 @@ 2.4 SCTPAPI_FIRST_COPYRIGHT_YEAR = 2009 2.5 TRACING_FIRST_COPYRIGHT_YEAR = 2008 2.6 TREEAPI_FIRST_COPYRIGHT_YEAR = 2005 2.7 +NASHORNAPI_FIRST_COPYRIGHT_YEAR = 2014 2.8 JNLP_FIRST_COPYRIGHT_YEAR = 1998 2.9 PLUGIN2_FIRST_COPYRIGHT_YEAR = 2007 2.10 JDKNET_FIRST_COPYRIGHT_YEAR = 2014 2.11 @@ -137,6 +138,7 @@ 2.12 $(JDK_OUTPUTDIR)/gendocsrc_rmic \ 2.13 $(JDK_TOPDIR)/src/solaris/classes \ 2.14 $(JDK_TOPDIR)/src/windows/classes \ 2.15 + $(NASHORN_TOPDIR)/src/ \ 2.16 $(JDK_SHARE_SRC)/doc/stub 2.17 2.18 # List of directories that actually exist 2.19 @@ -1102,6 +1104,59 @@ 2.20 2.21 ############################################################# 2.22 # 2.23 +# nashornapidocs 2.24 +# 2.25 + 2.26 +ALL_OTHER_TARGETS += nashornapidocs 2.27 + 2.28 +NASHORNAPI_DOCDIR := $(JDK_API_DOCSDIR)/nashorn 2.29 +NASHORNAPI2COREAPI := ../$(JDKJRE2COREAPI) 2.30 +NASHORNAPI_DOCTITLE := Nashorn API 2.31 +NASHORNAPI_WINDOWTITLE := Nashorn API 2.32 +NASHORNAPI_HEADER := <strong>Nashorn API</strong> 2.33 +NASHORNAPI_BOTTOM := $(call CommonBottom,$(NASHORNAPI_FIRST_COPYRIGHT_YEAR)) 2.34 +NASHORNAPI_GROUPNAME := Packages 2.35 +NASHORNAPI_REGEXP := com.sun.source.* 2.36 +# NASHORNAPI_PKGS is located in NON_CORE_PKGS.gmk 2.37 + 2.38 +NASHORNAPI_INDEX_HTML = $(NASHORNAPI_DOCDIR)/index.html 2.39 +NASHORNAPI_OPTIONS_FILE = $(DOCSTMPDIR)/treeapi.options 2.40 +NASHORNAPI_PACKAGES_FILE = $(DOCSTMPDIR)/treeapi.packages 2.41 + 2.42 +treeapidocs: $(NASHORNAPI_INDEX_HTML) 2.43 + 2.44 +# Set relative location to core api document root 2.45 +$(NASHORNAPI_INDEX_HTML): GET2DOCSDIR=$(NASHORNAPI2COREAPI)/.. 2.46 + 2.47 +# Run javadoc if the index file is out of date or missing 2.48 +$(NASHORNAPI_INDEX_HTML): $(NASHORNAPI_OPTIONS_FILE) $(NASHORNAPI_PACKAGES_FILE) coredocs 2.49 + $(prep-javadoc) 2.50 + $(call JavadocSummary,$(NASHORNAPI_OPTIONS_FILE),$(NASHORNAPI_PACKAGES_FILE)) 2.51 + $(JAVADOC_CMD) -d $(@D) \ 2.52 + @$(NASHORNAPI_OPTIONS_FILE) @$(NASHORNAPI_PACKAGES_FILE) 2.53 + 2.54 +# Create file with javadoc options in it 2.55 +$(NASHORNAPI_OPTIONS_FILE): 2.56 + $(prep-target) 2.57 + @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \ 2.58 + $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \ 2.59 + $(call OptionPair,-encoding,ascii) ; \ 2.60 + $(call OptionPair,-doctitle,$(NASHORNAPI_DOCTITLE)) ; \ 2.61 + $(call OptionPair,-windowtitle,$(NASHORNAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \ 2.62 + $(call OptionPair,-header,$(NASHORNAPI_HEADER)$(DRAFT_HEADER)) ; \ 2.63 + $(call OptionPair,-tag,$(TAG_JLS)) ; \ 2.64 + $(call OptionPair,-bottom,$(NASHORNAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \ 2.65 + $(call OptionTrip,-group,$(NASHORNAPI_GROUPNAME),$(NASHORNAPI_REGEXP)); \ 2.66 + $(call OptionTrip,-linkoffline,$(NASHORNAPI2COREAPI),$(COREAPI_DOCSDIR)/); \ 2.67 + ) >> $@ 2.68 + 2.69 +# Create a file with the package names in it 2.70 +$(NASHORNAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(NASHORNAPI_PKGS)) 2.71 + $(prep-target) 2.72 + $(call PackageFilter,$(NASHORNAPI_PKGS)) 2.73 + 2.74 +############################################################# 2.75 +# 2.76 # sctpdocs 2.77 # 2.78
3.1 --- a/make/common/NON_CORE_PKGS.gmk Wed Dec 03 11:12:40 2014 -0800 3.2 +++ b/make/common/NON_CORE_PKGS.gmk Tue Dec 09 13:13:58 2014 -0800 3.3 @@ -83,6 +83,8 @@ 3.4 com.sun.source.util \ 3.5 jdk 3.6 3.7 +NASHORNAPI_PKGS = jdk.nashorn.api.scripting 3.8 + 3.9 SMARTCARDIO_PKGS = javax.smartcardio 3.10 3.11 SCTPAPI_PKGS = com.sun.nio.sctp