Wed, 01 Apr 2015 13:20:47 -0700
Merge
1.1 --- a/make/Javadoc.gmk Wed Apr 01 11:00:06 2015 -0700 1.2 +++ b/make/Javadoc.gmk Wed Apr 01 13:20:47 2015 -0700 1.3 @@ -1,4 +1,4 @@ 1.4 -# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 1.5 +# Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. 1.6 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.7 # 1.8 # This code is free software; you can redistribute it and/or modify it 1.9 @@ -74,6 +74,7 @@ 1.10 JNLP_FIRST_COPYRIGHT_YEAR = 1998 1.11 PLUGIN2_FIRST_COPYRIGHT_YEAR = 2007 1.12 JDKNET_FIRST_COPYRIGHT_YEAR = 2014 1.13 +JACCESSAPI_FIRST_COPYRIGHT_YEAR = 2002 1.14 1.15 # Oracle name 1.16 FULL_COMPANY_NAME = Oracle and/or its affiliates 1.17 @@ -1208,6 +1209,56 @@ 1.18 1.19 ############################################################# 1.20 # 1.21 +# jaccessdocs - Java Accessibility Utilities 1.22 +# 1.23 + 1.24 +ALL_OTHER_TARGETS += jaccessdocs 1.25 + 1.26 +JACCESSAPI_DOCDIR := $(JRE_API_DOCSDIR)/accessibility/jaccess/spec 1.27 +JACCESSAPI2COREAPI := ../../../$(JDKJRE2COREAPI) 1.28 +JACCESSAPI_DOCTITLE := JACCESS API 1.29 +JACCESSAPI_WINDOWTITLE := JACCESS API 1.30 +JACCESSAPI_HEADER := <strong>JACCESS API</strong> 1.31 +JACCESSAPI_BOTTOM := $(call CommonBottom,$(JACCESSAPI_FIRST_COPYRIGHT_YEAR)) 1.32 +# JACCESSAPI_PKGS is located in NON_CORE_PKGS.gmk 1.33 + 1.34 +JACCESSAPI_INDEX_HTML = $(JACCESSAPI_DOCDIR)/index.html 1.35 +JACCESSAPI_OPTIONS_FILE = $(DOCSTMPDIR)/jaccess.options 1.36 +JACCESSAPI_PACKAGES_FILE = $(DOCSTMPDIR)/jaccess.packages 1.37 + 1.38 +jaccessdocs: $(JACCESSAPI_INDEX_HTML) 1.39 + 1.40 +# Set relative location to core api document root 1.41 +$(JACCESSAPI_INDEX_HTML): GET2DOCSDIR=$(JACCESSAPI2COREAPI)/.. 1.42 + 1.43 +# Run javadoc if the index file is out of date or missing 1.44 +$(JACCESSAPI_INDEX_HTML): $(JACCESSAPI_OPTIONS_FILE) $(JACCESSAPI_PACKAGES_FILE) coredocs 1.45 + $(prep-javadoc) 1.46 + $(call JavadocSummary,$(JACCESSAPI_OPTIONS_FILE),$(JACCESSAPI_PACKAGES_FILE)) 1.47 + $(JAVADOC_CMD) -d $(@D) \ 1.48 + @$(JACCESSAPI_OPTIONS_FILE) @$(JACCESSAPI_PACKAGES_FILE) 1.49 + 1.50 +# Create file with javadoc options in it 1.51 +$(JACCESSAPI_OPTIONS_FILE): 1.52 + $(prep-target) 1.53 + @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \ 1.54 + $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \ 1.55 + $(call OptionPair,-encoding,ascii) ; \ 1.56 + $(call OptionOnly,-nodeprecatedlist) ; \ 1.57 + $(call OptionPair,-doctitle,$(JACCESSAPI_DOCTITLE)) ; \ 1.58 + $(call OptionPair,-windowtitle,$(JACCESSAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \ 1.59 + $(call OptionPair,-header,$(JACCESSAPI_HEADER)$(DRAFT_HEADER)) ; \ 1.60 + $(call OptionPair,-bottom,$(JACCESSAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \ 1.61 + $(call OptionTrip,-linkoffline,$(JACCESSAPI2COREAPI),$(COREAPI_DOCSDIR)/); \ 1.62 + ) >> $@ 1.63 + 1.64 +# Create a file with the package names in it 1.65 +$(JACCESSAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JACCESSAPI_PKGS)) 1.66 + $(prep-target) 1.67 + $(call PackageFilter,$(JACCESSAPI_PKGS)) 1.68 + 1.69 +############################################################# 1.70 +# 1.71 # jdk.net docs 1.72 # 1.73
2.1 --- a/make/common/NON_CORE_PKGS.gmk Wed Apr 01 11:00:06 2015 -0700 2.2 +++ b/make/common/NON_CORE_PKGS.gmk Wed Apr 01 13:20:47 2015 -0700 2.3 @@ -1,5 +1,5 @@ 2.4 # 2.5 -# Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. 2.6 +# Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. 2.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.8 # 2.9 # This code is free software; you can redistribute it and/or modify it 2.10 @@ -100,6 +100,8 @@ 2.11 jdk.net \ 2.12 jdk.management.cmm 2.13 2.14 +JACCESSAPI_PKGS = com.sun.java.accessibility.util 2.15 + 2.16 # non-core packages in rt.jar 2.17 NON_CORE_PKGS = $(DOMAPI_PKGS) \ 2.18 $(MGMT_PKGS) \ 2.19 @@ -111,4 +113,5 @@ 2.20 $(SMARTCARDIO_PKGS) \ 2.21 $(SCTPAPI_PKGS) \ 2.22 $(APPLE_EXT_PKGS) \ 2.23 - $(JDK_PKGS) 2.24 + $(JDK_PKGS) \ 2.25 + $(JACCESSAPI_PKGS)