Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/.hgtags	Tue Dec 16 14:00:10 2014 -0800
     1.2 +++ b/.hgtags	Wed Dec 17 12:47:45 2014 -0800
     1.3 @@ -368,3 +368,4 @@
     1.4  64790e9792f88fadd9d25eaf4dcba7e6e96664de jdk8u40-b16
     1.5  e1c506c8e1db7356d120dd7d22b2c50276b6bcee jdk8u40-b17
     1.6  83d1d42c3df409c87ef7cb0126343a009857ca71 jdk8u40-b18
     1.7 +ae4980d195b64eec58884b233d7efd312205bac8 jdk8u40-b19

     2.1 --- a/THIRD_PARTY_README	Tue Dec 16 14:00:10 2014 -0800
     2.2 +++ b/THIRD_PARTY_README	Wed Dec 17 12:47:45 2014 -0800
     2.3 @@ -3385,7 +3385,7 @@
     2.4  included with JRE 8, JDK 8, and OpenJDK 8.
     2.5  
     2.6    Apache Commons Math 3.2
     2.7 -  Apache Derby 10.10.1.3        
     2.8 +  Apache Derby 10.11.1.2
     2.9    Apache Jakarta BCEL 5.1 
    2.10    Apache Jakarta Regexp 1.4 
    2.11    Apache Santuario XML Security for Java 1.5.4

     3.1 --- a/make/Javadoc.gmk	Tue Dec 16 14:00:10 2014 -0800
     3.2 +++ b/make/Javadoc.gmk	Wed Dec 17 12:47:45 2014 -0800
     3.3 @@ -70,6 +70,7 @@
     3.4  SCTPAPI_FIRST_COPYRIGHT_YEAR = 2009
     3.5  TRACING_FIRST_COPYRIGHT_YEAR = 2008
     3.6  TREEAPI_FIRST_COPYRIGHT_YEAR = 2005
     3.7 +NASHORNAPI_FIRST_COPYRIGHT_YEAR = 2014
     3.8  JNLP_FIRST_COPYRIGHT_YEAR = 1998
     3.9  PLUGIN2_FIRST_COPYRIGHT_YEAR = 2007
    3.10  JDKNET_FIRST_COPYRIGHT_YEAR = 2014
    3.11 @@ -137,6 +138,7 @@
    3.12      $(JDK_OUTPUTDIR)/gendocsrc_rmic \
    3.13      $(JDK_TOPDIR)/src/solaris/classes \
    3.14      $(JDK_TOPDIR)/src/windows/classes \
    3.15 +    $(NASHORN_TOPDIR)/src/ \
    3.16      $(JDK_SHARE_SRC)/doc/stub
    3.17  
    3.18  # List of directories that actually exist
    3.19 @@ -1102,6 +1104,59 @@
    3.20  
    3.21  #############################################################
    3.22  #
    3.23 +# nashornapidocs
    3.24 +#
    3.25 +
    3.26 +ALL_OTHER_TARGETS += nashornapidocs
    3.27 +
    3.28 +NASHORNAPI_DOCDIR := $(JDK_API_DOCSDIR)/nashorn
    3.29 +NASHORNAPI2COREAPI := ../$(JDKJRE2COREAPI)
    3.30 +NASHORNAPI_DOCTITLE := Nashorn API
    3.31 +NASHORNAPI_WINDOWTITLE := Nashorn API
    3.32 +NASHORNAPI_HEADER := <strong>Nashorn API</strong>
    3.33 +NASHORNAPI_BOTTOM := $(call CommonBottom,$(NASHORNAPI_FIRST_COPYRIGHT_YEAR))
    3.34 +NASHORNAPI_GROUPNAME := Packages
    3.35 +NASHORNAPI_REGEXP := com.sun.source.*
    3.36 +# NASHORNAPI_PKGS is located in NON_CORE_PKGS.gmk
    3.37 +
    3.38 +NASHORNAPI_INDEX_HTML = $(NASHORNAPI_DOCDIR)/index.html
    3.39 +NASHORNAPI_OPTIONS_FILE = $(DOCSTMPDIR)/treeapi.options
    3.40 +NASHORNAPI_PACKAGES_FILE = $(DOCSTMPDIR)/treeapi.packages
    3.41 +
    3.42 +treeapidocs: $(NASHORNAPI_INDEX_HTML)
    3.43 +
    3.44 +# Set relative location to core api document root
    3.45 +$(NASHORNAPI_INDEX_HTML): GET2DOCSDIR=$(NASHORNAPI2COREAPI)/..
    3.46 +
    3.47 +# Run javadoc if the index file is out of date or missing
    3.48 +$(NASHORNAPI_INDEX_HTML): $(NASHORNAPI_OPTIONS_FILE) $(NASHORNAPI_PACKAGES_FILE) coredocs
    3.49 +	$(prep-javadoc)
    3.50 +	$(call JavadocSummary,$(NASHORNAPI_OPTIONS_FILE),$(NASHORNAPI_PACKAGES_FILE))
    3.51 +	$(JAVADOC_CMD) -d $(@D) \
    3.52 +	    @$(NASHORNAPI_OPTIONS_FILE) @$(NASHORNAPI_PACKAGES_FILE)
    3.53 +
    3.54 +# Create file with javadoc options in it
    3.55 +$(NASHORNAPI_OPTIONS_FILE):
    3.56 +	$(prep-target)
    3.57 +	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
    3.58 +	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
    3.59 +	  $(call OptionPair,-encoding,ascii) ; \
    3.60 +	  $(call OptionPair,-doctitle,$(NASHORNAPI_DOCTITLE)) ; \
    3.61 +	  $(call OptionPair,-windowtitle,$(NASHORNAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
    3.62 +	  $(call OptionPair,-header,$(NASHORNAPI_HEADER)$(DRAFT_HEADER)) ; \
    3.63 +	  $(call OptionPair,-tag,$(TAG_JLS)) ; \
    3.64 +	  $(call OptionPair,-bottom,$(NASHORNAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
    3.65 +	  $(call OptionTrip,-group,$(NASHORNAPI_GROUPNAME),$(NASHORNAPI_REGEXP)); \
    3.66 +	  $(call OptionTrip,-linkoffline,$(NASHORNAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
    3.67 +	) >> $@
    3.68 +
    3.69 +# Create a file with the package names in it
    3.70 +$(NASHORNAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(NASHORNAPI_PKGS))
    3.71 +	$(prep-target)
    3.72 +	$(call PackageFilter,$(NASHORNAPI_PKGS))
    3.73 +
    3.74 +#############################################################
    3.75 +#
    3.76  # sctpdocs
    3.77  #
    3.78  

     4.1 --- a/make/common/NON_CORE_PKGS.gmk	Tue Dec 16 14:00:10 2014 -0800
     4.2 +++ b/make/common/NON_CORE_PKGS.gmk	Wed Dec 17 12:47:45 2014 -0800
     4.3 @@ -83,6 +83,8 @@
     4.4      com.sun.source.util \
     4.5      jdk
     4.6  
     4.7 +NASHORNAPI_PKGS = jdk.nashorn.api.scripting
     4.8 +
     4.9  SMARTCARDIO_PKGS = javax.smartcardio
    4.10  
    4.11  SCTPAPI_PKGS = com.sun.nio.sctp