Mercurial > hg > openjdk > aarch64-port

changeset 1372:16f78e229a52

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Mon, 19 Jan 2015 12:25:14 -0800
parents 9d36d975bb20 (current diff) b6d03a810a61 (diff)
children 3d79ef8a102f a109b7e4a5a8
files .hgtags
diffstat 2 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Jan 12 13:48:06 2015 -0800
+++ b/.hgtags	Mon Jan 19 12:25:14 2015 -0800
@@ -374,6 +374,7 @@
 83d1d42c3df409c87ef7cb0126343a009857ca71 jdk8u40-b18
 ae4980d195b64eec58884b233d7efd312205bac8 jdk8u40-b19
 b31a07adaef50dacba20e376cff6f1096e745092 jdk8u40-b20
+765a17e75fd622f7b892381e23c9b2c531d416f0 jdk8u40-b21
 ec4bcc6e4dcf190a165106627ed3eef1e7d94d0c jdk8u45-b00
 635ba0c81b894a88ff737fefc9d7af398f761643 jdk8u45-b01
 801c65bb74b770600a2d48189764e416e5cfe265 jdk8u45-b02
--- a/make/Javadoc.gmk	Mon Jan 12 13:48:06 2015 -0800
+++ b/make/Javadoc.gmk	Mon Jan 19 12:25:14 2015 -0800
@@ -114,10 +114,10 @@
 
 # Url to devdocs page
 # Was: http://java.sun.com/javase/6/webnotes/devdocs-vs-specs.html
-DEV_DOCS_URL-7 = http://download.oracle.com/javase/7/docs/index.html
-DEV_DOCS_URL-8 = http://download.oracle.com/javase/8/docs/index.html
+DEV_DOCS_URL-7 = https://docs.oracle.com/javase/7/docs/index.html
+DEV_DOCS_URL-8 = https://docs.oracle.com/javase/8/docs/index.html
 DEV_DOCS_URL = $(DEV_DOCS_URL-$(JDK_MINOR_VERSION))
-DOCS_BASE_URL = http://download.oracle.com/javase/7/docs
+DOCS_BASE_URL = https://docs.oracle.com/javase/7/docs
 
 # Common Java trademark line
 JAVA_TRADEMARK_LINE = Java is a trademark or registered trademark of \
@@ -1116,14 +1116,15 @@
 NASHORNAPI_HEADER := <strong>Nashorn API</strong>
 NASHORNAPI_BOTTOM := $(call CommonBottom,$(NASHORNAPI_FIRST_COPYRIGHT_YEAR))
 NASHORNAPI_GROUPNAME := Packages
-NASHORNAPI_REGEXP := com.sun.source.*
+NASHORNAPI_REGEXP := jdk.nashorn.api.scripting.*
+
 # NASHORNAPI_PKGS is located in NON_CORE_PKGS.gmk
 
 NASHORNAPI_INDEX_HTML = $(NASHORNAPI_DOCDIR)/index.html
-NASHORNAPI_OPTIONS_FILE = $(DOCSTMPDIR)/treeapi.options
-NASHORNAPI_PACKAGES_FILE = $(DOCSTMPDIR)/treeapi.packages
+NASHORNAPI_OPTIONS_FILE = $(DOCSTMPDIR)/nashornapi.options
+NASHORNAPI_PACKAGES_FILE = $(DOCSTMPDIR)/nashornapi.packages
 
-treeapidocs: $(NASHORNAPI_INDEX_HTML)
+nashornapidocs: $(NASHORNAPI_INDEX_HTML)
 
 # Set relative location to core api document root
 $(NASHORNAPI_INDEX_HTML): GET2DOCSDIR=$(NASHORNAPI2COREAPI)/..