OpenJDK / jdk / hs
changeset 45108:8ad1bd49f4bc
8180328: Bad links in footer of all javadoc-generated pages
Reviewed-by: erikj
| author | ihse |
|---|---|
| date | Tue, 16 May 2017 14:14:26 +0200 |
| parents | 8d21264e7878 |
| children | 7d4a9f19238a 35b3a3acc1d2 97be1bcd7b25 |
| files | make/Docs.gmk |
| diffstat | 1 files changed, 2 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Docs.gmk Tue May 16 14:13:48 2017 +0200 +++ b/make/Docs.gmk Tue May 16 14:14:26 2017 +0200 @@ -48,11 +48,8 @@ MODULES_SOURCE_PATH := $(call PathList, $(call GetModuleSrcPath) \ $(SUPPORT_OUTPUTDIR)/rmic/* $(JDK_TOPDIR)/src/*/share/doc/stub) -# Should we use -Xdocrootparent? Allow custom to overwrite. -DOCROOTPARENT_FLAG ?= TRUE - # URLs -JAVADOC_BASE_URL := http://www.oracle.com/pls/topic/lookup?ctx=javase9&id=homepage +JAVADOC_BASE_URL := http://www.oracle.com/pls/topic/lookup?ctx=javase9&id=homepage BUG_SUBMIT_URL := http://bugreport.java.com/bugreport/ COPYRIGHT_URL := {@docroot}/../legal/cpyr.html LICENSE_URL := http://www.oracle.com/technetwork/java/javase/terms/license/java9speclicense.html @@ -130,7 +127,7 @@ <span style="font-size:smaller"> \ <a href="$(BUG_SUBMIT_URL)">Submit a bug or feature</a><br> \ For further API reference and developer documentation, see \ - <a href="$(JAVADOC_BASE_URL)/index.html" target="_blank">Java SE \ + <a href="$(JAVADOC_BASE_URL)" target="_blank">Java SE \ Documentation</a>. That documentation contains more detailed, \ developer-targeted descriptions, with conceptual overviews, definitions \ of terms, workarounds, and working code examples.<br> \ @@ -236,10 +233,6 @@ $1_OPTIONS += -Xdoclint:all,$$(call CommaList, $$(addprefix -, \ $$(JAVADOC_DISABLED_DOCLINT))) - ifeq ($$($$DOCROOTPARENT_FLAG), TRUE) - $1_OPTIONS += -Xdocrootparent $$(JAVADOC_BASE_URL) - endif - $1_OPTIONS += -doctitle '$$($1_DOC_TITLE)' $1_OPTIONS += -windowtitle '$$($1_WINDOW_TITLE)' $1_OPTIONS += -header '$$($1_HEADER_TITLE)'