Skip to content

Commit 6eca296

Browse files
committed
8258420: Move URL configuration from Docs.gmk to conf dir
Reviewed-by: alanb
1 parent 3c66485 commit 6eca296

File tree

2 files changed

+33
-6
lines changed

2 files changed

+33
-6
lines changed

make/Docs.gmk

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,11 @@ $(eval $(call IncludeCustomExtension, Docs.gmk))
5757
################################################################################
5858
# Javadoc settings
5959

60+
# Include configuration for URLs in generated javadoc
61+
include $(TOPDIR)/make/conf/javadoc.conf
62+
6063
MODULES_SOURCE_PATH := $(call PathList, $(call GetModuleSrcPath) )
6164

62-
# URLs
63-
JAVADOC_BASE_URL := https://docs.oracle.com/pls/topic/lookup?ctx=javase$(VERSION_NUMBER)&id=homepage
64-
BUG_SUBMIT_URL := https://bugreport.java.com/bugreport/
65-
COPYRIGHT_URL := legal/copyright.html
66-
LICENSE_URL := https://www.oracle.com/java/javase/terms/license/java$(VERSION_NUMBER)speclicense.html
67-
REDISTRIBUTION_URL := https://www.oracle.com/technetwork/java/redist-137594.html
6865

6966
# In order to get a specific ordering it's necessary to specify the total
7067
# ordering of tags as the tags are otherwise ordered in order of definition.

make/conf/javadoc.conf

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
2+
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
3+
#
4+
# This code is free software; you can redistribute it and/or modify it
5+
# under the terms of the GNU General Public License version 2 only, as
6+
# published by the Free Software Foundation. Oracle designates this
7+
# particular file as subject to the "Classpath" exception as provided
8+
# by Oracle in the LICENSE file that accompanied this code.
9+
#
10+
# This code is distributed in the hope that it will be useful, but WITHOUT
11+
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
12+
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
13+
# version 2 for more details (a copy is included in the LICENSE file that
14+
# accompanied this code).
15+
#
16+
# You should have received a copy of the GNU General Public License version
17+
# 2 along with this work; if not, write to the Free Software Foundation,
18+
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
19+
#
20+
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
21+
# or visit www.oracle.com if you need additional information or have any
22+
# questions.
23+
#
24+
25+
# URLs
26+
JAVADOC_BASE_URL=https://docs.oracle.com/pls/topic/lookup?ctx=javase$(VERSION_NUMBER)&id=homepage
27+
BUG_SUBMIT_URL=https://bugreport.java.com/bugreport/
28+
COPYRIGHT_URL=legal/copyright.html
29+
LICENSE_URL=https://www.oracle.com/java/javase/terms/license/java$(VERSION_NUMBER)speclicense.html
30+
REDISTRIBUTION_URL=https://www.oracle.com/technetwork/java/redist-137594.html

0 commit comments

Comments
 (0)