1.1 --- a/common/makefiles/javadoc/Javadoc.gmk Mon Oct 14 18:53:53 2013 -0400
1.2 +++ b/common/makefiles/javadoc/Javadoc.gmk Wed Oct 16 11:55:44 2013 -0700
1.3 @@ -47,31 +47,31 @@
1.4 BUILD_NUMBER=$(JDK_BUILD_NUMBER)
1.5
1.6 JAVADOC_CMD = $(JAVA) \
1.7 - -Xmx1024m \
1.8 - -Djava.awt.headless=true \
1.9 - $(NEW_JAVADOC) \
1.10 - -bootclasspath $(JDK_OUTPUTDIR)/classes
1.11 + -Xmx1024m \
1.12 + -Djava.awt.headless=true \
1.13 + $(NEW_JAVADOC) \
1.14 + -bootclasspath $(JDK_OUTPUTDIR)/classes
1.15
1.16 # Copyright year for beginning of Java and some of the apis
1.17 -# (Needed when creating the javadocs)
1.18 -FIRST_COPYRIGHT_YEAR = 1993
1.19 -DOMAPI_FIRST_COPYRIGHT_YEAR = 2005
1.20 -MIRROR_FIRST_COPYRIGHT_YEAR = 2004
1.21 -DOCLETAPI_FIRST_COPYRIGHT_YEAR = 1993
1.22 -TAGLETAPI_FIRST_COPYRIGHT_YEAR = 1993
1.23 -JDI_FIRST_COPYRIGHT_YEAR = 1999
1.24 -JAAS_FIRST_COPYRIGHT_YEAR = 1998
1.25 -JGSS_FIRST_COPYRIGHT_YEAR = 2000
1.26 -SMARTCARDIO_FIRST_COPYRIGHT_YEAR = 2005
1.27 -HTTPSERVER_FIRST_COPYRIGHT_YEAR = 2005
1.28 -MGMT_FIRST_COPYRIGHT_YEAR = 2003
1.29 -ATTACH_FIRST_COPYRIGHT_YEAR = 2005
1.30 -JCONSOLE_FIRST_COPYRIGHT_YEAR = 2006
1.31 -SCTPAPI_FIRST_COPYRIGHT_YEAR = 2009
1.32 -TRACING_FIRST_COPYRIGHT_YEAR = 2008
1.33 -TREEAPI_FIRST_COPYRIGHT_YEAR = 2005
1.34 -JNLP_FIRST_COPYRIGHT_YEAR = 1998
1.35 -PLUGIN2_FIRST_COPYRIGHT_YEAR = 2007
1.36 +# (Needed when creating the javadocs)
1.37 +FIRST_COPYRIGHT_YEAR = 1993
1.38 +DOMAPI_FIRST_COPYRIGHT_YEAR = 2005
1.39 +MIRROR_FIRST_COPYRIGHT_YEAR = 2004
1.40 +DOCLETAPI_FIRST_COPYRIGHT_YEAR = 1993
1.41 +TAGLETAPI_FIRST_COPYRIGHT_YEAR = 1993
1.42 +JDI_FIRST_COPYRIGHT_YEAR = 1999
1.43 +JAAS_FIRST_COPYRIGHT_YEAR = 1998
1.44 +JGSS_FIRST_COPYRIGHT_YEAR = 2000
1.45 +SMARTCARDIO_FIRST_COPYRIGHT_YEAR = 2005
1.46 +HTTPSERVER_FIRST_COPYRIGHT_YEAR = 2005
1.47 +MGMT_FIRST_COPYRIGHT_YEAR = 2003
1.48 +ATTACH_FIRST_COPYRIGHT_YEAR = 2005
1.49 +JCONSOLE_FIRST_COPYRIGHT_YEAR = 2006
1.50 +SCTPAPI_FIRST_COPYRIGHT_YEAR = 2009
1.51 +TRACING_FIRST_COPYRIGHT_YEAR = 2008
1.52 +TREEAPI_FIRST_COPYRIGHT_YEAR = 2005
1.53 +JNLP_FIRST_COPYRIGHT_YEAR = 1998
1.54 +PLUGIN2_FIRST_COPYRIGHT_YEAR = 2007
1.55
1.56 # Oracle name
1.57 FULL_COMPANY_NAME = Oracle and/or its affiliates
1.58 @@ -83,15 +83,15 @@
1.59 TRADEMARK = ™
1.60
1.61 # Common copyright lines used
1.62 -# The word "Copyright" might optionally be a link to the file cpyr.html.
1.63 -# The first year of copyright may vary or not be available.
1.64 -# The address to the company might be optional.
1.65 +# The word "Copyright" might optionally be a link to the file cpyr.html.
1.66 +# The first year of copyright may vary or not be available.
1.67 +# The address to the company might be optional.
1.68 COMMA:= ,
1.69 EMPTY:=
1.70 SPACE:=$(EMPTY) $(EMPTY)
1.71 COPYRIGHT_SYMBOL = &\#x00a9;
1.72 # Macro to construct the copyright line
1.73 -# (The GNU make 3.78.1 "if" conditional is broken, fixed in GNU make 3.81)
1.74 +# (The GNU make 3.78.1 "if" conditional is broken, fixed in GNU make 3.81)
1.75 define CopyrightLine # optionalurl optionalfirstyear optionaladdress
1.76 $(if $(strip $1),<a href="$(strip $1)">Copyright</a>,Copyright) \
1.77 $(COPYRIGHT_SYMBOL) $(if $2,$2${COMMA},) $(COPYRIGHT_YEAR),\
1.78 @@ -114,7 +114,7 @@
1.79 BUG_SUBMIT_LINE = <a href="$(BUG_SUBMIT_URL)">Submit a bug or feature</a>
1.80
1.81 # Url to devdocs page
1.82 -# Was: http://java.sun.com/javase/6/webnotes/devdocs-vs-specs.html
1.83 +# Was: http://java.sun.com/javase/6/webnotes/devdocs-vs-specs.html
1.84 DEV_DOCS_URL-7 = http://download.oracle.com/javase/7/docs/index.html
1.85 DEV_DOCS_URL-8 = http://download.oracle.com/javase/8/docs/index.html
1.86 DEV_DOCS_URL = $(DEV_DOCS_URL-$(JDK_MINOR_VERSION))
1.87 @@ -129,17 +129,17 @@
1.88
1.89
1.90 # List of all possible directories for javadoc to look for sources
1.91 -# NOTE: Quotes are required around sourcepath argument only on Windows.
1.92 -# Otherwise, you get "No packages or classes specified." due
1.93 -# to $(PATH_SEP) being interpreted as an end of
1.94 -# command (newline or shell ; character)
1.95 +# NOTE: Quotes are required around sourcepath argument only on Windows.
1.96 +# Otherwise, you get "No packages or classes specified." due
1.97 +# to $(PATH_SEP) being interpreted as an end of
1.98 +# command (newline or shell ; character)
1.99 ALL_SOURCE_DIRS = $(JDK_SHARE_CLASSES) \
1.100 - $(JDK_IMPSRC) \
1.101 - $(JDK_GENSRC) \
1.102 - $(JDK_OUTPUTDIR)/gendocsrc_rmic \
1.103 - $(JDK_TOPDIR)/src/solaris/classes \
1.104 - $(JDK_TOPDIR)/src/windows/classes \
1.105 - $(JDK_SHARE_SRC)/doc/stub
1.106 + $(JDK_IMPSRC) \
1.107 + $(JDK_GENSRC) \
1.108 + $(JDK_OUTPUTDIR)/gendocsrc_rmic \
1.109 + $(JDK_TOPDIR)/src/solaris/classes \
1.110 + $(JDK_TOPDIR)/src/windows/classes \
1.111 + $(JDK_SHARE_SRC)/doc/stub
1.112
1.113 # List of directories that actually exist
1.114 ALL_EXISTING_SOURCE_DIRS := $(wildcard $(ALL_SOURCE_DIRS))
1.115 @@ -151,60 +151,60 @@
1.116 $(subst $(SPACE),$(PATH_SEP),$(strip $(ALL_SOURCE_DIRS)))
1.117
1.118 define prep-target
1.119 -$(MKDIR) -p $(@D)
1.120 -$(RM) $@
1.121 + $(MKDIR) -p $(@D)
1.122 + $(RM) $@
1.123 endef
1.124
1.125 # Prep for javadoc creation, assumes $@ is an index.html file
1.126 define prep-javadoc
1.127 -@if [ -f "$@" -a "$?" != "" ] ; then \
1.128 - $(ECHO) "# Dependencies have changed: $?"; \
1.129 -fi
1.130 -$(RM) -r $(@D)
1.131 -$(MKDIR) -p $(@D)
1.132 + @if [ -f "$@" -a "$?" != "" ] ; then \
1.133 + $(ECHO) "# Dependencies have changed: $?"; \
1.134 + fi
1.135 + $(RM) -r $(@D)
1.136 + $(MKDIR) -p $(@D)
1.137 endef
1.138
1.139 # A cache of the directories in ALL_SOURCE_DIRS
1.140 DIRECTORY_CACHE = $(DOCSTMPDIR)/directory.cache
1.141
1.142 # Given a list of packages, return a list of files or dirs to be dependent on
1.143 -# (Currently only returning a list of directories)
1.144 +# (Currently only returning a list of directories)
1.145 define PackageDependencies # packages
1.146 -$(shell \
1.147 - if [ "$1" != "" -a -f $(DIRECTORY_CACHE) ] ; then \
1.148 - for p in $1 ; do \
1.149 - pd=`$(ECHO) $${p} | $(SED) -e 's@[.]@/@g'`; \
1.150 - $(CAT) $(DIRECTORY_CACHE) | $(GREP) "/$${pd}/" ; \
1.151 - done; \
1.152 - fi \
1.153 -)
1.154 + $(shell \
1.155 + if [ "$1" != "" -a -f $(DIRECTORY_CACHE) ] ; then \
1.156 + for p in $1 ; do \
1.157 + pd=`$(ECHO) $${p} | $(SED) -e 's@[.]@/@g'`; \
1.158 + $(CAT) $(DIRECTORY_CACHE) | $(GREP) "/$${pd}/" ; \
1.159 + done; \
1.160 + fi \
1.161 + )
1.162 endef
1.163
1.164 # Given a list of packages, add packages that exist to $@, print summary
1.165 define PackageFilter # packages
1.166 -@if [ "$1" != "" ] ; then \
1.167 - for p in $1 ; do \
1.168 - pd=`$(ECHO) $${p} | $(SED) -e 's@[.]@/@g'`; \
1.169 - found="false"; \
1.170 - for cp in $(ALL_SOURCE_DIRS) ; do \
1.171 - if [ -d $${cp}/$${pd} ] ; then \
1.172 - $(ECHO) "$${p}" >> $@; \
1.173 - found="true"; \
1.174 - break; \
1.175 - fi; \
1.176 - done; \
1.177 - if [ "$${found}" = "false" ] ; then \
1.178 - $(ECHO) "WARNING: Package not found: $${p}"; \
1.179 - fi; \
1.180 - done; \
1.181 -fi
1.182 + @if [ "$1" != "" ] ; then \
1.183 + for p in $1 ; do \
1.184 + pd=`$(ECHO) $${p} | $(SED) -e 's@[.]@/@g'`; \
1.185 + found="false"; \
1.186 + for cp in $(ALL_SOURCE_DIRS) ; do \
1.187 + if [ -d $${cp}/$${pd} ] ; then \
1.188 + $(ECHO) "$${p}" >> $@; \
1.189 + found="true"; \
1.190 + break; \
1.191 + fi; \
1.192 + done; \
1.193 + if [ "$${found}" = "false" ] ; then \
1.194 + $(ECHO) "WARNING: Package not found: $${p}"; \
1.195 + fi; \
1.196 + done; \
1.197 + fi
1.198 endef
1.199
1.200 # Print out a summary of the javadoc command about to be run
1.201 define JavadocSummary # optionsfile packagesfile
1.202 -@$(ECHO) "# Summary for $@";\
1.203 - $(ECHO) "# Options (`$(BASENAME) $1`):"; $(SED) -e 's@^@# @' $1; \
1.204 - $(ECHO) "# Packages (`$(BASENAME) $2`):";$(SED) -e 's@^@# @' $2
1.205 + @$(ECHO) "# Summary for $@"; \
1.206 + $(ECHO) "# Options (`$(BASENAME) $1`):"; $(SED) -e 's@^@# @' $1; \
1.207 + $(ECHO) "# Packages (`$(BASENAME) $2`):";$(SED) -e 's@^@# @' $2
1.208 endef
1.209
1.210 #
1.211 @@ -215,15 +215,15 @@
1.212 #
1.213 # Different api directories created from root directory
1.214 #
1.215 -COREAPI_DOCSDIR = $(DOCSDIR)/api
1.216 -JDK_API_DOCSDIR = $(DOCSDIR)/jdk/api
1.217 -JRE_API_DOCSDIR = $(DOCSDIR)/jre/api
1.218 -PLATFORM_DOCSDIR = $(DOCSDIR)/platform
1.219 +COREAPI_DOCSDIR = $(DOCSDIR)/api
1.220 +JDK_API_DOCSDIR = $(DOCSDIR)/jdk/api
1.221 +JRE_API_DOCSDIR = $(DOCSDIR)/jre/api
1.222 +PLATFORM_DOCSDIR = $(DOCSDIR)/platform
1.223
1.224 # The non-core api javadocs need to be able to access the root of the core
1.225 -# api directory, so for jdk/api or jre/api to get to the core api/
1.226 -# directory we would use this:
1.227 -JDKJRE2COREAPI = ../../api
1.228 +# api directory, so for jdk/api or jre/api to get to the core api/
1.229 +# directory we would use this:
1.230 +JDKJRE2COREAPI = ../../api
1.231
1.232 # Common bottom argument
1.233 define CommonBottom # year
1.234 @@ -240,13 +240,13 @@
1.235
1.236 # Common echo of option
1.237 define OptionOnly # opt
1.238 -$(PRINTF) "%s\n" "$1"
1.239 + $(PRINTF) "%s\n" "$1"
1.240 endef
1.241 define OptionPair # opt arg
1.242 -$(PRINTF) "%s '%s'\n" "$1" '$2'
1.243 + $(PRINTF) "%s '%s'\n" "$1" '$2'
1.244 endef
1.245 define OptionTrip # opt arg arg
1.246 -$(PRINTF) "%s '%s' '%s'\n" "$1" '$2' '$3'
1.247 + $(PRINTF) "%s '%s' '%s'\n" "$1" '$2' '$3'
1.248 endef
1.249
1.250 # Core api bottom argument (with special sauce)
1.251 @@ -260,18 +260,18 @@
1.252 </font>
1.253
1.254 # Common javadoc options used by all
1.255 -COMMON_JAVADOCFLAGS = \
1.256 - -XDignore.symbol.file=true \
1.257 - -quiet \
1.258 - -use \
1.259 - -keywords \
1.260 - -Xdoclint:none \
1.261 - -Xprofilespath $(JDK_TOPDIR)/makefiles/profile-rtjar-includes.txt \
1.262 - $(ADDITIONAL_JAVADOCFLAGS)
1.263 +COMMON_JAVADOCFLAGS = \
1.264 + -XDignore.symbol.file=true \
1.265 + -quiet \
1.266 + -use \
1.267 + -keywords \
1.268 + -Xdoclint:none \
1.269 + -Xprofilespath $(JDK_TOPDIR)/makefiles/profile-rtjar-includes.txt \
1.270 + $(ADDITIONAL_JAVADOCFLAGS)
1.271
1.272 ifdef OPENJDK
1.273 - ADDITIONAL_JAVADOCFLAGS = \
1.274 - -Xdocrootparent $(DOCS_BASE_URL)
1.275 + ADDITIONAL_JAVADOCFLAGS = \
1.276 + -Xdocrootparent $(DOCS_BASE_URL)
1.277 else
1.278 ADDITIONAL_JAVADOCFLAGS =
1.279 endif
1.280 @@ -279,11 +279,11 @@
1.281 # Draft used for non-fcs documents
1.282 DRAFT_HEADER =
1.283 ifneq ($(MILESTONE), fcs)
1.284 - DRAFT_HEADER = <br><strong>DRAFT $(MILESTONE)-$(BUILD_NUMBER)</strong>
1.285 - DRAFT_BOTTOM = <br><strong>DRAFT $(MILESTONE)-$(BUILD_NUMBER)</strong>
1.286 - DRAFT_WINTITLE = $(BUILD_NUMBER)
1.287 - # Early access top text (not used in FCS releases)
1.288 - COREAPI_TOP_EARLYACCESS = \
1.289 + DRAFT_HEADER = <br><strong>DRAFT $(MILESTONE)-$(BUILD_NUMBER)</strong>
1.290 + DRAFT_BOTTOM = <br><strong>DRAFT $(MILESTONE)-$(BUILD_NUMBER)</strong>
1.291 + DRAFT_WINTITLE = $(BUILD_NUMBER)
1.292 + # Early access top text (not used in FCS releases)
1.293 + COREAPI_TOP_EARLYACCESS = \
1.294 <div style="background-color: \#EEEEEE"> \
1.295 <div style="padding: 6px; margin-top: 2px; margin-bottom: 6px; \
1.296 margin-left: 6px; margin-right: 6px; text-align: justify; \
1.297 @@ -294,6 +294,7 @@
1.298 The information is being made available to you solely for purpose of \
1.299 evaluation. \
1.300 </div> </div>
1.301 +
1.302 endif
1.303
1.304 #################################################################
1.305 @@ -320,12 +321,12 @@
1.306
1.307 #################################################################
1.308 # Production Targets -- USE THESE TARGETS WHEN:
1.309 -# a) You're generating docs outside of release engineering's
1.310 -# standard control build.
1.311 -# b) The docs will be pushed to the web and/or included in
1.312 -# the downloaded doc bundle.
1.313 +# a) You're generating docs outside of release engineering's
1.314 +# standard control build.
1.315 +# b) The docs will be pushed to the web and/or included in
1.316 +# the downloaded doc bundle.
1.317 #
1.318 -# See: Notes.html#releaseTargets
1.319 +# See: Notes.html#releaseTargets
1.320 # Note: Spaces precede ifdef/ifndef indents. Tabs precede target commands (!)
1.321 #
1.322
1.323 @@ -335,20 +336,20 @@
1.324 @$(ECHO) " BUILD_NUMBER = $(BUILD_NUMBER)"
1.325 @$(ECHO) " MILESTONE = $(MILESTONE)"
1.326 @$(ECHO) ""
1.327 - ifeq ($(BUILD_NUMBER), b00)
1.328 - @$(ECHO) "ERROR: Build number must be defined"
1.329 - @$(ECHO) "MILESTONE is set to $(MILESTONE)"
1.330 - @$(ECHO) ""
1.331 - exit 1
1.332 - endif
1.333 + ifeq ($(BUILD_NUMBER), b00)
1.334 + @$(ECHO) "ERROR: Build number must be defined"
1.335 + @$(ECHO) "MILESTONE is set to $(MILESTONE)"
1.336 + @$(ECHO) ""
1.337 + exit 1
1.338 + endif
1.339
1.340 #############################################################
1.341 #
1.342 # coredocs
1.343 #
1.344 -COREAPI_DOCTITLE = Java$(TRADEMARK) Platform, Standard Edition \
1.345 +COREAPI_DOCTITLE = Java$(TRADEMARK) Platform, Standard Edition \
1.346 $(JDK_MINOR_VERSION)<br>API Specification
1.347 -COREAPI_WINDOWTITLE = Java Platform SE $(JDK_MINOR_VERSION)
1.348 +COREAPI_WINDOWTITLE = Java Platform SE $(JDK_MINOR_VERSION)
1.349 COREAPI_HEADER = \
1.350 <strong>Java$(TRADEMARK) Platform<br>Standard Ed. $(JDK_MINOR_VERSION)</strong>
1.351
1.352 @@ -360,8 +361,8 @@
1.353 COREAPI_OVERVIEW = $(JDK_SHARE_CLASSES)/overview-core.html
1.354
1.355 # The index.html, options, and packages files
1.356 -COREAPI_INDEX_FILE = $(COREAPI_DOCSDIR)/index.html
1.357 -COREAPI_OPTIONS_FILE = $(DOCSTMPDIR)/coredocs.options
1.358 +COREAPI_INDEX_FILE = $(COREAPI_DOCSDIR)/index.html
1.359 +COREAPI_OPTIONS_FILE = $(DOCSTMPDIR)/coredocs.options
1.360 COREAPI_PACKAGES_FILE = $(DOCSTMPDIR)/coredocs.packages
1.361
1.362 coredocs: $(COREAPI_INDEX_FILE)
1.363 @@ -374,43 +375,43 @@
1.364 $(prep-javadoc)
1.365 $(call JavadocSummary,$(COREAPI_OPTIONS_FILE),$(COREAPI_PACKAGES_FILE))
1.366 $(JAVADOC_CMD) -d $(@D) \
1.367 - @$(COREAPI_OPTIONS_FILE) @$(COREAPI_PACKAGES_FILE)
1.368 + @$(COREAPI_OPTIONS_FILE) @$(COREAPI_PACKAGES_FILE)
1.369
1.370 # Create file with javadoc options in it
1.371 $(COREAPI_OPTIONS_FILE): $(COREAPI_OVERVIEW)
1.372 $(prep-target)
1.373 - @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1.374 - $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1.375 - $(call OptionPair,-encoding,ISO-8859-1) ; \
1.376 - $(call OptionPair,-tag,beaninfo:X) ; \
1.377 - $(call OptionPair,-tag,revised:X) ; \
1.378 - $(call OptionPair,-tag,since.unbundled:X) ; \
1.379 - $(call OptionPair,-tag,spec:X) ; \
1.380 - $(call OptionPair,-tag,specdefault:X) ; \
1.381 - $(call OptionPair,-tag,Note:X) ; \
1.382 - $(call OptionPair,-tag,ToDo:X) ; \
1.383 - $(call OptionPair,-tag,apiNote:a:API Note:) ; \
1.384 - $(call OptionPair,-tag,implSpec:a:Implementation Requirements:) ; \
1.385 - $(call OptionPair,-tag,implNote:a:Implementation Note:) ; \
1.386 - $(call OptionPair,-tag,param) ; \
1.387 - $(call OptionPair,-tag,return) ; \
1.388 - $(call OptionPair,-tag,throws) ; \
1.389 - $(call OptionPair,-tag,since) ; \
1.390 - $(call OptionPair,-tag,version) ; \
1.391 - $(call OptionPair,-tag,serialData) ; \
1.392 - $(call OptionPair,-tag,factory) ; \
1.393 - $(call OptionPair,-tag,see) ; \
1.394 - $(call OptionPair,-tag,$(TAG_JLS)) ; \
1.395 - $(call OptionOnly,-splitIndex) ; \
1.396 - $(call OptionPair,-overview,$(COREAPI_OVERVIEW)) ; \
1.397 - $(call OptionPair,-doctitle,$(COREAPI_DOCTITLE)) ; \
1.398 - $(call OptionPair,-windowtitle,$(COREAPI_WINDOWTITLE) $(DRAFT_WINTITLE)) ;\
1.399 - $(call OptionPair,-header,$(COREAPI_HEADER)$(DRAFT_HEADER)) ; \
1.400 - $(call OptionPair,-bottom,$(COREAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
1.401 - ) >> $@
1.402 -ifdef COREAPI_TOP_EARLYACCESS
1.403 - @$(call OptionPair,-top,$(COREAPI_TOP_EARLYACCESS)) >> $@
1.404 -endif
1.405 + @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1.406 + $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1.407 + $(call OptionPair,-encoding,ISO-8859-1) ; \
1.408 + $(call OptionPair,-tag,beaninfo:X) ; \
1.409 + $(call OptionPair,-tag,revised:X) ; \
1.410 + $(call OptionPair,-tag,since.unbundled:X) ; \
1.411 + $(call OptionPair,-tag,spec:X) ; \
1.412 + $(call OptionPair,-tag,specdefault:X) ; \
1.413 + $(call OptionPair,-tag,Note:X) ; \
1.414 + $(call OptionPair,-tag,ToDo:X) ; \
1.415 + $(call OptionPair,-tag,apiNote:a:API Note:) ; \
1.416 + $(call OptionPair,-tag,implSpec:a:Implementation Requirements:) ; \
1.417 + $(call OptionPair,-tag,implNote:a:Implementation Note:) ; \
1.418 + $(call OptionPair,-tag,param) ; \
1.419 + $(call OptionPair,-tag,return) ; \
1.420 + $(call OptionPair,-tag,throws) ; \
1.421 + $(call OptionPair,-tag,since) ; \
1.422 + $(call OptionPair,-tag,version) ; \
1.423 + $(call OptionPair,-tag,serialData) ; \
1.424 + $(call OptionPair,-tag,factory) ; \
1.425 + $(call OptionPair,-tag,see) ; \
1.426 + $(call OptionPair,-tag,$(TAG_JLS)) ; \
1.427 + $(call OptionOnly,-splitIndex) ; \
1.428 + $(call OptionPair,-overview,$(COREAPI_OVERVIEW)) ; \
1.429 + $(call OptionPair,-doctitle,$(COREAPI_DOCTITLE)) ; \
1.430 + $(call OptionPair,-windowtitle,$(COREAPI_WINDOWTITLE) $(DRAFT_WINTITLE)) ; \
1.431 + $(call OptionPair,-header,$(COREAPI_HEADER)$(DRAFT_HEADER)) ; \
1.432 + $(call OptionPair,-bottom,$(COREAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
1.433 + ) >> $@
1.434 + ifdef COREAPI_TOP_EARLYACCESS
1.435 + @$(call OptionPair,-top,$(COREAPI_TOP_EARLYACCESS)) >> $@
1.436 + endif
1.437
1.438 # Create a file with the package names in it
1.439 $(COREAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(CORE_PKGS))
1.440 @@ -424,19 +425,19 @@
1.441
1.442 ALL_OTHER_TARGETS += docletapidocs
1.443
1.444 -DOCLETAPI_DOCDIR := $(JDK_API_DOCSDIR)/javadoc/doclet
1.445 -DOCLETAPI2COREAPI := ../../$(JDKJRE2COREAPI)
1.446 -DOCLETAPI_DOCTITLE := Doclet API
1.447 -DOCLETAPI_WINDOWTITLE := Doclet API
1.448 -DOCLETAPI_HEADER := <strong>Doclet API</strong>
1.449 -DOCLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOCLETAPI_FIRST_COPYRIGHT_YEAR))
1.450 -DOCLETAPI_GROUPNAME := Packages
1.451 -DOCLETAPI_REGEXP := com.sun.javadoc
1.452 +DOCLETAPI_DOCDIR := $(JDK_API_DOCSDIR)/javadoc/doclet
1.453 +DOCLETAPI2COREAPI := ../../$(JDKJRE2COREAPI)
1.454 +DOCLETAPI_DOCTITLE := Doclet API
1.455 +DOCLETAPI_WINDOWTITLE := Doclet API
1.456 +DOCLETAPI_HEADER := <strong>Doclet API</strong>
1.457 +DOCLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOCLETAPI_FIRST_COPYRIGHT_YEAR))
1.458 +DOCLETAPI_GROUPNAME := Packages
1.459 +DOCLETAPI_REGEXP := com.sun.javadoc
1.460 # DOCLETAPI_PKGS is located in NON_CORE_PKGS.gmk
1.461
1.462 # The index.html, options, and packages files
1.463 -DOCLETAPI_INDEX_FILE = $(DOCLETAPI_DOCDIR)/index.html
1.464 -DOCLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/docletapi.options
1.465 +DOCLETAPI_INDEX_FILE = $(DOCLETAPI_DOCDIR)/index.html
1.466 +DOCLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/docletapi.options
1.467 DOCLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/docletapi.packages
1.468
1.469 docletapidocs: $(DOCLETAPI_INDEX_FILE)
1.470 @@ -449,22 +450,22 @@
1.471 $(prep-javadoc)
1.472 $(call JavadocSummary,$(DOCLETAPI_OPTIONS_FILE),$(DOCLETAPI_PACKAGES_FILE))
1.473 $(JAVADOC_CMD) -d $(@D) \
1.474 - @$(DOCLETAPI_OPTIONS_FILE) @$(DOCLETAPI_PACKAGES_FILE)
1.475 + @$(DOCLETAPI_OPTIONS_FILE) @$(DOCLETAPI_PACKAGES_FILE)
1.476
1.477 # Create file with javadoc options in it
1.478 $(DOCLETAPI_OPTIONS_FILE):
1.479 $(prep-target)
1.480 - @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1.481 - $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1.482 - $(call OptionPair,-encoding,ascii) ; \
1.483 - $(call OptionOnly,-breakiterator) ; \
1.484 - $(call OptionPair,-doctitle,$(DOCLETAPI_DOCTITLE)) ; \
1.485 - $(call OptionPair,-windowtitle,$(DOCLETAPI_WINDOWTITLE) $(DRAFT_WINTITLE));\
1.486 - $(call OptionPair,-header,$(DOCLETAPI_HEADER)$(DRAFT_HEADER)) ; \
1.487 - $(call OptionPair,-bottom,$(DOCLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
1.488 + @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1.489 + $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1.490 + $(call OptionPair,-encoding,ascii) ; \
1.491 + $(call OptionOnly,-breakiterator) ; \
1.492 + $(call OptionPair,-doctitle,$(DOCLETAPI_DOCTITLE)) ; \
1.493 + $(call OptionPair,-windowtitle,$(DOCLETAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
1.494 + $(call OptionPair,-header,$(DOCLETAPI_HEADER)$(DRAFT_HEADER)) ; \
1.495 + $(call OptionPair,-bottom,$(DOCLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
1.496 $(call OptionTrip,-group,$(DOCLETAPI_GROUPNAME),$(DOCLETAPI_REGEXP)); \
1.497 $(call OptionTrip,-linkoffline,$(DOCLETAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
1.498 - ) >> $@
1.499 + ) >> $@
1.500
1.501 # Create a file with the package names in it
1.502 $(DOCLETAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(DOCLETAPI_PKGS))
1.503 @@ -477,17 +478,17 @@
1.504 #
1.505
1.506 ALL_OTHER_TARGETS += tagletapidocs
1.507 -TAGLETAPI_DOCDIR := $(JDK_API_DOCSDIR)/javadoc/taglet
1.508 -TAGLETAPI2COREAPI := ../../$(JDKJRE2COREAPI)
1.509 -TAGLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(TAGLETAPI_FIRST_COPYRIGHT_YEAR))
1.510 +TAGLETAPI_DOCDIR := $(JDK_API_DOCSDIR)/javadoc/taglet
1.511 +TAGLETAPI2COREAPI := ../../$(JDKJRE2COREAPI)
1.512 +TAGLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(TAGLETAPI_FIRST_COPYRIGHT_YEAR))
1.513 # TAGLETAPI_FILE is located in NON_CORE_PKGS.gmk
1.514
1.515 # Temporary directory (special generation rules)
1.516 -TAGLETAPI_TEMPDIR = $(DOCSTMPDIR)/taglets_temp
1.517 +TAGLETAPI_TEMPDIR = $(DOCSTMPDIR)/taglets_temp
1.518
1.519 # The index.html, options, and packages files
1.520 -TAGLETAPI_INDEX_FILE = $(TAGLETAPI_DOCDIR)/index.html
1.521 -TAGLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/tagletapi.options
1.522 +TAGLETAPI_INDEX_FILE = $(TAGLETAPI_DOCDIR)/index.html
1.523 +TAGLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/tagletapi.options
1.524 TAGLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/tagletapi.packages
1.525
1.526 tagletapidocs: $(TAGLETAPI_INDEX_FILE)
1.527 @@ -502,7 +503,7 @@
1.528 $(MKDIR) -p $(TAGLETAPI_TEMPDIR)
1.529 $(call JavadocSummary,$(TAGLETAPI_OPTIONS_FILE),$(TAGLETAPI_PACKAGES_FILE))
1.530 $(JAVADOC_CMD) -d $(TAGLETAPI_TEMPDIR) \
1.531 - @$(TAGLETAPI_OPTIONS_FILE) @$(TAGLETAPI_PACKAGES_FILE)
1.532 + @$(TAGLETAPI_OPTIONS_FILE) @$(TAGLETAPI_PACKAGES_FILE)
1.533 cp -r $(TAGLETAPI_TEMPDIR)/com $(@D)
1.534 cp $(TAGLETAPI_TEMPDIR)/stylesheet.css $(@D)
1.535 $(RM) -r $(TAGLETAPI_TEMPDIR)
1.536 @@ -510,14 +511,14 @@
1.537 # Create file with javadoc options in it
1.538 $(TAGLETAPI_OPTIONS_FILE):
1.539 $(prep-target)
1.540 - @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1.541 - $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1.542 - $(call OptionPair,-encoding,ascii) ; \
1.543 - $(call OptionOnly,-nonavbar) ; \
1.544 - $(call OptionOnly,-noindex) ; \
1.545 - $(call OptionPair,-bottom,$(TAGLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
1.546 + @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1.547 + $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1.548 + $(call OptionPair,-encoding,ascii) ; \
1.549 + $(call OptionOnly,-nonavbar) ; \
1.550 + $(call OptionOnly,-noindex) ; \
1.551 + $(call OptionPair,-bottom,$(TAGLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
1.552 $(call OptionTrip,-linkoffline,$(TAGLETAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
1.553 - ) >> $@
1.554 + ) >> $@
1.555
1.556 # Create a file with the package names in it
1.557 $(TAGLETAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TAGLETAPI_PKGS))
1.558 @@ -531,19 +532,19 @@
1.559
1.560 ALL_OTHER_TARGETS += domapidocs
1.561
1.562 -DOMAPI_DOCDIR := $(JRE_API_DOCSDIR)/plugin/dom
1.563 -DOMAPI2COREAPI := ../../$(JDKJRE2COREAPI)
1.564 -DOMAPI_DOCTITLE := Common DOM API
1.565 -DOMAPI_WINDOWTITLE := Common DOM API
1.566 -DOMAPI_HEADER := <strong>Common DOM API</strong>
1.567 -DOMAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOMAPI_FIRST_COPYRIGHT_YEAR))
1.568 -DOMAPI_GROUPNAME := Packages
1.569 -DOMAPI_REGEXP := com.sun.java.browser.dom:org.w3c.dom*
1.570 +DOMAPI_DOCDIR := $(JRE_API_DOCSDIR)/plugin/dom
1.571 +DOMAPI2COREAPI := ../../$(JDKJRE2COREAPI)
1.572 +DOMAPI_DOCTITLE := Common DOM API
1.573 +DOMAPI_WINDOWTITLE := Common DOM API
1.574 +DOMAPI_HEADER := <strong>Common DOM API</strong>
1.575 +DOMAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOMAPI_FIRST_COPYRIGHT_YEAR))
1.576 +DOMAPI_GROUPNAME := Packages
1.577 +DOMAPI_REGEXP := com.sun.java.browser.dom:org.w3c.dom*
1.578 # DOMAPI_PKGS is located in NON_CORE_PKGS.gmk
1.579
1.580 # The index.html, options, and packages files
1.581 -DOMAPI_INDEX_FILE = $(DOMAPI_DOCDIR)/index.html
1.582 -DOMAPI_OPTIONS_FILE = $(DOCSTMPDIR)/domapi.options
1.583 +DOMAPI_INDEX_FILE = $(DOMAPI_DOCDIR)/index.html
1.584 +DOMAPI_OPTIONS_FILE = $(DOCSTMPDIR)/domapi.options
1.585 DOMAPI_PACKAGES_FILE = $(DOCSTMPDIR)/domapi.packages
1.586
1.587 domapidocs: $(DOMAPI_INDEX_FILE)
1.588 @@ -556,22 +557,22 @@
1.589 $(prep-javadoc)
1.590 $(call JavadocSummary,$(DOMAPI_OPTIONS_FILE),$(DOMAPI_PACKAGES_FILE))
1.591 $(JAVADOC_CMD) -d $(@D) \
1.592 - @$(DOMAPI_OPTIONS_FILE) @$(DOMAPI_PACKAGES_FILE)
1.593 + @$(DOMAPI_OPTIONS_FILE) @$(DOMAPI_PACKAGES_FILE)
1.594
1.595 # Create file with javadoc options in it
1.596 $(DOMAPI_OPTIONS_FILE):
1.597 $(prep-target)
1.598 - @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1.599 - $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1.600 - $(call OptionPair,-encoding,ascii) ; \
1.601 - $(call OptionOnly,-splitIndex) ; \
1.602 - $(call OptionPair,-doctitle,$(DOMAPI_DOCTITLE)) ; \
1.603 - $(call OptionPair,-windowtitle,$(DOMAPI_WINDOWTITLE) $(DRAFT_WINTITLE));\
1.604 - $(call OptionPair,-header,$(DOMAPI_HEADER)$(DRAFT_HEADER)) ; \
1.605 - $(call OptionPair,-bottom,$(DOMAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
1.606 + @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1.607 + $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1.608 + $(call OptionPair,-encoding,ascii) ; \
1.609 + $(call OptionOnly,-splitIndex) ; \
1.610 + $(call OptionPair,-doctitle,$(DOMAPI_DOCTITLE)) ; \
1.611 + $(call OptionPair,-windowtitle,$(DOMAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
1.612 + $(call OptionPair,-header,$(DOMAPI_HEADER)$(DRAFT_HEADER)) ; \
1.613 + $(call OptionPair,-bottom,$(DOMAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
1.614 $(call OptionTrip,-group,$(DOMAPI_GROUPNAME),$(DOMAPI_REGEXP)); \
1.615 $(call OptionTrip,-linkoffline,$(DOMAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
1.616 - ) >> $@
1.617 + ) >> $@
1.618
1.619 # Create a file with the package names in it
1.620 $(DOMAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(DOMAPI_PKGS))
1.621 @@ -594,18 +595,18 @@
1.622
1.623 ALL_OTHER_TARGETS += jdidocs
1.624
1.625 -JDI_DOCDIR := $(JDK_API_DOCSDIR)/jpda/jdi
1.626 -JDI2COREAPI := ../../$(JDKJRE2COREAPI)
1.627 -JDI_DOCTITLE := Java$(TRADEMARK) Debug Interface
1.628 +JDI_DOCDIR := $(JDK_API_DOCSDIR)/jpda/jdi
1.629 +JDI2COREAPI := ../../$(JDKJRE2COREAPI)
1.630 +JDI_DOCTITLE := Java$(TRADEMARK) Debug Interface
1.631 JDI_WINDOWTITLE := Java Debug Interface
1.632 -JDI_HEADER := <strong>Java Debug Interface</strong>
1.633 -JDI_BOTTOM := $(call CommonBottom,$(JDI_FIRST_COPYRIGHT_YEAR))
1.634 -JDI_OVERVIEW := $(JDK_SHARE_CLASSES)/jdi-overview.html
1.635 +JDI_HEADER := <strong>Java Debug Interface</strong>
1.636 +JDI_BOTTOM := $(call CommonBottom,$(JDI_FIRST_COPYRIGHT_YEAR))
1.637 +JDI_OVERVIEW := $(JDK_SHARE_CLASSES)/jdi-overview.html
1.638 # JDI_PKGS is located in NON_CORE_PKGS.gmk
1.639
1.640 # The index.html, options, and packages files
1.641 -JDI_INDEX_FILE = $(JDI_DOCDIR)/index.html
1.642 -JDI_OPTIONS_FILE = $(DOCSTMPDIR)/jdi.options
1.643 +JDI_INDEX_FILE = $(JDI_DOCDIR)/index.html
1.644 +JDI_OPTIONS_FILE = $(DOCSTMPDIR)/jdi.options
1.645 JDI_PACKAGES_FILE = $(DOCSTMPDIR)/jdi.packages
1.646
1.647 jdidocs: $(JDI_INDEX_FILE)
1.648 @@ -618,21 +619,21 @@
1.649 $(prep-javadoc)
1.650 $(call JavadocSummary,$(JDI_OPTIONS_FILE),$(JDI_PACKAGES_FILE))
1.651 $(JAVADOC_CMD) -d $(@D) \
1.652 - @$(JDI_OPTIONS_FILE) @$(JDI_PACKAGES_FILE)
1.653 + @$(JDI_OPTIONS_FILE) @$(JDI_PACKAGES_FILE)
1.654
1.655 # Create file with javadoc options in it
1.656 $(JDI_OPTIONS_FILE): $(JDI_OVERVIEW)
1.657 $(prep-target)
1.658 - @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1.659 - $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1.660 - $(call OptionPair,-encoding,ascii) ; \
1.661 - $(call OptionPair,-overview,$(JDI_OVERVIEW)) ; \
1.662 - $(call OptionPair,-doctitle,$(JDI_DOCTITLE)) ; \
1.663 + @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1.664 + $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1.665 + $(call OptionPair,-encoding,ascii) ; \
1.666 + $(call OptionPair,-overview,$(JDI_OVERVIEW)) ; \
1.667 + $(call OptionPair,-doctitle,$(JDI_DOCTITLE)) ; \
1.668 $(call OptionPair,-windowtitle,$(JDI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
1.669 - $(call OptionPair,-header,$(JDI_HEADER)$(DRAFT_HEADER)) ; \
1.670 - $(call OptionPair,-bottom,$(JDI_BOTTOM)$(DRAFT_BOTTOM)) ; \
1.671 + $(call OptionPair,-header,$(JDI_HEADER)$(DRAFT_HEADER)) ; \
1.672 + $(call OptionPair,-bottom,$(JDI_BOTTOM)$(DRAFT_BOTTOM)) ; \
1.673 $(call OptionTrip,-linkoffline,$(JDI2COREAPI),$(COREAPI_DOCSDIR)/); \
1.674 - ) >> $@
1.675 + ) >> $@
1.676
1.677 # Create a file with the package names in it
1.678 $(JDI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JDI_PKGS))
1.679 @@ -646,7 +647,7 @@
1.680
1.681 ALL_OTHER_TARGETS += jdwpdocs
1.682
1.683 -JDWP_DOCDIR = $(PLATFORM_DOCSDIR)/jpda/jdwp
1.684 +JDWP_DOCDIR = $(PLATFORM_DOCSDIR)/jpda/jdwp
1.685
1.686 jdwpdocs: $(JDWP_DOCDIR)/jdwp-protocol.html
1.687 $(JDWP_DOCDIR)/jdwp-protocol.html : $(JDK_OUTPUTDIR)/gensrc_jdwp_doc/jdwp-protocol.html
1.688 @@ -661,16 +662,16 @@
1.689
1.690 ALL_OTHER_TARGETS += jvmtidocs
1.691
1.692 -JVMTI_DOCDIR = $(PLATFORM_DOCSDIR)/jvmti
1.693 -JVMTI_HTML = $(HOTSPOT_DIST)/docs/platform/jvmti/jvmti.html
1.694 +JVMTI_DOCDIR = $(PLATFORM_DOCSDIR)/jvmti
1.695 +JVMTI_HTML = $(HOTSPOT_DIST)/docs/platform/jvmti/jvmti.html
1.696
1.697 -jvmtidocs: $(JVMTI_DOCDIR)/jvmti.html
1.698 +jvmtidocs: $(JVMTI_DOCDIR)/jvmti.html
1.699 $(JVMTI_DOCDIR)/jvmti.html:
1.700 @$(prep-javadoc)
1.701 - @if [ -f $(JVMTI_HTML) ] ; then \
1.702 - $(ECHO) "$(CP) $(JVMTI_HTML) $@"; \
1.703 - $(CP) $(JVMTI_HTML) $@; \
1.704 - else \
1.705 + @if [ -f $(JVMTI_HTML) ] ; then \
1.706 + $(ECHO) "$(CP) $(JVMTI_HTML) $@"; \
1.707 + $(CP) $(JVMTI_HTML) $@; \
1.708 + else \
1.709 $(ECHO) "WARNING: Generated file does not exist: $(JVMTI_HTML)"; \
1.710 fi
1.711
1.712 @@ -681,18 +682,18 @@
1.713
1.714 ALL_OTHER_TARGETS += jaasdocs
1.715
1.716 -JAAS_DOCDIR := $(JRE_API_DOCSDIR)/security/jaas/spec
1.717 -JAAS2COREAPI := ../../../$(JDKJRE2COREAPI)
1.718 -JAAS_DOCTITLE := Java$(TRADEMARK) Authentication and Authorization Service
1.719 +JAAS_DOCDIR := $(JRE_API_DOCSDIR)/security/jaas/spec
1.720 +JAAS2COREAPI := ../../../$(JDKJRE2COREAPI)
1.721 +JAAS_DOCTITLE := Java$(TRADEMARK) Authentication and Authorization Service
1.722 JAAS_WINDOWTITLE := Java Authentication and Authorization Service
1.723 -JAAS_HEADER := <strong>Java Authentication and Authorization Service</strong>
1.724 -JAAS_BOTTOM := $(call CommonBottom,$(JAAS_FIRST_COPYRIGHT_YEAR))
1.725 +JAAS_HEADER := <strong>Java Authentication and Authorization Service</strong>
1.726 +JAAS_BOTTOM := $(call CommonBottom,$(JAAS_FIRST_COPYRIGHT_YEAR))
1.727 # JAAS_PKGS is located in NON_CORE_PKGS.gmk
1.728 -JAAS_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/security/auth/jaas-overview.html
1.729 +JAAS_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/security/auth/jaas-overview.html
1.730
1.731 # The index.html, options, and packages files
1.732 -JAAS_INDEX_FILE = $(JAAS_DOCDIR)/index.html
1.733 -JAAS_OPTIONS_FILE = $(DOCSTMPDIR)/jaas.options
1.734 +JAAS_INDEX_FILE = $(JAAS_DOCDIR)/index.html
1.735 +JAAS_OPTIONS_FILE = $(DOCSTMPDIR)/jaas.options
1.736 JAAS_PACKAGES_FILE = $(DOCSTMPDIR)/jaas.packages
1.737
1.738 jaasdocs: $(JAAS_INDEX_FILE)
1.739 @@ -705,21 +706,21 @@
1.740 $(prep-javadoc)
1.741 $(call JavadocSummary,$(JAAS_OPTIONS_FILE),$(JAAS_PACKAGES_FILE))
1.742 $(JAVADOC_CMD) -d $(@D) \
1.743 - @$(JAAS_OPTIONS_FILE) @$(JAAS_PACKAGES_FILE)
1.744 + @$(JAAS_OPTIONS_FILE) @$(JAAS_PACKAGES_FILE)
1.745
1.746 # Create file with javadoc options in it
1.747 $(JAAS_OPTIONS_FILE): $(JAAS_OVERVIEW)
1.748 $(prep-target)
1.749 - @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1.750 - $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1.751 - $(call OptionPair,-encoding,ascii) ; \
1.752 - $(call OptionPair,-overview,$(JAAS_OVERVIEW)) ; \
1.753 - $(call OptionPair,-doctitle,$(JAAS_DOCTITLE)) ; \
1.754 + @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1.755 + $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1.756 + $(call OptionPair,-encoding,ascii) ; \
1.757 + $(call OptionPair,-overview,$(JAAS_OVERVIEW)) ; \
1.758 + $(call OptionPair,-doctitle,$(JAAS_DOCTITLE)) ; \
1.759 $(call OptionPair,-windowtitle,$(JAAS_WINDOWTITLE) $(DRAFT_WINTITLE)); \
1.760 - $(call OptionPair,-header,$(JAAS_HEADER)$(DRAFT_HEADER)) ; \
1.761 - $(call OptionPair,-bottom,$(JAAS_BOTTOM)$(DRAFT_BOTTOM)) ; \
1.762 + $(call OptionPair,-header,$(JAAS_HEADER)$(DRAFT_HEADER)) ; \
1.763 + $(call OptionPair,-bottom,$(JAAS_BOTTOM)$(DRAFT_BOTTOM)) ; \
1.764 $(call OptionTrip,-linkoffline,$(JAAS2COREAPI),$(COREAPI_DOCSDIR)/); \
1.765 - ) >> $@
1.766 + ) >> $@
1.767
1.768 # Create a file with the package names in it
1.769 $(JAAS_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JAAS_PKGS))
1.770 @@ -733,18 +734,18 @@
1.771
1.772 ALL_OTHER_TARGETS += jgssdocs
1.773
1.774 -JGSS_DOCDIR := $(JRE_API_DOCSDIR)/security/jgss/spec
1.775 -JGSS2COREAPI := ../../../$(JDKJRE2COREAPI)
1.776 -JGSS_DOCTITLE := Java$(TRADEMARK) GSS-API Utilities
1.777 +JGSS_DOCDIR := $(JRE_API_DOCSDIR)/security/jgss/spec
1.778 +JGSS2COREAPI := ../../../$(JDKJRE2COREAPI)
1.779 +JGSS_DOCTITLE := Java$(TRADEMARK) GSS-API Utilities
1.780 JGSS_WINDOWTITLE := Java GSS-API Utilities
1.781 -JGSS_HEADER := <strong>Java GSS-API Utilities</strong>
1.782 -JGSS_BOTTOM := $(call CommonBottom,$(JGSS_FIRST_COPYRIGHT_YEAR))
1.783 -JGSS_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/security/jgss/jgss-overview.html
1.784 +JGSS_HEADER := <strong>Java GSS-API Utilities</strong>
1.785 +JGSS_BOTTOM := $(call CommonBottom,$(JGSS_FIRST_COPYRIGHT_YEAR))
1.786 +JGSS_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/security/jgss/jgss-overview.html
1.787 # JGSS_PKGS is located in NON_CORE_PKGS.gmk
1.788
1.789 # The index.html, options, and packages files
1.790 -JGSS_INDEX_FILE = $(JGSS_DOCDIR)/index.html
1.791 -JGSS_OPTIONS_FILE = $(DOCSTMPDIR)/jgss.options
1.792 +JGSS_INDEX_FILE = $(JGSS_DOCDIR)/index.html
1.793 +JGSS_OPTIONS_FILE = $(DOCSTMPDIR)/jgss.options
1.794 JGSS_PACKAGES_FILE = $(DOCSTMPDIR)/jgss.packages
1.795
1.796 jgssdocs: $(JGSS_INDEX_FILE)
1.797 @@ -757,22 +758,22 @@
1.798 $(prep-javadoc)
1.799 $(call JavadocSummary,$(JGSS_OPTIONS_FILE),$(JGSS_PACKAGES_FILE))
1.800 $(JAVADOC_CMD) -d $(@D) \
1.801 - @$(JGSS_OPTIONS_FILE) @$(JGSS_PACKAGES_FILE)
1.802 + @$(JGSS_OPTIONS_FILE) @$(JGSS_PACKAGES_FILE)
1.803
1.804 # Create file with javadoc options in it
1.805 $(JGSS_OPTIONS_FILE): $(JGSS_OVERVIEW)
1.806 $(prep-target)
1.807 - @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1.808 - $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1.809 - $(call OptionPair,-encoding,ascii) ; \
1.810 - $(call OptionOnly,-nodeprecatedlist) ; \
1.811 - $(call OptionPair,-overview,$(JGSS_OVERVIEW)) ; \
1.812 - $(call OptionPair,-doctitle,$(JGSS_DOCTITLE)) ; \
1.813 + @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1.814 + $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1.815 + $(call OptionPair,-encoding,ascii) ; \
1.816 + $(call OptionOnly,-nodeprecatedlist) ; \
1.817 + $(call OptionPair,-overview,$(JGSS_OVERVIEW)) ; \
1.818 + $(call OptionPair,-doctitle,$(JGSS_DOCTITLE)) ; \
1.819 $(call OptionPair,-windowtitle,$(JGSS_WINDOWTITLE) $(DRAFT_WINTITLE)); \
1.820 - $(call OptionPair,-header,$(JGSS_HEADER)$(DRAFT_HEADER)) ; \
1.821 - $(call OptionPair,-bottom,$(JGSS_BOTTOM)$(DRAFT_BOTTOM)) ; \
1.822 + $(call OptionPair,-header,$(JGSS_HEADER)$(DRAFT_HEADER)) ; \
1.823 + $(call OptionPair,-bottom,$(JGSS_BOTTOM)$(DRAFT_BOTTOM)) ; \
1.824 $(call OptionTrip,-linkoffline,$(JGSS2COREAPI),$(COREAPI_DOCSDIR)/); \
1.825 - ) >> $@
1.826 + ) >> $@
1.827
1.828 # Create a file with the package names in it
1.829 $(JGSS_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JGSS_PKGS))
1.830 @@ -786,17 +787,17 @@
1.831
1.832 ALL_OTHER_TARGETS += smartcardiodocs
1.833
1.834 -SMARTCARDIO_DOCDIR := $(JRE_API_DOCSDIR)/security/smartcardio/spec
1.835 -SMARTCARDIO2COREAPI := ../../../$(JDKJRE2COREAPI)
1.836 -SMARTCARDIO_DOCTITLE := Java$(TRADEMARK) Smart Card I/O
1.837 +SMARTCARDIO_DOCDIR := $(JRE_API_DOCSDIR)/security/smartcardio/spec
1.838 +SMARTCARDIO2COREAPI := ../../../$(JDKJRE2COREAPI)
1.839 +SMARTCARDIO_DOCTITLE := Java$(TRADEMARK) Smart Card I/O
1.840 SMARTCARDIO_WINDOWTITLE := Java Smart Card I/O
1.841 -SMARTCARDIO_HEADER := <strong>Java Smart Card I/O</strong>
1.842 -SMARTCARDIO_BOTTOM := $(call CommonBottom,$(SMARTCARDIO_FIRST_COPYRIGHT_YEAR))
1.843 +SMARTCARDIO_HEADER := <strong>Java Smart Card I/O</strong>
1.844 +SMARTCARDIO_BOTTOM := $(call CommonBottom,$(SMARTCARDIO_FIRST_COPYRIGHT_YEAR))
1.845 # SMARTCARDIO_PKGS is located in NON_CORE_PKGS.gmk
1.846
1.847 # The index.html, options, and packages files
1.848 -SMARTCARDIO_INDEX_FILE = $(SMARTCARDIO_DOCDIR)/index.html
1.849 -SMARTCARDIO_OPTIONS_FILE = $(DOCSTMPDIR)/smartcardio.options
1.850 +SMARTCARDIO_INDEX_FILE = $(SMARTCARDIO_DOCDIR)/index.html
1.851 +SMARTCARDIO_OPTIONS_FILE = $(DOCSTMPDIR)/smartcardio.options
1.852 SMARTCARDIO_PACKAGES_FILE = $(DOCSTMPDIR)/smartcardio.packages
1.853
1.854 smartcardiodocs: $(SMARTCARDIO_INDEX_FILE)
1.855 @@ -809,21 +810,21 @@
1.856 $(prep-javadoc)
1.857 $(call JavadocSummary,$(SMARTCARDIO_OPTIONS_FILE),$(SMARTCARDIO_PACKAGES_FILE))
1.858 $(JAVADOC_CMD) -d $(@D) \
1.859 - @$(SMARTCARDIO_OPTIONS_FILE) @$(SMARTCARDIO_PACKAGES_FILE)
1.860 + @$(SMARTCARDIO_OPTIONS_FILE) @$(SMARTCARDIO_PACKAGES_FILE)
1.861
1.862 # Create file with javadoc options in it
1.863 $(SMARTCARDIO_OPTIONS_FILE):
1.864 $(prep-target)
1.865 - @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1.866 - $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1.867 - $(call OptionPair,-encoding,ascii) ; \
1.868 - $(call OptionOnly,-nodeprecatedlist) ; \
1.869 - $(call OptionPair,-doctitle,$(SMARTCARDIO_DOCTITLE)) ; \
1.870 - $(call OptionPair,-windowtitle,$(SMARTCARDIO_WINDOWTITLE) $(DRAFT_WINTITLE));\
1.871 + @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1.872 + $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1.873 + $(call OptionPair,-encoding,ascii) ; \
1.874 + $(call OptionOnly,-nodeprecatedlist) ; \
1.875 + $(call OptionPair,-doctitle,$(SMARTCARDIO_DOCTITLE)) ; \
1.876 + $(call OptionPair,-windowtitle,$(SMARTCARDIO_WINDOWTITLE) $(DRAFT_WINTITLE)); \
1.877 $(call OptionPair,-header,$(SMARTCARDIO_HEADER)$(DRAFT_HEADER)); \
1.878 $(call OptionPair,-bottom,$(SMARTCARDIO_BOTTOM)$(DRAFT_BOTTOM)); \
1.879 $(call OptionTrip,-linkoffline,$(SMARTCARDIO2COREAPI),$(COREAPI_DOCSDIR)/); \
1.880 - ) >> $@
1.881 + ) >> $@
1.882
1.883 # Create a file with the package names in it
1.884 $(SMARTCARDIO_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SMARTCARDIO_PKGS))
1.885 @@ -837,16 +838,16 @@
1.886
1.887 ALL_OTHER_TARGETS += httpserverdocs
1.888
1.889 -HTTPSERVER_DOCDIR := $(JRE_API_DOCSDIR)/net/httpserver/spec
1.890 -HTTPSERVER2COREAPI := ../../../$(JDKJRE2COREAPI)
1.891 -HTTPSERVER_DOCTITLE := Java$(TRADEMARK) HTTP Server
1.892 +HTTPSERVER_DOCDIR := $(JRE_API_DOCSDIR)/net/httpserver/spec
1.893 +HTTPSERVER2COREAPI := ../../../$(JDKJRE2COREAPI)
1.894 +HTTPSERVER_DOCTITLE := Java$(TRADEMARK) HTTP Server
1.895 HTTPSERVER_WINDOWTITLE := Java HTTP Server
1.896 -HTTPSERVER_HEADER := <strong>Java HTTP Server</strong>
1.897 -HTTPSERVER_BOTTOM := $(call CommonBottom,$(HTTPSERVER_FIRST_COPYRIGHT_YEAR))
1.898 +HTTPSERVER_HEADER := <strong>Java HTTP Server</strong>
1.899 +HTTPSERVER_BOTTOM := $(call CommonBottom,$(HTTPSERVER_FIRST_COPYRIGHT_YEAR))
1.900 # HTTPSERVER_PKGS is located in NON_CORE_PKGS.gmk
1.901
1.902 -HTTPSERVER_INDEX_HTML = $(HTTPSERVER_DOCDIR)/index.html
1.903 -HTTPSERVER_OPTIONS_FILE = $(DOCSTMPDIR)/httpserver.options
1.904 +HTTPSERVER_INDEX_HTML = $(HTTPSERVER_DOCDIR)/index.html
1.905 +HTTPSERVER_OPTIONS_FILE = $(DOCSTMPDIR)/httpserver.options
1.906 HTTPSERVER_PACKAGES_FILE = $(DOCSTMPDIR)/httpserver.packages
1.907
1.908 httpserverdocs: $(HTTPSERVER_INDEX_HTML)
1.909 @@ -859,21 +860,21 @@
1.910 $(prep-javadoc)
1.911 $(call JavadocSummary,$(HTTPSERVER_OPTIONS_FILE),$(HTTPSERVER_PACKAGES_FILE))
1.912 $(JAVADOC_CMD) -d $(@D) \
1.913 - @$(HTTPSERVER_OPTIONS_FILE) @$(HTTPSERVER_PACKAGES_FILE)
1.914 + @$(HTTPSERVER_OPTIONS_FILE) @$(HTTPSERVER_PACKAGES_FILE)
1.915
1.916 # Create file with javadoc options in it
1.917 $(HTTPSERVER_OPTIONS_FILE):
1.918 $(prep-target)
1.919 - @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1.920 - $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1.921 - $(call OptionPair,-encoding,ascii) ; \
1.922 - $(call OptionOnly,-nodeprecatedlist) ; \
1.923 - $(call OptionPair,-doctitle,$(HTTPSERVER_DOCTITLE)) ; \
1.924 - $(call OptionPair,-windowtitle,$(HTTPSERVER_WINDOWTITLE) $(DRAFT_WINTITLE));\
1.925 + @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1.926 + $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1.927 + $(call OptionPair,-encoding,ascii) ; \
1.928 + $(call OptionOnly,-nodeprecatedlist) ; \
1.929 + $(call OptionPair,-doctitle,$(HTTPSERVER_DOCTITLE)) ; \
1.930 + $(call OptionPair,-windowtitle,$(HTTPSERVER_WINDOWTITLE) $(DRAFT_WINTITLE)); \
1.931 $(call OptionPair,-header,$(HTTPSERVER_HEADER)$(DRAFT_HEADER)); \
1.932 $(call OptionPair,-bottom,$(HTTPSERVER_BOTTOM)$(DRAFT_BOTTOM)); \
1.933 $(call OptionTrip,-linkoffline,$(HTTPSERVER2COREAPI),$(COREAPI_DOCSDIR)/); \
1.934 - ) >> $@
1.935 + ) >> $@
1.936
1.937 # Create a file with the package names in it
1.938 $(HTTPSERVER_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(HTTPSERVER_PKGS))
1.939 @@ -887,20 +888,20 @@
1.940
1.941 ALL_OTHER_TARGETS += mgmtdocs
1.942
1.943 -MGMT_DOCDIR := $(JRE_API_DOCSDIR)/management/extension
1.944 -MGMT2COREAPI := ../../$(JDKJRE2COREAPI)
1.945 -JVM_MIB_NAME := JVM-MANAGEMENT-MIB.mib
1.946 -JVM_MIB_SRC := $(JDK_TOPDIR)/src/closed/share/classes/sun/management/snmp/$(JVM_MIB_NAME)
1.947 -MGMT_DOCTITLE := Monitoring and Management Interface for the Java$(TRADEMARK) Platform
1.948 +MGMT_DOCDIR := $(JRE_API_DOCSDIR)/management/extension
1.949 +MGMT2COREAPI := ../../$(JDKJRE2COREAPI)
1.950 +JVM_MIB_NAME := JVM-MANAGEMENT-MIB.mib
1.951 +JVM_MIB_SRC := $(JDK_TOPDIR)/src/closed/share/classes/sun/management/snmp/$(JVM_MIB_NAME)
1.952 +MGMT_DOCTITLE := Monitoring and Management Interface for the Java$(TRADEMARK) Platform
1.953 MGMT_WINDOWTITLE := Monitoring and Management Interface for the Java Platform
1.954 -MGMT_HEADER := <strong>Monitoring and Management Interface for the Java Platform</strong>
1.955 -MGMT_BOTTOM := $(call CommonBottom,$(MGMT_FIRST_COPYRIGHT_YEAR))
1.956 -MGMT_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/management/mgmt-overview.html
1.957 +MGMT_HEADER := <strong>Monitoring and Management Interface for the Java Platform</strong>
1.958 +MGMT_BOTTOM := $(call CommonBottom,$(MGMT_FIRST_COPYRIGHT_YEAR))
1.959 +MGMT_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/management/mgmt-overview.html
1.960 # MGMT_PKGS is located in NON_CORE_PKGS.gmk
1.961
1.962 # The index.html, options, and packages files
1.963 -MGMT_INDEX_FILE = $(MGMT_DOCDIR)/index.html
1.964 -MGMT_OPTIONS_FILE = $(DOCSTMPDIR)/mgmt.options
1.965 +MGMT_INDEX_FILE = $(MGMT_DOCDIR)/index.html
1.966 +MGMT_OPTIONS_FILE = $(DOCSTMPDIR)/mgmt.options
1.967 MGMT_PACKAGES_FILE = $(DOCSTMPDIR)/mgmt.packages
1.968
1.969 mgmtdocs: $(MGMT_INDEX_FILE)
1.970 @@ -911,30 +912,30 @@
1.971 # Run javadoc if the index file is out of date or missing
1.972 $(MGMT_INDEX_FILE): $(MGMT_OPTIONS_FILE) $(MGMT_PACKAGES_FILE) coredocs
1.973 $(prep-javadoc)
1.974 - @if [ -f $(JVM_MIB_SRC) ] ; then \
1.975 - $(ECHO) "$(CP) $(JVM_MIB_SRC) $(@D)/.."; \
1.976 - $(CP) $(JVM_MIB_SRC) $(@D)/.. ; \
1.977 - else \
1.978 - $(ECHO) "WARNING: File $(JVM_MIB_NAME) not available."; \
1.979 + @if [ -f $(JVM_MIB_SRC) ] ; then \
1.980 + $(ECHO) "$(CP) $(JVM_MIB_SRC) $(@D)/.."; \
1.981 + $(CP) $(JVM_MIB_SRC) $(@D)/.. ; \
1.982 + else \
1.983 + $(ECHO) "WARNING: File $(JVM_MIB_NAME) not available."; \
1.984 fi
1.985 $(call JavadocSummary,$(MGMT_OPTIONS_FILE),$(MGMT_PACKAGES_FILE))
1.986 $(JAVADOC_CMD) -d $(@D) \
1.987 - @$(MGMT_OPTIONS_FILE) @$(MGMT_PACKAGES_FILE)
1.988 + @$(MGMT_OPTIONS_FILE) @$(MGMT_PACKAGES_FILE)
1.989
1.990 # Create file with javadoc options in it
1.991 $(MGMT_OPTIONS_FILE): $(MGMT_OVERVIEW)
1.992 $(prep-target)
1.993 - @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1.994 - $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1.995 - $(call OptionPair,-encoding,ascii) ; \
1.996 - $(call OptionOnly,-nodeprecatedlist) ; \
1.997 - $(call OptionPair,-overview,$(MGMT_OVERVIEW)) ; \
1.998 - $(call OptionPair,-doctitle,$(MGMT_DOCTITLE)) ; \
1.999 + @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1.1000 + $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1.1001 + $(call OptionPair,-encoding,ascii) ; \
1.1002 + $(call OptionOnly,-nodeprecatedlist) ; \
1.1003 + $(call OptionPair,-overview,$(MGMT_OVERVIEW)) ; \
1.1004 + $(call OptionPair,-doctitle,$(MGMT_DOCTITLE)) ; \
1.1005 $(call OptionPair,-windowtitle,$(MGMT_WINDOWTITLE) $(DRAFT_WINTITLE)); \
1.1006 - $(call OptionPair,-header,$(MGMT_HEADER)$(DRAFT_HEADER)) ; \
1.1007 - $(call OptionPair,-bottom,$(MGMT_BOTTOM)$(DRAFT_BOTTOM)) ; \
1.1008 + $(call OptionPair,-header,$(MGMT_HEADER)$(DRAFT_HEADER)) ; \
1.1009 + $(call OptionPair,-bottom,$(MGMT_BOTTOM)$(DRAFT_BOTTOM)) ; \
1.1010 $(call OptionTrip,-linkoffline,$(MGMT2COREAPI),$(COREAPI_DOCSDIR)/); \
1.1011 - ) >> $@
1.1012 + ) >> $@
1.1013
1.1014 # Create a file with the package names in it
1.1015 $(MGMT_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(MGMT_PKGS))
1.1016 @@ -948,16 +949,16 @@
1.1017
1.1018 ALL_OTHER_TARGETS += attachdocs
1.1019
1.1020 -ATTACH_DOCDIR := $(JDK_API_DOCSDIR)/attach/spec
1.1021 -ATTACH2COREAPI := ../../$(JDKJRE2COREAPI)
1.1022 -ATTACH_DOCTITLE := Attach API
1.1023 +ATTACH_DOCDIR := $(JDK_API_DOCSDIR)/attach/spec
1.1024 +ATTACH2COREAPI := ../../$(JDKJRE2COREAPI)
1.1025 +ATTACH_DOCTITLE := Attach API
1.1026 ATTACH_WINDOWTITLE := Attach API
1.1027 -ATTACH_HEADER := <strong>Attach API</strong>
1.1028 -ATTACH_BOTTOM := $(call CommonBottom,$(ATTACH_FIRST_COPYRIGHT_YEAR))
1.1029 +ATTACH_HEADER := <strong>Attach API</strong>
1.1030 +ATTACH_BOTTOM := $(call CommonBottom,$(ATTACH_FIRST_COPYRIGHT_YEAR))
1.1031 # ATTACH_PKGS is located in NON_CORE_PKGS.gmk
1.1032
1.1033 -ATTACH_INDEX_HTML = $(ATTACH_DOCDIR)/index.html
1.1034 -ATTACH_OPTIONS_FILE = $(DOCSTMPDIR)/attach.options
1.1035 +ATTACH_INDEX_HTML = $(ATTACH_DOCDIR)/index.html
1.1036 +ATTACH_OPTIONS_FILE = $(DOCSTMPDIR)/attach.options
1.1037 ATTACH_PACKAGES_FILE = $(DOCSTMPDIR)/attach.packages
1.1038
1.1039 attachdocs: $(ATTACH_INDEX_HTML)
1.1040 @@ -970,21 +971,21 @@
1.1041 $(prep-javadoc)
1.1042 $(call JavadocSummary,$(ATTACH_OPTIONS_FILE),$(ATTACH_PACKAGES_FILE))
1.1043 $(JAVADOC_CMD) -d $(@D) \
1.1044 - @$(ATTACH_OPTIONS_FILE) @$(ATTACH_PACKAGES_FILE)
1.1045 + @$(ATTACH_OPTIONS_FILE) @$(ATTACH_PACKAGES_FILE)
1.1046
1.1047 # Create file with javadoc options in it
1.1048 $(ATTACH_OPTIONS_FILE):
1.1049 $(prep-target)
1.1050 - @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1.1051 - $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1.1052 - $(call OptionPair,-encoding,ascii) ; \
1.1053 - $(call OptionOnly,-nodeprecatedlist) ; \
1.1054 - $(call OptionPair,-doctitle,$(ATTACH_DOCTITLE)) ; \
1.1055 - $(call OptionPair,-windowtitle,$(ATTACH_WINDOWTITLE) $(DRAFT_WINTITLE));\
1.1056 - $(call OptionPair,-header,$(ATTACH_HEADER)$(DRAFT_HEADER)) ; \
1.1057 - $(call OptionPair,-bottom,$(ATTACH_BOTTOM)$(DRAFT_BOTTOM)) ; \
1.1058 + @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1.1059 + $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1.1060 + $(call OptionPair,-encoding,ascii) ; \
1.1061 + $(call OptionOnly,-nodeprecatedlist) ; \
1.1062 + $(call OptionPair,-doctitle,$(ATTACH_DOCTITLE)) ; \
1.1063 + $(call OptionPair,-windowtitle,$(ATTACH_WINDOWTITLE) $(DRAFT_WINTITLE)); \
1.1064 + $(call OptionPair,-header,$(ATTACH_HEADER)$(DRAFT_HEADER)) ; \
1.1065 + $(call OptionPair,-bottom,$(ATTACH_BOTTOM)$(DRAFT_BOTTOM)) ; \
1.1066 $(call OptionTrip,-linkoffline,$(ATTACH2COREAPI),$(COREAPI_DOCSDIR)/); \
1.1067 - ) >> $@
1.1068 + ) >> $@
1.1069
1.1070 # Create a file with the package names in it
1.1071 $(ATTACH_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(ATTACH_PKGS))
1.1072 @@ -998,16 +999,16 @@
1.1073
1.1074 ALL_OTHER_TARGETS += jconsoledocs
1.1075
1.1076 -JCONSOLE_DOCDIR := $(JDK_API_DOCSDIR)/jconsole/spec
1.1077 -JCONSOLE2COREAPI := ../../$(JDKJRE2COREAPI)
1.1078 -JCONSOLE_DOCTITLE := JConsole API
1.1079 +JCONSOLE_DOCDIR := $(JDK_API_DOCSDIR)/jconsole/spec
1.1080 +JCONSOLE2COREAPI := ../../$(JDKJRE2COREAPI)
1.1081 +JCONSOLE_DOCTITLE := JConsole API
1.1082 JCONSOLE_WINDOWTITLE := JConsole API
1.1083 -JCONSOLE_HEADER := <strong>JConsole API</strong>
1.1084 -JCONSOLE_BOTTOM := $(call CommonBottom,$(JCONSOLE_FIRST_COPYRIGHT_YEAR))
1.1085 +JCONSOLE_HEADER := <strong>JConsole API</strong>
1.1086 +JCONSOLE_BOTTOM := $(call CommonBottom,$(JCONSOLE_FIRST_COPYRIGHT_YEAR))
1.1087 # JCONSOLE_PKGS is located in NON_CORE_PKGS.gmk
1.1088
1.1089 -JCONSOLE_INDEX_HTML = $(JCONSOLE_DOCDIR)/index.html
1.1090 -JCONSOLE_OPTIONS_FILE = $(DOCSTMPDIR)/jconsole.options
1.1091 +JCONSOLE_INDEX_HTML = $(JCONSOLE_DOCDIR)/index.html
1.1092 +JCONSOLE_OPTIONS_FILE = $(DOCSTMPDIR)/jconsole.options
1.1093 JCONSOLE_PACKAGES_FILE = $(DOCSTMPDIR)/jconsole.packages
1.1094
1.1095 jconsoledocs: $(JCONSOLE_INDEX_HTML)
1.1096 @@ -1020,21 +1021,21 @@
1.1097 $(prep-javadoc)
1.1098 $(call JavadocSummary,$(JCONSOLE_OPTIONS_FILE),$(JCONSOLE_PACKAGES_FILE))
1.1099 $(JAVADOC_CMD) -d $(@D) \
1.1100 - @$(JCONSOLE_OPTIONS_FILE) @$(JCONSOLE_PACKAGES_FILE)
1.1101 + @$(JCONSOLE_OPTIONS_FILE) @$(JCONSOLE_PACKAGES_FILE)
1.1102
1.1103 # Create file with javadoc options in it
1.1104 $(JCONSOLE_OPTIONS_FILE):
1.1105 $(prep-target)
1.1106 - @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1.1107 - $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1.1108 - $(call OptionPair,-encoding,ascii) ; \
1.1109 - $(call OptionOnly,-nodeprecatedlist) ; \
1.1110 - $(call OptionPair,-doctitle,$(JCONSOLE_DOCTITLE)) ; \
1.1111 - $(call OptionPair,-windowtitle,$(JCONSOLE_WINDOWTITLE) $(DRAFT_WINTITLE));\
1.1112 - $(call OptionPair,-header,$(JCONSOLE_HEADER)$(DRAFT_HEADER)) ; \
1.1113 - $(call OptionPair,-bottom,$(JCONSOLE_BOTTOM)$(DRAFT_BOTTOM)) ; \
1.1114 + @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1.1115 + $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1.1116 + $(call OptionPair,-encoding,ascii) ; \
1.1117 + $(call OptionOnly,-nodeprecatedlist) ; \
1.1118 + $(call OptionPair,-doctitle,$(JCONSOLE_DOCTITLE)) ; \
1.1119 + $(call OptionPair,-windowtitle,$(JCONSOLE_WINDOWTITLE) $(DRAFT_WINTITLE)); \
1.1120 + $(call OptionPair,-header,$(JCONSOLE_HEADER)$(DRAFT_HEADER)) ; \
1.1121 + $(call OptionPair,-bottom,$(JCONSOLE_BOTTOM)$(DRAFT_BOTTOM)) ; \
1.1122 $(call OptionTrip,-linkoffline,$(JCONSOLE2COREAPI),$(COREAPI_DOCSDIR)/); \
1.1123 - ) >> $@
1.1124 + ) >> $@
1.1125
1.1126 # Create a file with the package names in it
1.1127 $(JCONSOLE_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JCONSOLE_PKGS))
1.1128 @@ -1048,18 +1049,18 @@
1.1129
1.1130 ALL_OTHER_TARGETS += treeapidocs
1.1131
1.1132 -TREEAPI_DOCDIR := $(JDK_API_DOCSDIR)/javac/tree
1.1133 -TREEAPI2COREAPI := ../../$(JDKJRE2COREAPI)
1.1134 -TREEAPI_DOCTITLE := Compiler Tree API
1.1135 -TREEAPI_WINDOWTITLE := Compiler Tree API
1.1136 -TREEAPI_HEADER := <strong>Compiler Tree API</strong>
1.1137 -TREEAPI_BOTTOM := $(call CommonBottom,$(TREEAPI_FIRST_COPYRIGHT_YEAR))
1.1138 -TREEAPI_GROUPNAME := Packages
1.1139 -TREEAPI_REGEXP := com.sun.source.*
1.1140 +TREEAPI_DOCDIR := $(JDK_API_DOCSDIR)/javac/tree
1.1141 +TREEAPI2COREAPI := ../../$(JDKJRE2COREAPI)
1.1142 +TREEAPI_DOCTITLE := Compiler Tree API
1.1143 +TREEAPI_WINDOWTITLE := Compiler Tree API
1.1144 +TREEAPI_HEADER := <strong>Compiler Tree API</strong>
1.1145 +TREEAPI_BOTTOM := $(call CommonBottom,$(TREEAPI_FIRST_COPYRIGHT_YEAR))
1.1146 +TREEAPI_GROUPNAME := Packages
1.1147 +TREEAPI_REGEXP := com.sun.source.*
1.1148 # TREEAPI_PKGS is located in NON_CORE_PKGS.gmk
1.1149
1.1150 -TREEAPI_INDEX_HTML = $(TREEAPI_DOCDIR)/index.html
1.1151 -TREEAPI_OPTIONS_FILE = $(DOCSTMPDIR)/treeapi.options
1.1152 +TREEAPI_INDEX_HTML = $(TREEAPI_DOCDIR)/index.html
1.1153 +TREEAPI_OPTIONS_FILE = $(DOCSTMPDIR)/treeapi.options
1.1154 TREEAPI_PACKAGES_FILE = $(DOCSTMPDIR)/treeapi.packages
1.1155
1.1156 treeapidocs: $(TREEAPI_INDEX_HTML)
1.1157 @@ -1072,22 +1073,22 @@
1.1158 $(prep-javadoc)
1.1159 $(call JavadocSummary,$(TREEAPI_OPTIONS_FILE),$(TREEAPI_PACKAGES_FILE))
1.1160 $(JAVADOC_CMD) -d $(@D) \
1.1161 - @$(TREEAPI_OPTIONS_FILE) @$(TREEAPI_PACKAGES_FILE)
1.1162 + @$(TREEAPI_OPTIONS_FILE) @$(TREEAPI_PACKAGES_FILE)
1.1163
1.1164 # Create file with javadoc options in it
1.1165 $(TREEAPI_OPTIONS_FILE):
1.1166 $(prep-target)
1.1167 - @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1.1168 - $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1.1169 - $(call OptionPair,-encoding,ascii) ; \
1.1170 - $(call OptionPair,-doctitle,$(TREEAPI_DOCTITLE)) ; \
1.1171 - $(call OptionPair,-windowtitle,$(TREEAPI_WINDOWTITLE) $(DRAFT_WINTITLE));\
1.1172 - $(call OptionPair,-header,$(TREEAPI_HEADER)$(DRAFT_HEADER)) ; \
1.1173 - $(call OptionPair,-tag,$(TAG_JLS)) ; \
1.1174 - $(call OptionPair,-bottom,$(TREEAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
1.1175 + @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1.1176 + $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1.1177 + $(call OptionPair,-encoding,ascii) ; \
1.1178 + $(call OptionPair,-doctitle,$(TREEAPI_DOCTITLE)) ; \
1.1179 + $(call OptionPair,-windowtitle,$(TREEAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
1.1180 + $(call OptionPair,-header,$(TREEAPI_HEADER)$(DRAFT_HEADER)) ; \
1.1181 + $(call OptionPair,-tag,$(TAG_JLS)) ; \
1.1182 + $(call OptionPair,-bottom,$(TREEAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
1.1183 $(call OptionTrip,-group,$(TREEAPI_GROUPNAME),$(TREEAPI_REGEXP)); \
1.1184 $(call OptionTrip,-linkoffline,$(TREEAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
1.1185 - ) >> $@
1.1186 + ) >> $@
1.1187
1.1188 # Create a file with the package names in it
1.1189 $(TREEAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TREEAPI_PKGS))
1.1190 @@ -1101,16 +1102,16 @@
1.1191
1.1192 ALL_OTHER_TARGETS += sctpdocs
1.1193
1.1194 -SCTPAPI_DOCDIR := $(JRE_API_DOCSDIR)/nio/sctp/spec
1.1195 -SCTPAPI2COREAPI := ../../../$(JDKJRE2COREAPI)
1.1196 -SCTPAPI_DOCTITLE := SCTP API
1.1197 +SCTPAPI_DOCDIR := $(JRE_API_DOCSDIR)/nio/sctp/spec
1.1198 +SCTPAPI2COREAPI := ../../../$(JDKJRE2COREAPI)
1.1199 +SCTPAPI_DOCTITLE := SCTP API
1.1200 SCTPAPI_WINDOWTITLE := SCTP API
1.1201 -SCTPAPI_HEADER := <strong>SCTP API</strong>
1.1202 -SCTPAPI_BOTTOM := $(call CommonBottom,$(SCTPAPI_FIRST_COPYRIGHT_YEAR))
1.1203 +SCTPAPI_HEADER := <strong>SCTP API</strong>
1.1204 +SCTPAPI_BOTTOM := $(call CommonBottom,$(SCTPAPI_FIRST_COPYRIGHT_YEAR))
1.1205 # SCTPAPI_PKGS is located in NON_CORE_PKGS.gmk
1.1206
1.1207 -SCTPAPI_INDEX_HTML = $(SCTPAPI_DOCDIR)/index.html
1.1208 -SCTPAPI_OPTIONS_FILE = $(DOCSTMPDIR)/sctp.options
1.1209 +SCTPAPI_INDEX_HTML = $(SCTPAPI_DOCDIR)/index.html
1.1210 +SCTPAPI_OPTIONS_FILE = $(DOCSTMPDIR)/sctp.options
1.1211 SCTPAPI_PACKAGES_FILE = $(DOCSTMPDIR)/sctp.packages
1.1212
1.1213 sctpdocs: $(SCTPAPI_INDEX_HTML)
1.1214 @@ -1123,21 +1124,21 @@
1.1215 $(prep-javadoc)
1.1216 $(call JavadocSummary,$(SCTPAPI_OPTIONS_FILE),$(SCTPAPI_PACKAGES_FILE))
1.1217 $(JAVADOC_CMD) -d $(@D) \
1.1218 - @$(SCTPAPI_OPTIONS_FILE) @$(SCTPAPI_PACKAGES_FILE)
1.1219 + @$(SCTPAPI_OPTIONS_FILE) @$(SCTPAPI_PACKAGES_FILE)
1.1220
1.1221 # Create file with javadoc options in it
1.1222 $(SCTPAPI_OPTIONS_FILE):
1.1223 $(prep-target)
1.1224 - @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1.1225 - $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1.1226 - $(call OptionPair,-encoding,ascii) ; \
1.1227 - $(call OptionOnly,-nodeprecatedlist) ; \
1.1228 - $(call OptionPair,-doctitle,$(SCTPAPI_DOCTITLE)) ; \
1.1229 - $(call OptionPair,-windowtitle,$(SCTPAPI_WINDOWTITLE) $(DRAFT_WINTITLE));\
1.1230 - $(call OptionPair,-header,$(SCTPAPI_HEADER)$(DRAFT_HEADER)) ; \
1.1231 - $(call OptionPair,-bottom,$(SCTPAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
1.1232 + @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1.1233 + $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1.1234 + $(call OptionPair,-encoding,ascii) ; \
1.1235 + $(call OptionOnly,-nodeprecatedlist) ; \
1.1236 + $(call OptionPair,-doctitle,$(SCTPAPI_DOCTITLE)) ; \
1.1237 + $(call OptionPair,-windowtitle,$(SCTPAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
1.1238 + $(call OptionPair,-header,$(SCTPAPI_HEADER)$(DRAFT_HEADER)) ; \
1.1239 + $(call OptionPair,-bottom,$(SCTPAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
1.1240 $(call OptionTrip,-linkoffline,$(SCTPAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
1.1241 - ) >> $@
1.1242 + ) >> $@
1.1243
1.1244 # Create a file with the package names in it
1.1245 $(SCTPAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SCTPAPI_PKGS))
1.1246 @@ -1150,9 +1151,9 @@
1.1247
1.1248 $(DIRECTORY_CACHE): $(ALL_EXISTING_SOURCE_DIRS)
1.1249 $(prep-target)
1.1250 - @for cp in $(ALL_EXISTING_SOURCE_DIRS) ; do \
1.1251 - $(ECHO) "$(FIND) $${cp} -type f >> $@"; \
1.1252 - $(FIND) $${cp} -type f >> $@; \
1.1253 + @for cp in $(ALL_EXISTING_SOURCE_DIRS) ; do \
1.1254 + $(ECHO) "$(FIND) $${cp} -type f >> $@"; \
1.1255 + $(FIND) $${cp} -type f >> $@; \
1.1256 done
1.1257
1.1258 #############################################################
1.1259 @@ -1177,11 +1178,11 @@
1.1260 # is set properly, and to help identify values we can use instead of making new ones.
1.1261 # (Most of them come from common/shared/Defs.gmk)
1.1262 #
1.1263 -# Notes:
1.1264 -# * BUILD_NUMBER defaults to b00 if not set on command line with BUILD_NUMBER=<value>
1.1265 -# * MILESTONE defaults to internal unless set to beta, rc, or fcs on command line
1.1266 +# Notes:
1.1267 +# * BUILD_NUMBER defaults to b00 if not set on command line with BUILD_NUMBER=<value>
1.1268 +# * MILESTONE defaults to internal unless set to beta, rc, or fcs on command line
1.1269 #
1.1270
1.1271 #############################################################
1.1272 .PHONY: all docs coredocs rel-docs otherdocs rel-coredocs \
1.1273 - sanitycheckcoredocs $(ALL_OTHER_TARGETS)
1.1274 + sanitycheckcoredocs $(ALL_OTHER_TARGETS)
