Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/.hgtags	Fri Jan 02 14:09:32 2015 -0800
     1.2 +++ b/.hgtags	Thu Jan 15 11:19:15 2015 -0800
     1.3 @@ -371,3 +371,4 @@
     1.4  83d1d42c3df409c87ef7cb0126343a009857ca71 jdk8u40-b18
     1.5  ae4980d195b64eec58884b233d7efd312205bac8 jdk8u40-b19
     1.6  b31a07adaef50dacba20e376cff6f1096e745092 jdk8u40-b20
     1.7 +765a17e75fd622f7b892381e23c9b2c531d416f0 jdk8u40-b21

     2.1 --- a/make/Javadoc.gmk	Fri Jan 02 14:09:32 2015 -0800
     2.2 +++ b/make/Javadoc.gmk	Thu Jan 15 11:19:15 2015 -0800
     2.3 @@ -1116,14 +1116,15 @@
     2.4  NASHORNAPI_HEADER := <strong>Nashorn API</strong>
     2.5  NASHORNAPI_BOTTOM := $(call CommonBottom,$(NASHORNAPI_FIRST_COPYRIGHT_YEAR))
     2.6  NASHORNAPI_GROUPNAME := Packages
     2.7 -NASHORNAPI_REGEXP := com.sun.source.*
     2.8 +NASHORNAPI_REGEXP := jdk.nashorn.api.scripting.*
     2.9 +
    2.10  # NASHORNAPI_PKGS is located in NON_CORE_PKGS.gmk
    2.11  
    2.12  NASHORNAPI_INDEX_HTML = $(NASHORNAPI_DOCDIR)/index.html
    2.13 -NASHORNAPI_OPTIONS_FILE = $(DOCSTMPDIR)/treeapi.options
    2.14 -NASHORNAPI_PACKAGES_FILE = $(DOCSTMPDIR)/treeapi.packages
    2.15 +NASHORNAPI_OPTIONS_FILE = $(DOCSTMPDIR)/nashornapi.options
    2.16 +NASHORNAPI_PACKAGES_FILE = $(DOCSTMPDIR)/nashornapi.packages
    2.17  
    2.18 -treeapidocs: $(NASHORNAPI_INDEX_HTML)
    2.19 +nashornapidocs: $(NASHORNAPI_INDEX_HTML)
    2.20  
    2.21  # Set relative location to core api document root
    2.22  $(NASHORNAPI_INDEX_HTML): GET2DOCSDIR=$(NASHORNAPI2COREAPI)/..