Mercurial > jdk8-mips64-public / file comparison

comparison: common/makefiles/javadoc/Javadoc.gmk

common/makefiles/javadoc/Javadoc.gmk

changeset 841
547316ea137d
parent 817
6b8f5030e5ad
parent 839
174a54ce39c4
equal deleted inserted replaced
837:7deff16cf438 841:547316ea137d
45 HOTSPOT_DOCS_IMPORT_PATH=$(HOTSPOT_OUTPUTDIR)/docs 45 HOTSPOT_DOCS_IMPORT_PATH=$(HOTSPOT_OUTPUTDIR)/docs
46 46
47 BUILD_NUMBER=$(JDK_BUILD_NUMBER) 47 BUILD_NUMBER=$(JDK_BUILD_NUMBER)
48 48
49 JAVADOC_CMD = $(JAVA) \ 49 JAVADOC_CMD = $(JAVA) \
50 -Xmx1024m \ 50 -Xmx1024m \
51 -Djava.awt.headless=true \ 51 -Djava.awt.headless=true \
52 $(NEW_JAVADOC) \ 52 $(NEW_JAVADOC) \
53 -bootclasspath $(JDK_OUTPUTDIR)/classes 53 -bootclasspath $(JDK_OUTPUTDIR)/classes
54 54
55 # Copyright year for beginning of Java and some of the apis 55 # Copyright year for beginning of Java and some of the apis
56 # (Needed when creating the javadocs) 56 # (Needed when creating the javadocs)
57 FIRST_COPYRIGHT_YEAR = 1993 57 FIRST_COPYRIGHT_YEAR = 1993
58 DOMAPI_FIRST_COPYRIGHT_YEAR = 2005 58 DOMAPI_FIRST_COPYRIGHT_YEAR = 2005
59 MIRROR_FIRST_COPYRIGHT_YEAR = 2004 59 MIRROR_FIRST_COPYRIGHT_YEAR = 2004
60 DOCLETAPI_FIRST_COPYRIGHT_YEAR = 1993 60 DOCLETAPI_FIRST_COPYRIGHT_YEAR = 1993
61 TAGLETAPI_FIRST_COPYRIGHT_YEAR = 1993 61 TAGLETAPI_FIRST_COPYRIGHT_YEAR = 1993
62 JDI_FIRST_COPYRIGHT_YEAR = 1999 62 JDI_FIRST_COPYRIGHT_YEAR = 1999
63 JAAS_FIRST_COPYRIGHT_YEAR = 1998 63 JAAS_FIRST_COPYRIGHT_YEAR = 1998
64 JGSS_FIRST_COPYRIGHT_YEAR = 2000 64 JGSS_FIRST_COPYRIGHT_YEAR = 2000
65 SMARTCARDIO_FIRST_COPYRIGHT_YEAR = 2005 65 SMARTCARDIO_FIRST_COPYRIGHT_YEAR = 2005
66 HTTPSERVER_FIRST_COPYRIGHT_YEAR = 2005 66 HTTPSERVER_FIRST_COPYRIGHT_YEAR = 2005
67 MGMT_FIRST_COPYRIGHT_YEAR = 2003 67 MGMT_FIRST_COPYRIGHT_YEAR = 2003
68 ATTACH_FIRST_COPYRIGHT_YEAR = 2005 68 ATTACH_FIRST_COPYRIGHT_YEAR = 2005
69 JCONSOLE_FIRST_COPYRIGHT_YEAR = 2006 69 JCONSOLE_FIRST_COPYRIGHT_YEAR = 2006
70 SCTPAPI_FIRST_COPYRIGHT_YEAR = 2009 70 SCTPAPI_FIRST_COPYRIGHT_YEAR = 2009
71 TRACING_FIRST_COPYRIGHT_YEAR = 2008 71 TRACING_FIRST_COPYRIGHT_YEAR = 2008
72 TREEAPI_FIRST_COPYRIGHT_YEAR = 2005 72 TREEAPI_FIRST_COPYRIGHT_YEAR = 2005
73 JNLP_FIRST_COPYRIGHT_YEAR = 1998 73 JNLP_FIRST_COPYRIGHT_YEAR = 1998
74 PLUGIN2_FIRST_COPYRIGHT_YEAR = 2007 74 PLUGIN2_FIRST_COPYRIGHT_YEAR = 2007
75 75
76 # Oracle name 76 # Oracle name
77 FULL_COMPANY_NAME = Oracle and/or its affiliates 77 FULL_COMPANY_NAME = Oracle and/or its affiliates
78 78
79 # Copyright address 79 # Copyright address
81 81
82 # The trademark symbol 82 # The trademark symbol
83 TRADEMARK = ™ 83 TRADEMARK = ™
84 84
85 # Common copyright lines used 85 # Common copyright lines used
86 # The word "Copyright" might optionally be a link to the file cpyr.html. 86 # The word "Copyright" might optionally be a link to the file cpyr.html.
87 # The first year of copyright may vary or not be available. 87 # The first year of copyright may vary or not be available.
88 # The address to the company might be optional. 88 # The address to the company might be optional.
89 COMMA:= , 89 COMMA:= ,
90 EMPTY:= 90 EMPTY:=
91 SPACE:=$(EMPTY) $(EMPTY) 91 SPACE:=$(EMPTY) $(EMPTY)
92 COPYRIGHT_SYMBOL = &\#x00a9; 92 COPYRIGHT_SYMBOL = &\#x00a9;
93 # Macro to construct the copyright line 93 # Macro to construct the copyright line
94 # (The GNU make 3.78.1 "if" conditional is broken, fixed in GNU make 3.81) 94 # (The GNU make 3.78.1 "if" conditional is broken, fixed in GNU make 3.81)
95 define CopyrightLine # optionalurl optionalfirstyear optionaladdress 95 define CopyrightLine # optionalurl optionalfirstyear optionaladdress
96 $(if $(strip $1),<a href="$(strip $1)">Copyright</a>,Copyright) \ 96 $(if $(strip $1),<a href="$(strip $1)">Copyright</a>,Copyright) \
97 $(COPYRIGHT_SYMBOL) $(if $2,$2${COMMA},) $(COPYRIGHT_YEAR),\ 97 $(COPYRIGHT_SYMBOL) $(if $2,$2${COMMA},) $(COPYRIGHT_YEAR),\
98 $(FULL_COMPANY_NAME). $3 All rights reserved. 98 $(FULL_COMPANY_NAME). $3 All rights reserved.
99 endef 99 endef
112 112
113 # Common line for how to submit a bug or rfe 113 # Common line for how to submit a bug or rfe
114 BUG_SUBMIT_LINE = <a href="$(BUG_SUBMIT_URL)">Submit a bug or feature</a> 114 BUG_SUBMIT_LINE = <a href="$(BUG_SUBMIT_URL)">Submit a bug or feature</a>
115 115
116 # Url to devdocs page 116 # Url to devdocs page
117 # Was: http://java.sun.com/javase/6/webnotes/devdocs-vs-specs.html 117 # Was: http://java.sun.com/javase/6/webnotes/devdocs-vs-specs.html
118 DEV_DOCS_URL-7 = http://download.oracle.com/javase/7/docs/index.html 118 DEV_DOCS_URL-7 = http://download.oracle.com/javase/7/docs/index.html
119 DEV_DOCS_URL-8 = http://download.oracle.com/javase/8/docs/index.html 119 DEV_DOCS_URL-8 = http://download.oracle.com/javase/8/docs/index.html
120 DEV_DOCS_URL = $(DEV_DOCS_URL-$(JDK_MINOR_VERSION)) 120 DEV_DOCS_URL = $(DEV_DOCS_URL-$(JDK_MINOR_VERSION))
121 DOCS_BASE_URL = http://download.oracle.com/javase/7/docs 121 DOCS_BASE_URL = http://download.oracle.com/javase/7/docs
122 122
127 ################################################################# 127 #################################################################
128 # Macros: 128 # Macros:
129 129
130 130
131 # List of all possible directories for javadoc to look for sources 131 # List of all possible directories for javadoc to look for sources
132 # NOTE: Quotes are required around sourcepath argument only on Windows. 132 # NOTE: Quotes are required around sourcepath argument only on Windows.
133 # Otherwise, you get "No packages or classes specified." due 133 # Otherwise, you get "No packages or classes specified." due
134 # to $(PATH_SEP) being interpreted as an end of 134 # to $(PATH_SEP) being interpreted as an end of
135 # command (newline or shell ; character) 135 # command (newline or shell ; character)
136 ALL_SOURCE_DIRS = $(JDK_SHARE_CLASSES) \ 136 ALL_SOURCE_DIRS = $(JDK_SHARE_CLASSES) \
137 $(JDK_IMPSRC) \ 137 $(JDK_IMPSRC) \
138 $(JDK_GENSRC) \ 138 $(JDK_GENSRC) \
139 $(JDK_OUTPUTDIR)/gendocsrc_rmic \ 139 $(JDK_OUTPUTDIR)/gendocsrc_rmic \
140 $(JDK_TOPDIR)/src/solaris/classes \ 140 $(JDK_TOPDIR)/src/solaris/classes \
141 $(JDK_TOPDIR)/src/windows/classes \ 141 $(JDK_TOPDIR)/src/windows/classes \
142 $(JDK_SHARE_SRC)/doc/stub 142 $(JDK_SHARE_SRC)/doc/stub
143 143
144 # List of directories that actually exist 144 # List of directories that actually exist
145 ALL_EXISTING_SOURCE_DIRS := $(wildcard $(ALL_SOURCE_DIRS)) 145 ALL_EXISTING_SOURCE_DIRS := $(wildcard $(ALL_SOURCE_DIRS))
146 146
147 # List with classpath separator between them 147 # List with classpath separator between them
149 SPACE:= $(EMPTY) $(EMPTY) 149 SPACE:= $(EMPTY) $(EMPTY)
150 RELEASEDOCS_SOURCEPATH = \ 150 RELEASEDOCS_SOURCEPATH = \
151 $(subst $(SPACE),$(PATH_SEP),$(strip $(ALL_SOURCE_DIRS))) 151 $(subst $(SPACE),$(PATH_SEP),$(strip $(ALL_SOURCE_DIRS)))
152 152
153 define prep-target 153 define prep-target
154 $(MKDIR) -p $(@D) 154 $(MKDIR) -p $(@D)
155 $(RM) $@ 155 $(RM) $@
156 endef 156 endef
157 157
158 # Prep for javadoc creation, assumes $@ is an index.html file 158 # Prep for javadoc creation, assumes $@ is an index.html file
159 define prep-javadoc 159 define prep-javadoc
160 @if [ -f "$@" -a "$?" != "" ] ; then \ 160 @if [ -f "$@" -a "$?" != "" ] ; then \
161 $(ECHO) "# Dependencies have changed: $?"; \ 161 $(ECHO) "# Dependencies have changed: $?"; \
162 fi 162 fi
163 $(RM) -r $(@D) 163 $(RM) -r $(@D)
164 $(MKDIR) -p $(@D) 164 $(MKDIR) -p $(@D)
165 endef 165 endef
166 166
167 # A cache of the directories in ALL_SOURCE_DIRS 167 # A cache of the directories in ALL_SOURCE_DIRS
168 DIRECTORY_CACHE = $(DOCSTMPDIR)/directory.cache 168 DIRECTORY_CACHE = $(DOCSTMPDIR)/directory.cache
169 169
170 # Given a list of packages, return a list of files or dirs to be dependent on 170 # Given a list of packages, return a list of files or dirs to be dependent on
171 # (Currently only returning a list of directories) 171 # (Currently only returning a list of directories)
172 define PackageDependencies # packages 172 define PackageDependencies # packages
173 $(shell \ 173 $(shell \
174 if [ "$1" != "" -a -f $(DIRECTORY_CACHE) ] ; then \ 174 if [ "$1" != "" -a -f $(DIRECTORY_CACHE) ] ; then \
175 for p in $1 ; do \ 175 for p in $1 ; do \
176 pd=`$(ECHO) $${p} | $(SED) -e 's@[.]@/@g'`; \ 176 pd=`$(ECHO) $${p} | $(SED) -e 's@[.]@/@g'`; \
177 $(CAT) $(DIRECTORY_CACHE) | $(GREP) "/$${pd}/" ; \ 177 $(CAT) $(DIRECTORY_CACHE) | $(GREP) "/$${pd}/" ; \
178 done; \ 178 done; \
179 fi \ 179 fi \
180 ) 180 )
181 endef 181 endef
182 182
183 # Given a list of packages, add packages that exist to $@, print summary 183 # Given a list of packages, add packages that exist to $@, print summary
184 define PackageFilter # packages 184 define PackageFilter # packages
185 @if [ "$1" != "" ] ; then \ 185 @if [ "$1" != "" ] ; then \
186 for p in $1 ; do \ 186 for p in $1 ; do \
187 pd=`$(ECHO) $${p} | $(SED) -e 's@[.]@/@g'`; \ 187 pd=`$(ECHO) $${p} | $(SED) -e 's@[.]@/@g'`; \
188 found="false"; \ 188 found="false"; \
189 for cp in $(ALL_SOURCE_DIRS) ; do \ 189 for cp in $(ALL_SOURCE_DIRS) ; do \
190 if [ -d $${cp}/$${pd} ] ; then \ 190 if [ -d $${cp}/$${pd} ] ; then \
191 $(ECHO) "$${p}" >> $@; \ 191 $(ECHO) "$${p}" >> $@; \
192 found="true"; \ 192 found="true"; \
193 break; \ 193 break; \
194 fi; \ 194 fi; \
195 done; \ 195 done; \
196 if [ "$${found}" = "false" ] ; then \ 196 if [ "$${found}" = "false" ] ; then \
197 $(ECHO) "WARNING: Package not found: $${p}"; \ 197 $(ECHO) "WARNING: Package not found: $${p}"; \
198 fi; \ 198 fi; \
199 done; \ 199 done; \
200 fi 200 fi
201 endef 201 endef
202 202
203 # Print out a summary of the javadoc command about to be run 203 # Print out a summary of the javadoc command about to be run
204 define JavadocSummary # optionsfile packagesfile 204 define JavadocSummary # optionsfile packagesfile
205 @$(ECHO) "# Summary for $@";\ 205 @$(ECHO) "# Summary for $@"; \
206 $(ECHO) "# Options (`$(BASENAME) $1`):"; $(SED) -e 's@^@# @' $1; \ 206 $(ECHO) "# Options (`$(BASENAME) $1`):"; $(SED) -e 's@^@# @' $1; \
207 $(ECHO) "# Packages (`$(BASENAME) $2`):";$(SED) -e 's@^@# @' $2 207 $(ECHO) "# Packages (`$(BASENAME) $2`):";$(SED) -e 's@^@# @' $2
208 endef 208 endef
209 209
210 # 210 #
211 # Temporary directory for javadoc creation 211 # Temporary directory for javadoc creation
212 # 212 #
213 DOCSTMPDIR = $(TEMPDIR)/doctmp 213 DOCSTMPDIR = $(TEMPDIR)/doctmp
214 214
215 # 215 #
216 # Different api directories created from root directory 216 # Different api directories created from root directory
217 # 217 #
218 COREAPI_DOCSDIR = $(DOCSDIR)/api 218 COREAPI_DOCSDIR = $(DOCSDIR)/api
219 JDK_API_DOCSDIR = $(DOCSDIR)/jdk/api 219 JDK_API_DOCSDIR = $(DOCSDIR)/jdk/api
220 JRE_API_DOCSDIR = $(DOCSDIR)/jre/api 220 JRE_API_DOCSDIR = $(DOCSDIR)/jre/api
221 PLATFORM_DOCSDIR = $(DOCSDIR)/platform 221 PLATFORM_DOCSDIR = $(DOCSDIR)/platform
222 222
223 # The non-core api javadocs need to be able to access the root of the core 223 # The non-core api javadocs need to be able to access the root of the core
224 # api directory, so for jdk/api or jre/api to get to the core api/ 224 # api directory, so for jdk/api or jre/api to get to the core api/
225 # directory we would use this: 225 # directory we would use this:
226 JDKJRE2COREAPI = ../../api 226 JDKJRE2COREAPI = ../../api
227 227
228 # Common bottom argument 228 # Common bottom argument
229 define CommonBottom # year 229 define CommonBottom # year
230 <font size="-1"><br> $(call CopyrightLine,,$1,)</font> 230 <font size="-1"><br> $(call CopyrightLine,,$1,)</font>
231 endef 231 endef
238 </font> 238 </font>
239 endef 239 endef
240 240
241 # Common echo of option 241 # Common echo of option
242 define OptionOnly # opt 242 define OptionOnly # opt
243 $(PRINTF) "%s\n" "$1" 243 $(PRINTF) "%s\n" "$1"
244 endef 244 endef
245 define OptionPair # opt arg 245 define OptionPair # opt arg
246 $(PRINTF) "%s '%s'\n" "$1" '$2' 246 $(PRINTF) "%s '%s'\n" "$1" '$2'
247 endef 247 endef
248 define OptionTrip # opt arg arg 248 define OptionTrip # opt arg arg
249 $(PRINTF) "%s '%s' '%s'\n" "$1" '$2' '$3' 249 $(PRINTF) "%s '%s' '%s'\n" "$1" '$2' '$3'
250 endef 250 endef
251 251
252 # Core api bottom argument (with special sauce) 252 # Core api bottom argument (with special sauce)
253 COREAPI_BOTTOM = <font size="-1"> $(BUG_SUBMIT_LINE)\ 253 COREAPI_BOTTOM = <font size="-1"> $(BUG_SUBMIT_LINE)\
254 <br>For further API reference and developer documentation, \ 254 <br>For further API reference and developer documentation, \
258 and working code examples.<br>\ 258 and working code examples.<br>\
259 $(call CopyrightLine,$(COPYRIGHT_URL),$(FIRST_COPYRIGHT_YEAR),)\ 259 $(call CopyrightLine,$(COPYRIGHT_URL),$(FIRST_COPYRIGHT_YEAR),)\
260 </font> 260 </font>
261 261
262 # Common javadoc options used by all 262 # Common javadoc options used by all
263 COMMON_JAVADOCFLAGS = \ 263 COMMON_JAVADOCFLAGS = \
264 -XDignore.symbol.file=true \ 264 -XDignore.symbol.file=true \
265 -quiet \ 265 -quiet \
266 -use \ 266 -use \
267 -keywords \ 267 -keywords \
268 -Xdoclint:none \ 268 -Xdoclint:none \
269 -Xprofilespath $(JDK_TOPDIR)/makefiles/profile-rtjar-includes.txt \ 269 -Xprofilespath $(JDK_TOPDIR)/makefiles/profile-rtjar-includes.txt \
270 $(ADDITIONAL_JAVADOCFLAGS) 270 $(ADDITIONAL_JAVADOCFLAGS)
271 271
272 ifdef OPENJDK 272 ifdef OPENJDK
273 ADDITIONAL_JAVADOCFLAGS = \ 273 ADDITIONAL_JAVADOCFLAGS = \
274 -Xdocrootparent $(DOCS_BASE_URL) 274 -Xdocrootparent $(DOCS_BASE_URL)
275 else 275 else
276 ADDITIONAL_JAVADOCFLAGS = 276 ADDITIONAL_JAVADOCFLAGS =
277 endif 277 endif
278 278
279 # Draft used for non-fcs documents 279 # Draft used for non-fcs documents
280 DRAFT_HEADER = 280 DRAFT_HEADER =
281 ifneq ($(MILESTONE), fcs) 281 ifneq ($(MILESTONE), fcs)
282 DRAFT_HEADER = <br><strong>DRAFT&nbsp;$(MILESTONE)-$(BUILD_NUMBER)</strong> 282 DRAFT_HEADER = <br><strong>DRAFT&nbsp;$(MILESTONE)-$(BUILD_NUMBER)</strong>
283 DRAFT_BOTTOM = <br><strong>DRAFT&nbsp;$(MILESTONE)-$(BUILD_NUMBER)</strong> 283 DRAFT_BOTTOM = <br><strong>DRAFT&nbsp;$(MILESTONE)-$(BUILD_NUMBER)</strong>
284 DRAFT_WINTITLE = $(BUILD_NUMBER) 284 DRAFT_WINTITLE = $(BUILD_NUMBER)
285 # Early access top text (not used in FCS releases) 285 # Early access top text (not used in FCS releases)
286 COREAPI_TOP_EARLYACCESS = \ 286 COREAPI_TOP_EARLYACCESS = \
287 <div style="background-color: \#EEEEEE"> \ 287 <div style="background-color: \#EEEEEE"> \
288 <div style="padding: 6px; margin-top: 2px; margin-bottom: 6px; \ 288 <div style="padding: 6px; margin-top: 2px; margin-bottom: 6px; \
289 margin-left: 6px; margin-right: 6px; text-align: justify; \ 289 margin-left: 6px; margin-right: 6px; text-align: justify; \
290 font-size: 80%; font-family: Helvetica, Arial, sans-serif; \ 290 font-size: 80%; font-family: Helvetica, Arial, sans-serif; \
291 font-weight: normal;"> \ 291 font-weight: normal;"> \
292 Please note that the specifications and other information \ 292 Please note that the specifications and other information \
293 contained herein are not final and are subject to change. \ 293 contained herein are not final and are subject to change. \
294 The information is being made available to you solely for purpose of \ 294 The information is being made available to you solely for purpose of \
295 evaluation. \ 295 evaluation. \
296 </div> </div> 296 </div> </div>
297
297 endif 298 endif
298 299
299 ################################################################# 300 #################################################################
300 301
301 # 302 #
318 all: docs 319 all: docs
319 docs: coredocs otherdocs 320 docs: coredocs otherdocs
320 321
321 ################################################################# 322 #################################################################
322 # Production Targets -- USE THESE TARGETS WHEN: 323 # Production Targets -- USE THESE TARGETS WHEN:
323 # a) You're generating docs outside of release engineering's 324 # a) You're generating docs outside of release engineering's
324 # standard control build. 325 # standard control build.
325 # b) The docs will be pushed to the web and/or included in 326 # b) The docs will be pushed to the web and/or included in
326 # the downloaded doc bundle. 327 # the downloaded doc bundle.
327 # 328 #
328 # See: Notes.html#releaseTargets 329 # See: Notes.html#releaseTargets
329 # Note: Spaces precede ifdef/ifndef indents. Tabs precede target commands (!) 330 # Note: Spaces precede ifdef/ifndef indents. Tabs precede target commands (!)
330 # 331 #
331 332
332 sanitycheckcoredocs: 333 sanitycheckcoredocs:
333 @$(ECHO) "" 334 @$(ECHO) ""
334 @$(ECHO) "Building core api docs with these values:" 335 @$(ECHO) "Building core api docs with these values:"
335 @$(ECHO) " BUILD_NUMBER = $(BUILD_NUMBER)" 336 @$(ECHO) " BUILD_NUMBER = $(BUILD_NUMBER)"
336 @$(ECHO) " MILESTONE = $(MILESTONE)" 337 @$(ECHO) " MILESTONE = $(MILESTONE)"
337 @$(ECHO) "" 338 @$(ECHO) ""
338 ifeq ($(BUILD_NUMBER), b00) 339 ifeq ($(BUILD_NUMBER), b00)
339 @$(ECHO) "ERROR: Build number must be defined" 340 @$(ECHO) "ERROR: Build number must be defined"
340 @$(ECHO) "MILESTONE is set to $(MILESTONE)" 341 @$(ECHO) "MILESTONE is set to $(MILESTONE)"
341 @$(ECHO) "" 342 @$(ECHO) ""
342 exit 1 343 exit 1
343 endif 344 endif
344 345
345 ############################################################# 346 #############################################################
346 # 347 #
347 # coredocs 348 # coredocs
348 # 349 #
349 COREAPI_DOCTITLE = Java$(TRADEMARK) Platform, Standard Edition \ 350 COREAPI_DOCTITLE = Java$(TRADEMARK) Platform, Standard Edition \
350 $(JDK_MINOR_VERSION)<br>API Specification 351 $(JDK_MINOR_VERSION)<br>API Specification
351 COREAPI_WINDOWTITLE = Java Platform SE $(JDK_MINOR_VERSION) 352 COREAPI_WINDOWTITLE = Java Platform SE $(JDK_MINOR_VERSION)
352 COREAPI_HEADER = \ 353 COREAPI_HEADER = \
353 <strong>Java$(TRADEMARK)&nbsp;Platform<br>Standard&nbsp;Ed.&nbsp;$(JDK_MINOR_VERSION)</strong> 354 <strong>Java$(TRADEMARK)&nbsp;Platform<br>Standard&nbsp;Ed.&nbsp;$(JDK_MINOR_VERSION)</strong>
354 355
355 # Java language specification cite 356 # Java language specification cite
356 TAG_JLS = jls:a:See <cite> \ 357 TAG_JLS = jls:a:See <cite> \
358 359
359 # Overview file for core apis 360 # Overview file for core apis
360 COREAPI_OVERVIEW = $(JDK_SHARE_CLASSES)/overview-core.html 361 COREAPI_OVERVIEW = $(JDK_SHARE_CLASSES)/overview-core.html
361 362
362 # The index.html, options, and packages files 363 # The index.html, options, and packages files
363 COREAPI_INDEX_FILE = $(COREAPI_DOCSDIR)/index.html 364 COREAPI_INDEX_FILE = $(COREAPI_DOCSDIR)/index.html
364 COREAPI_OPTIONS_FILE = $(DOCSTMPDIR)/coredocs.options 365 COREAPI_OPTIONS_FILE = $(DOCSTMPDIR)/coredocs.options
365 COREAPI_PACKAGES_FILE = $(DOCSTMPDIR)/coredocs.packages 366 COREAPI_PACKAGES_FILE = $(DOCSTMPDIR)/coredocs.packages
366 367
367 coredocs: $(COREAPI_INDEX_FILE) 368 coredocs: $(COREAPI_INDEX_FILE)
368 369
369 # Set relative location to core api document root 370 # Set relative location to core api document root
372 # Run javadoc if the index file is out of date or missing 373 # Run javadoc if the index file is out of date or missing
373 $(COREAPI_INDEX_FILE): $(COREAPI_OPTIONS_FILE) $(COREAPI_PACKAGES_FILE) 374 $(COREAPI_INDEX_FILE): $(COREAPI_OPTIONS_FILE) $(COREAPI_PACKAGES_FILE)
374 $(prep-javadoc) 375 $(prep-javadoc)
375 $(call JavadocSummary,$(COREAPI_OPTIONS_FILE),$(COREAPI_PACKAGES_FILE)) 376 $(call JavadocSummary,$(COREAPI_OPTIONS_FILE),$(COREAPI_PACKAGES_FILE))
376 $(JAVADOC_CMD) -d $(@D) \ 377 $(JAVADOC_CMD) -d $(@D) \
377 @$(COREAPI_OPTIONS_FILE) @$(COREAPI_PACKAGES_FILE) 378 @$(COREAPI_OPTIONS_FILE) @$(COREAPI_PACKAGES_FILE)
378 379
379 # Create file with javadoc options in it 380 # Create file with javadoc options in it
380 $(COREAPI_OPTIONS_FILE): $(COREAPI_OVERVIEW) 381 $(COREAPI_OPTIONS_FILE): $(COREAPI_OVERVIEW)
381 $(prep-target) 382 $(prep-target)
382 @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \ 383 @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
383 $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \ 384 $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
384 $(call OptionPair,-encoding,ISO-8859-1) ; \ 385 $(call OptionPair,-encoding,ISO-8859-1) ; \
385 $(call OptionPair,-tag,beaninfo:X) ; \ 386 $(call OptionPair,-tag,beaninfo:X) ; \
386 $(call OptionPair,-tag,revised:X) ; \ 387 $(call OptionPair,-tag,revised:X) ; \
387 $(call OptionPair,-tag,since.unbundled:X) ; \ 388 $(call OptionPair,-tag,since.unbundled:X) ; \
388 $(call OptionPair,-tag,spec:X) ; \ 389 $(call OptionPair,-tag,spec:X) ; \
389 $(call OptionPair,-tag,specdefault:X) ; \ 390 $(call OptionPair,-tag,specdefault:X) ; \
390 $(call OptionPair,-tag,Note:X) ; \ 391 $(call OptionPair,-tag,Note:X) ; \
391 $(call OptionPair,-tag,ToDo:X) ; \ 392 $(call OptionPair,-tag,ToDo:X) ; \
392 $(call OptionPair,-tag,apiNote:a:API Note:) ; \ 393 $(call OptionPair,-tag,apiNote:a:API Note:) ; \
393 $(call OptionPair,-tag,implSpec:a:Implementation Requirements:) ; \ 394 $(call OptionPair,-tag,implSpec:a:Implementation Requirements:) ; \
394 $(call OptionPair,-tag,implNote:a:Implementation Note:) ; \ 395 $(call OptionPair,-tag,implNote:a:Implementation Note:) ; \
395 $(call OptionPair,-tag,param) ; \ 396 $(call OptionPair,-tag,param) ; \
396 $(call OptionPair,-tag,return) ; \ 397 $(call OptionPair,-tag,return) ; \
397 $(call OptionPair,-tag,throws) ; \ 398 $(call OptionPair,-tag,throws) ; \
398 $(call OptionPair,-tag,since) ; \ 399 $(call OptionPair,-tag,since) ; \
399 $(call OptionPair,-tag,version) ; \ 400 $(call OptionPair,-tag,version) ; \
400 $(call OptionPair,-tag,serialData) ; \ 401 $(call OptionPair,-tag,serialData) ; \
401 $(call OptionPair,-tag,factory) ; \ 402 $(call OptionPair,-tag,factory) ; \
402 $(call OptionPair,-tag,see) ; \ 403 $(call OptionPair,-tag,see) ; \
403 $(call OptionPair,-tag,$(TAG_JLS)) ; \ 404 $(call OptionPair,-tag,$(TAG_JLS)) ; \
404 $(call OptionOnly,-splitIndex) ; \ 405 $(call OptionOnly,-splitIndex) ; \
405 $(call OptionPair,-overview,$(COREAPI_OVERVIEW)) ; \ 406 $(call OptionPair,-overview,$(COREAPI_OVERVIEW)) ; \
406 $(call OptionPair,-doctitle,$(COREAPI_DOCTITLE)) ; \ 407 $(call OptionPair,-doctitle,$(COREAPI_DOCTITLE)) ; \
407 $(call OptionPair,-windowtitle,$(COREAPI_WINDOWTITLE) $(DRAFT_WINTITLE)) ;\ 408 $(call OptionPair,-windowtitle,$(COREAPI_WINDOWTITLE) $(DRAFT_WINTITLE)) ; \
408 $(call OptionPair,-header,$(COREAPI_HEADER)$(DRAFT_HEADER)) ; \ 409 $(call OptionPair,-header,$(COREAPI_HEADER)$(DRAFT_HEADER)) ; \
409 $(call OptionPair,-bottom,$(COREAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \ 410 $(call OptionPair,-bottom,$(COREAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
410 ) >> $@ 411 ) >> $@
411 ifdef COREAPI_TOP_EARLYACCESS 412 ifdef COREAPI_TOP_EARLYACCESS
412 @$(call OptionPair,-top,$(COREAPI_TOP_EARLYACCESS)) >> $@ 413 @$(call OptionPair,-top,$(COREAPI_TOP_EARLYACCESS)) >> $@
413 endif 414 endif
414 415
415 # Create a file with the package names in it 416 # Create a file with the package names in it
416 $(COREAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(CORE_PKGS)) 417 $(COREAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(CORE_PKGS))
417 $(prep-target) 418 $(prep-target)
418 $(call PackageFilter,$(CORE_PKGS)) 419 $(call PackageFilter,$(CORE_PKGS))
422 # docletapidocs 423 # docletapidocs
423 # 424 #
424 425
425 ALL_OTHER_TARGETS += docletapidocs 426 ALL_OTHER_TARGETS += docletapidocs
426 427
427 DOCLETAPI_DOCDIR := $(JDK_API_DOCSDIR)/javadoc/doclet 428 DOCLETAPI_DOCDIR := $(JDK_API_DOCSDIR)/javadoc/doclet
428 DOCLETAPI2COREAPI := ../../$(JDKJRE2COREAPI) 429 DOCLETAPI2COREAPI := ../../$(JDKJRE2COREAPI)
429 DOCLETAPI_DOCTITLE := Doclet API 430 DOCLETAPI_DOCTITLE := Doclet API
430 DOCLETAPI_WINDOWTITLE := Doclet API 431 DOCLETAPI_WINDOWTITLE := Doclet API
431 DOCLETAPI_HEADER := <strong>Doclet API</strong> 432 DOCLETAPI_HEADER := <strong>Doclet API</strong>
432 DOCLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOCLETAPI_FIRST_COPYRIGHT_YEAR)) 433 DOCLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOCLETAPI_FIRST_COPYRIGHT_YEAR))
433 DOCLETAPI_GROUPNAME := Packages 434 DOCLETAPI_GROUPNAME := Packages
434 DOCLETAPI_REGEXP := com.sun.javadoc 435 DOCLETAPI_REGEXP := com.sun.javadoc
435 # DOCLETAPI_PKGS is located in NON_CORE_PKGS.gmk 436 # DOCLETAPI_PKGS is located in NON_CORE_PKGS.gmk
436 437
437 # The index.html, options, and packages files 438 # The index.html, options, and packages files
438 DOCLETAPI_INDEX_FILE = $(DOCLETAPI_DOCDIR)/index.html 439 DOCLETAPI_INDEX_FILE = $(DOCLETAPI_DOCDIR)/index.html
439 DOCLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/docletapi.options 440 DOCLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/docletapi.options
440 DOCLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/docletapi.packages 441 DOCLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/docletapi.packages
441 442
442 docletapidocs: $(DOCLETAPI_INDEX_FILE) 443 docletapidocs: $(DOCLETAPI_INDEX_FILE)
443 444
444 # Set relative location to core api document root 445 # Set relative location to core api document root
447 # Run javadoc if the index file is out of date or missing 448 # Run javadoc if the index file is out of date or missing
448 $(DOCLETAPI_INDEX_FILE): $(DOCLETAPI_OPTIONS_FILE) $(DOCLETAPI_PACKAGES_FILE) coredocs 449 $(DOCLETAPI_INDEX_FILE): $(DOCLETAPI_OPTIONS_FILE) $(DOCLETAPI_PACKAGES_FILE) coredocs
449 $(prep-javadoc) 450 $(prep-javadoc)
450 $(call JavadocSummary,$(DOCLETAPI_OPTIONS_FILE),$(DOCLETAPI_PACKAGES_FILE)) 451 $(call JavadocSummary,$(DOCLETAPI_OPTIONS_FILE),$(DOCLETAPI_PACKAGES_FILE))
451 $(JAVADOC_CMD) -d $(@D) \ 452 $(JAVADOC_CMD) -d $(@D) \
452 @$(DOCLETAPI_OPTIONS_FILE) @$(DOCLETAPI_PACKAGES_FILE) 453 @$(DOCLETAPI_OPTIONS_FILE) @$(DOCLETAPI_PACKAGES_FILE)
453 454
454 # Create file with javadoc options in it 455 # Create file with javadoc options in it
455 $(DOCLETAPI_OPTIONS_FILE): 456 $(DOCLETAPI_OPTIONS_FILE):
456 $(prep-target) 457 $(prep-target)
457 @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \ 458 @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
458 $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \ 459 $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
459 $(call OptionPair,-encoding,ascii) ; \ 460 $(call OptionPair,-encoding,ascii) ; \
460 $(call OptionOnly,-breakiterator) ; \ 461 $(call OptionOnly,-breakiterator) ; \
461 $(call OptionPair,-doctitle,$(DOCLETAPI_DOCTITLE)) ; \ 462 $(call OptionPair,-doctitle,$(DOCLETAPI_DOCTITLE)) ; \
462 $(call OptionPair,-windowtitle,$(DOCLETAPI_WINDOWTITLE) $(DRAFT_WINTITLE));\ 463 $(call OptionPair,-windowtitle,$(DOCLETAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
463 $(call OptionPair,-header,$(DOCLETAPI_HEADER)$(DRAFT_HEADER)) ; \ 464 $(call OptionPair,-header,$(DOCLETAPI_HEADER)$(DRAFT_HEADER)) ; \
464 $(call OptionPair,-bottom,$(DOCLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \ 465 $(call OptionPair,-bottom,$(DOCLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
465 $(call OptionTrip,-group,$(DOCLETAPI_GROUPNAME),$(DOCLETAPI_REGEXP)); \ 466 $(call OptionTrip,-group,$(DOCLETAPI_GROUPNAME),$(DOCLETAPI_REGEXP)); \
466 $(call OptionTrip,-linkoffline,$(DOCLETAPI2COREAPI),$(COREAPI_DOCSDIR)/); \ 467 $(call OptionTrip,-linkoffline,$(DOCLETAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
467 ) >> $@ 468 ) >> $@
468 469
469 # Create a file with the package names in it 470 # Create a file with the package names in it
470 $(DOCLETAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(DOCLETAPI_PKGS)) 471 $(DOCLETAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(DOCLETAPI_PKGS))
471 $(prep-target) 472 $(prep-target)
472 $(call PackageFilter,$(DOCLETAPI_PKGS)) 473 $(call PackageFilter,$(DOCLETAPI_PKGS))
475 # 476 #
476 # tagletapidocs 477 # tagletapidocs
477 # 478 #
478 479
479 ALL_OTHER_TARGETS += tagletapidocs 480 ALL_OTHER_TARGETS += tagletapidocs
480 TAGLETAPI_DOCDIR := $(JDK_API_DOCSDIR)/javadoc/taglet 481 TAGLETAPI_DOCDIR := $(JDK_API_DOCSDIR)/javadoc/taglet
481 TAGLETAPI2COREAPI := ../../$(JDKJRE2COREAPI) 482 TAGLETAPI2COREAPI := ../../$(JDKJRE2COREAPI)
482 TAGLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(TAGLETAPI_FIRST_COPYRIGHT_YEAR)) 483 TAGLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(TAGLETAPI_FIRST_COPYRIGHT_YEAR))
483 # TAGLETAPI_FILE is located in NON_CORE_PKGS.gmk 484 # TAGLETAPI_FILE is located in NON_CORE_PKGS.gmk
484 485
485 # Temporary directory (special generation rules) 486 # Temporary directory (special generation rules)
486 TAGLETAPI_TEMPDIR = $(DOCSTMPDIR)/taglets_temp 487 TAGLETAPI_TEMPDIR = $(DOCSTMPDIR)/taglets_temp
487 488
488 # The index.html, options, and packages files 489 # The index.html, options, and packages files
489 TAGLETAPI_INDEX_FILE = $(TAGLETAPI_DOCDIR)/index.html 490 TAGLETAPI_INDEX_FILE = $(TAGLETAPI_DOCDIR)/index.html
490 TAGLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/tagletapi.options 491 TAGLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/tagletapi.options
491 TAGLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/tagletapi.packages 492 TAGLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/tagletapi.packages
492 493
493 tagletapidocs: $(TAGLETAPI_INDEX_FILE) 494 tagletapidocs: $(TAGLETAPI_INDEX_FILE)
494 495
495 # Set relative location to core api document root 496 # Set relative location to core api document root
500 $(prep-javadoc) 501 $(prep-javadoc)
501 $(RM) -r $(TAGLETAPI_TEMPDIR) 502 $(RM) -r $(TAGLETAPI_TEMPDIR)
502 $(MKDIR) -p $(TAGLETAPI_TEMPDIR) 503 $(MKDIR) -p $(TAGLETAPI_TEMPDIR)
503 $(call JavadocSummary,$(TAGLETAPI_OPTIONS_FILE),$(TAGLETAPI_PACKAGES_FILE)) 504 $(call JavadocSummary,$(TAGLETAPI_OPTIONS_FILE),$(TAGLETAPI_PACKAGES_FILE))
504 $(JAVADOC_CMD) -d $(TAGLETAPI_TEMPDIR) \ 505 $(JAVADOC_CMD) -d $(TAGLETAPI_TEMPDIR) \
505 @$(TAGLETAPI_OPTIONS_FILE) @$(TAGLETAPI_PACKAGES_FILE) 506 @$(TAGLETAPI_OPTIONS_FILE) @$(TAGLETAPI_PACKAGES_FILE)
506 cp -r $(TAGLETAPI_TEMPDIR)/com $(@D) 507 cp -r $(TAGLETAPI_TEMPDIR)/com $(@D)
507 cp $(TAGLETAPI_TEMPDIR)/stylesheet.css $(@D) 508 cp $(TAGLETAPI_TEMPDIR)/stylesheet.css $(@D)
508 $(RM) -r $(TAGLETAPI_TEMPDIR) 509 $(RM) -r $(TAGLETAPI_TEMPDIR)
509 510
510 # Create file with javadoc options in it 511 # Create file with javadoc options in it
511 $(TAGLETAPI_OPTIONS_FILE): 512 $(TAGLETAPI_OPTIONS_FILE):
512 $(prep-target) 513 $(prep-target)
513 @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \ 514 @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
514 $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \ 515 $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
515 $(call OptionPair,-encoding,ascii) ; \ 516 $(call OptionPair,-encoding,ascii) ; \
516 $(call OptionOnly,-nonavbar) ; \ 517 $(call OptionOnly,-nonavbar) ; \
517 $(call OptionOnly,-noindex) ; \ 518 $(call OptionOnly,-noindex) ; \
518 $(call OptionPair,-bottom,$(TAGLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \ 519 $(call OptionPair,-bottom,$(TAGLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
519 $(call OptionTrip,-linkoffline,$(TAGLETAPI2COREAPI),$(COREAPI_DOCSDIR)/); \ 520 $(call OptionTrip,-linkoffline,$(TAGLETAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
520 ) >> $@ 521 ) >> $@
521 522
522 # Create a file with the package names in it 523 # Create a file with the package names in it
523 $(TAGLETAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TAGLETAPI_PKGS)) 524 $(TAGLETAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TAGLETAPI_PKGS))
524 $(prep-target) 525 $(prep-target)
525 @($(ECHO) "$(JDK_IMPSRC)/$(TAGLETAPI_FILE)" ) > $@ 526 @($(ECHO) "$(JDK_IMPSRC)/$(TAGLETAPI_FILE)" ) > $@
529 # domapidocs 530 # domapidocs
530 # 531 #
531 532
532 ALL_OTHER_TARGETS += domapidocs 533 ALL_OTHER_TARGETS += domapidocs
533 534
534 DOMAPI_DOCDIR := $(JRE_API_DOCSDIR)/plugin/dom 535 DOMAPI_DOCDIR := $(JRE_API_DOCSDIR)/plugin/dom
535 DOMAPI2COREAPI := ../../$(JDKJRE2COREAPI) 536 DOMAPI2COREAPI := ../../$(JDKJRE2COREAPI)
536 DOMAPI_DOCTITLE := Common DOM API 537 DOMAPI_DOCTITLE := Common DOM API
537 DOMAPI_WINDOWTITLE := Common DOM API 538 DOMAPI_WINDOWTITLE := Common DOM API
538 DOMAPI_HEADER := <strong>Common DOM API</strong> 539 DOMAPI_HEADER := <strong>Common DOM API</strong>
539 DOMAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOMAPI_FIRST_COPYRIGHT_YEAR)) 540 DOMAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOMAPI_FIRST_COPYRIGHT_YEAR))
540 DOMAPI_GROUPNAME := Packages 541 DOMAPI_GROUPNAME := Packages
541 DOMAPI_REGEXP := com.sun.java.browser.dom:org.w3c.dom* 542 DOMAPI_REGEXP := com.sun.java.browser.dom:org.w3c.dom*
542 # DOMAPI_PKGS is located in NON_CORE_PKGS.gmk 543 # DOMAPI_PKGS is located in NON_CORE_PKGS.gmk
543 544
544 # The index.html, options, and packages files 545 # The index.html, options, and packages files
545 DOMAPI_INDEX_FILE = $(DOMAPI_DOCDIR)/index.html 546 DOMAPI_INDEX_FILE = $(DOMAPI_DOCDIR)/index.html
546 DOMAPI_OPTIONS_FILE = $(DOCSTMPDIR)/domapi.options 547 DOMAPI_OPTIONS_FILE = $(DOCSTMPDIR)/domapi.options
547 DOMAPI_PACKAGES_FILE = $(DOCSTMPDIR)/domapi.packages 548 DOMAPI_PACKAGES_FILE = $(DOCSTMPDIR)/domapi.packages
548 549
549 domapidocs: $(DOMAPI_INDEX_FILE) 550 domapidocs: $(DOMAPI_INDEX_FILE)
550 551
551 # Set relative location to core api document root 552 # Set relative location to core api document root
554 # Run javadoc if the index file is out of date or missing 555 # Run javadoc if the index file is out of date or missing
555 $(DOMAPI_INDEX_FILE): $(DOMAPI_OPTIONS_FILE) $(DOMAPI_PACKAGES_FILE) coredocs 556 $(DOMAPI_INDEX_FILE): $(DOMAPI_OPTIONS_FILE) $(DOMAPI_PACKAGES_FILE) coredocs
556 $(prep-javadoc) 557 $(prep-javadoc)
557 $(call JavadocSummary,$(DOMAPI_OPTIONS_FILE),$(DOMAPI_PACKAGES_FILE)) 558 $(call JavadocSummary,$(DOMAPI_OPTIONS_FILE),$(DOMAPI_PACKAGES_FILE))
558 $(JAVADOC_CMD) -d $(@D) \ 559 $(JAVADOC_CMD) -d $(@D) \
559 @$(DOMAPI_OPTIONS_FILE) @$(DOMAPI_PACKAGES_FILE) 560 @$(DOMAPI_OPTIONS_FILE) @$(DOMAPI_PACKAGES_FILE)
560 561
561 # Create file with javadoc options in it 562 # Create file with javadoc options in it
562 $(DOMAPI_OPTIONS_FILE): 563 $(DOMAPI_OPTIONS_FILE):
563 $(prep-target) 564 $(prep-target)
564 @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \ 565 @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
565 $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \ 566 $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
566 $(call OptionPair,-encoding,ascii) ; \ 567 $(call OptionPair,-encoding,ascii) ; \
567 $(call OptionOnly,-splitIndex) ; \ 568 $(call OptionOnly,-splitIndex) ; \
568 $(call OptionPair,-doctitle,$(DOMAPI_DOCTITLE)) ; \ 569 $(call OptionPair,-doctitle,$(DOMAPI_DOCTITLE)) ; \
569 $(call OptionPair,-windowtitle,$(DOMAPI_WINDOWTITLE) $(DRAFT_WINTITLE));\ 570 $(call OptionPair,-windowtitle,$(DOMAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
570 $(call OptionPair,-header,$(DOMAPI_HEADER)$(DRAFT_HEADER)) ; \ 571 $(call OptionPair,-header,$(DOMAPI_HEADER)$(DRAFT_HEADER)) ; \
571 $(call OptionPair,-bottom,$(DOMAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \ 572 $(call OptionPair,-bottom,$(DOMAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
572 $(call OptionTrip,-group,$(DOMAPI_GROUPNAME),$(DOMAPI_REGEXP)); \ 573 $(call OptionTrip,-group,$(DOMAPI_GROUPNAME),$(DOMAPI_REGEXP)); \
573 $(call OptionTrip,-linkoffline,$(DOMAPI2COREAPI),$(COREAPI_DOCSDIR)/); \ 574 $(call OptionTrip,-linkoffline,$(DOMAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
574 ) >> $@ 575 ) >> $@
575 576
576 # Create a file with the package names in it 577 # Create a file with the package names in it
577 $(DOMAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(DOMAPI_PKGS)) 578 $(DOMAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(DOMAPI_PKGS))
578 $(prep-target) 579 $(prep-target)
579 $(call PackageFilter,$(DOMAPI_PKGS)) 580 $(call PackageFilter,$(DOMAPI_PKGS))
592 # jdidocs 593 # jdidocs
593 # 594 #
594 595
595 ALL_OTHER_TARGETS += jdidocs 596 ALL_OTHER_TARGETS += jdidocs
596 597
597 JDI_DOCDIR := $(JDK_API_DOCSDIR)/jpda/jdi 598 JDI_DOCDIR := $(JDK_API_DOCSDIR)/jpda/jdi
598 JDI2COREAPI := ../../$(JDKJRE2COREAPI) 599 JDI2COREAPI := ../../$(JDKJRE2COREAPI)
599 JDI_DOCTITLE := Java$(TRADEMARK) Debug Interface 600 JDI_DOCTITLE := Java$(TRADEMARK) Debug Interface
600 JDI_WINDOWTITLE := Java Debug Interface 601 JDI_WINDOWTITLE := Java Debug Interface
601 JDI_HEADER := <strong>Java Debug Interface</strong> 602 JDI_HEADER := <strong>Java Debug Interface</strong>
602 JDI_BOTTOM := $(call CommonBottom,$(JDI_FIRST_COPYRIGHT_YEAR)) 603 JDI_BOTTOM := $(call CommonBottom,$(JDI_FIRST_COPYRIGHT_YEAR))
603 JDI_OVERVIEW := $(JDK_SHARE_CLASSES)/jdi-overview.html 604 JDI_OVERVIEW := $(JDK_SHARE_CLASSES)/jdi-overview.html
604 # JDI_PKGS is located in NON_CORE_PKGS.gmk 605 # JDI_PKGS is located in NON_CORE_PKGS.gmk
605 606
606 # The index.html, options, and packages files 607 # The index.html, options, and packages files
607 JDI_INDEX_FILE = $(JDI_DOCDIR)/index.html 608 JDI_INDEX_FILE = $(JDI_DOCDIR)/index.html
608 JDI_OPTIONS_FILE = $(DOCSTMPDIR)/jdi.options 609 JDI_OPTIONS_FILE = $(DOCSTMPDIR)/jdi.options
609 JDI_PACKAGES_FILE = $(DOCSTMPDIR)/jdi.packages 610 JDI_PACKAGES_FILE = $(DOCSTMPDIR)/jdi.packages
610 611
611 jdidocs: $(JDI_INDEX_FILE) 612 jdidocs: $(JDI_INDEX_FILE)
612 613
613 # Set relative location to core api document root 614 # Set relative location to core api document root
616 # Run javadoc if the index file is out of date or missing 617 # Run javadoc if the index file is out of date or missing
617 $(JDI_INDEX_FILE): $(JDI_OPTIONS_FILE) $(JDI_PACKAGES_FILE) coredocs 618 $(JDI_INDEX_FILE): $(JDI_OPTIONS_FILE) $(JDI_PACKAGES_FILE) coredocs
618 $(prep-javadoc) 619 $(prep-javadoc)
619 $(call JavadocSummary,$(JDI_OPTIONS_FILE),$(JDI_PACKAGES_FILE)) 620 $(call JavadocSummary,$(JDI_OPTIONS_FILE),$(JDI_PACKAGES_FILE))
620 $(JAVADOC_CMD) -d $(@D) \ 621 $(JAVADOC_CMD) -d $(@D) \
621 @$(JDI_OPTIONS_FILE) @$(JDI_PACKAGES_FILE) 622 @$(JDI_OPTIONS_FILE) @$(JDI_PACKAGES_FILE)
622 623
623 # Create file with javadoc options in it 624 # Create file with javadoc options in it
624 $(JDI_OPTIONS_FILE): $(JDI_OVERVIEW) 625 $(JDI_OPTIONS_FILE): $(JDI_OVERVIEW)
625 $(prep-target) 626 $(prep-target)
626 @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \ 627 @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
627 $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \ 628 $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
628 $(call OptionPair,-encoding,ascii) ; \ 629 $(call OptionPair,-encoding,ascii) ; \
629 $(call OptionPair,-overview,$(JDI_OVERVIEW)) ; \ 630 $(call OptionPair,-overview,$(JDI_OVERVIEW)) ; \
630 $(call OptionPair,-doctitle,$(JDI_DOCTITLE)) ; \ 631 $(call OptionPair,-doctitle,$(JDI_DOCTITLE)) ; \
631 $(call OptionPair,-windowtitle,$(JDI_WINDOWTITLE) $(DRAFT_WINTITLE)); \ 632 $(call OptionPair,-windowtitle,$(JDI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
632 $(call OptionPair,-header,$(JDI_HEADER)$(DRAFT_HEADER)) ; \ 633 $(call OptionPair,-header,$(JDI_HEADER)$(DRAFT_HEADER)) ; \
633 $(call OptionPair,-bottom,$(JDI_BOTTOM)$(DRAFT_BOTTOM)) ; \ 634 $(call OptionPair,-bottom,$(JDI_BOTTOM)$(DRAFT_BOTTOM)) ; \
634 $(call OptionTrip,-linkoffline,$(JDI2COREAPI),$(COREAPI_DOCSDIR)/); \ 635 $(call OptionTrip,-linkoffline,$(JDI2COREAPI),$(COREAPI_DOCSDIR)/); \
635 ) >> $@ 636 ) >> $@
636 637
637 # Create a file with the package names in it 638 # Create a file with the package names in it
638 $(JDI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JDI_PKGS)) 639 $(JDI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JDI_PKGS))
639 $(prep-target) 640 $(prep-target)
640 $(call PackageFilter,$(JDI_PKGS)) 641 $(call PackageFilter,$(JDI_PKGS))
644 # jdwpdocs 645 # jdwpdocs
645 # 646 #
646 647
647 ALL_OTHER_TARGETS += jdwpdocs 648 ALL_OTHER_TARGETS += jdwpdocs
648 649
649 JDWP_DOCDIR = $(PLATFORM_DOCSDIR)/jpda/jdwp 650 JDWP_DOCDIR = $(PLATFORM_DOCSDIR)/jpda/jdwp
650 651
651 jdwpdocs: $(JDWP_DOCDIR)/jdwp-protocol.html 652 jdwpdocs: $(JDWP_DOCDIR)/jdwp-protocol.html
652 $(JDWP_DOCDIR)/jdwp-protocol.html : $(JDK_OUTPUTDIR)/gensrc_jdwp_doc/jdwp-protocol.html 653 $(JDWP_DOCDIR)/jdwp-protocol.html : $(JDK_OUTPUTDIR)/gensrc_jdwp_doc/jdwp-protocol.html
653 $(MKDIR) -p $(@D) 654 $(MKDIR) -p $(@D)
654 $(RM) $@ 655 $(RM) $@
659 # jvmtidocs 660 # jvmtidocs
660 # 661 #
661 662
662 ALL_OTHER_TARGETS += jvmtidocs 663 ALL_OTHER_TARGETS += jvmtidocs
663 664
664 JVMTI_DOCDIR = $(PLATFORM_DOCSDIR)/jvmti 665 JVMTI_DOCDIR = $(PLATFORM_DOCSDIR)/jvmti
665 JVMTI_HTML = $(HOTSPOT_DIST)/docs/platform/jvmti/jvmti.html 666 JVMTI_HTML = $(HOTSPOT_DIST)/docs/platform/jvmti/jvmti.html
666 667
667 jvmtidocs: $(JVMTI_DOCDIR)/jvmti.html 668 jvmtidocs: $(JVMTI_DOCDIR)/jvmti.html
668 $(JVMTI_DOCDIR)/jvmti.html: 669 $(JVMTI_DOCDIR)/jvmti.html:
669 @$(prep-javadoc) 670 @$(prep-javadoc)
670 @if [ -f $(JVMTI_HTML) ] ; then \ 671 @if [ -f $(JVMTI_HTML) ] ; then \
671 $(ECHO) "$(CP) $(JVMTI_HTML) $@"; \ 672 $(ECHO) "$(CP) $(JVMTI_HTML) $@"; \
672 $(CP) $(JVMTI_HTML) $@; \ 673 $(CP) $(JVMTI_HTML) $@; \
673 else \ 674 else \
674 $(ECHO) "WARNING: Generated file does not exist: $(JVMTI_HTML)"; \ 675 $(ECHO) "WARNING: Generated file does not exist: $(JVMTI_HTML)"; \
675 fi 676 fi
676 677
677 ############################################################# 678 #############################################################
678 # 679 #
679 # jaasdocs 680 # jaasdocs
680 # 681 #
681 682
682 ALL_OTHER_TARGETS += jaasdocs 683 ALL_OTHER_TARGETS += jaasdocs
683 684
684 JAAS_DOCDIR := $(JRE_API_DOCSDIR)/security/jaas/spec 685 JAAS_DOCDIR := $(JRE_API_DOCSDIR)/security/jaas/spec
685 JAAS2COREAPI := ../../../$(JDKJRE2COREAPI) 686 JAAS2COREAPI := ../../../$(JDKJRE2COREAPI)
686 JAAS_DOCTITLE := Java$(TRADEMARK) Authentication and Authorization Service 687 JAAS_DOCTITLE := Java$(TRADEMARK) Authentication and Authorization Service
687 JAAS_WINDOWTITLE := Java Authentication and Authorization Service 688 JAAS_WINDOWTITLE := Java Authentication and Authorization Service
688 JAAS_HEADER := <strong>Java Authentication and Authorization Service</strong> 689 JAAS_HEADER := <strong>Java Authentication and Authorization Service</strong>
689 JAAS_BOTTOM := $(call CommonBottom,$(JAAS_FIRST_COPYRIGHT_YEAR)) 690 JAAS_BOTTOM := $(call CommonBottom,$(JAAS_FIRST_COPYRIGHT_YEAR))
690 # JAAS_PKGS is located in NON_CORE_PKGS.gmk 691 # JAAS_PKGS is located in NON_CORE_PKGS.gmk
691 JAAS_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/security/auth/jaas-overview.html 692 JAAS_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/security/auth/jaas-overview.html
692 693
693 # The index.html, options, and packages files 694 # The index.html, options, and packages files
694 JAAS_INDEX_FILE = $(JAAS_DOCDIR)/index.html 695 JAAS_INDEX_FILE = $(JAAS_DOCDIR)/index.html
695 JAAS_OPTIONS_FILE = $(DOCSTMPDIR)/jaas.options 696 JAAS_OPTIONS_FILE = $(DOCSTMPDIR)/jaas.options
696 JAAS_PACKAGES_FILE = $(DOCSTMPDIR)/jaas.packages 697 JAAS_PACKAGES_FILE = $(DOCSTMPDIR)/jaas.packages
697 698
698 jaasdocs: $(JAAS_INDEX_FILE) 699 jaasdocs: $(JAAS_INDEX_FILE)
699 700
700 # Set relative location to core api document root 701 # Set relative location to core api document root
703 # Run javadoc if the index file is out of date or missing 704 # Run javadoc if the index file is out of date or missing
704 $(JAAS_INDEX_FILE): $(JAAS_OPTIONS_FILE) $(JAAS_PACKAGES_FILE) coredocs 705 $(JAAS_INDEX_FILE): $(JAAS_OPTIONS_FILE) $(JAAS_PACKAGES_FILE) coredocs
705 $(prep-javadoc) 706 $(prep-javadoc)
706 $(call JavadocSummary,$(JAAS_OPTIONS_FILE),$(JAAS_PACKAGES_FILE)) 707 $(call JavadocSummary,$(JAAS_OPTIONS_FILE),$(JAAS_PACKAGES_FILE))
707 $(JAVADOC_CMD) -d $(@D) \ 708 $(JAVADOC_CMD) -d $(@D) \
708 @$(JAAS_OPTIONS_FILE) @$(JAAS_PACKAGES_FILE) 709 @$(JAAS_OPTIONS_FILE) @$(JAAS_PACKAGES_FILE)
709 710
710 # Create file with javadoc options in it 711 # Create file with javadoc options in it
711 $(JAAS_OPTIONS_FILE): $(JAAS_OVERVIEW) 712 $(JAAS_OPTIONS_FILE): $(JAAS_OVERVIEW)
712 $(prep-target) 713 $(prep-target)
713 @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \ 714 @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
714 $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \ 715 $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
715 $(call OptionPair,-encoding,ascii) ; \ 716 $(call OptionPair,-encoding,ascii) ; \
716 $(call OptionPair,-overview,$(JAAS_OVERVIEW)) ; \ 717 $(call OptionPair,-overview,$(JAAS_OVERVIEW)) ; \
717 $(call OptionPair,-doctitle,$(JAAS_DOCTITLE)) ; \ 718 $(call OptionPair,-doctitle,$(JAAS_DOCTITLE)) ; \
718 $(call OptionPair,-windowtitle,$(JAAS_WINDOWTITLE) $(DRAFT_WINTITLE)); \ 719 $(call OptionPair,-windowtitle,$(JAAS_WINDOWTITLE) $(DRAFT_WINTITLE)); \
719 $(call OptionPair,-header,$(JAAS_HEADER)$(DRAFT_HEADER)) ; \ 720 $(call OptionPair,-header,$(JAAS_HEADER)$(DRAFT_HEADER)) ; \
720 $(call OptionPair,-bottom,$(JAAS_BOTTOM)$(DRAFT_BOTTOM)) ; \ 721 $(call OptionPair,-bottom,$(JAAS_BOTTOM)$(DRAFT_BOTTOM)) ; \
721 $(call OptionTrip,-linkoffline,$(JAAS2COREAPI),$(COREAPI_DOCSDIR)/); \ 722 $(call OptionTrip,-linkoffline,$(JAAS2COREAPI),$(COREAPI_DOCSDIR)/); \
722 ) >> $@ 723 ) >> $@
723 724
724 # Create a file with the package names in it 725 # Create a file with the package names in it
725 $(JAAS_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JAAS_PKGS)) 726 $(JAAS_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JAAS_PKGS))
726 $(prep-target) 727 $(prep-target)
727 $(call PackageFilter,$(JAAS_PKGS)) 728 $(call PackageFilter,$(JAAS_PKGS))
731 # jgssdocs 732 # jgssdocs
732 # 733 #
733 734
734 ALL_OTHER_TARGETS += jgssdocs 735 ALL_OTHER_TARGETS += jgssdocs
735 736
736 JGSS_DOCDIR := $(JRE_API_DOCSDIR)/security/jgss/spec 737 JGSS_DOCDIR := $(JRE_API_DOCSDIR)/security/jgss/spec
737 JGSS2COREAPI := ../../../$(JDKJRE2COREAPI) 738 JGSS2COREAPI := ../../../$(JDKJRE2COREAPI)
738 JGSS_DOCTITLE := Java$(TRADEMARK) GSS-API Utilities 739 JGSS_DOCTITLE := Java$(TRADEMARK) GSS-API Utilities
739 JGSS_WINDOWTITLE := Java GSS-API Utilities 740 JGSS_WINDOWTITLE := Java GSS-API Utilities
740 JGSS_HEADER := <strong>Java GSS-API Utilities</strong> 741 JGSS_HEADER := <strong>Java GSS-API Utilities</strong>
741 JGSS_BOTTOM := $(call CommonBottom,$(JGSS_FIRST_COPYRIGHT_YEAR)) 742 JGSS_BOTTOM := $(call CommonBottom,$(JGSS_FIRST_COPYRIGHT_YEAR))
742 JGSS_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/security/jgss/jgss-overview.html 743 JGSS_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/security/jgss/jgss-overview.html
743 # JGSS_PKGS is located in NON_CORE_PKGS.gmk 744 # JGSS_PKGS is located in NON_CORE_PKGS.gmk
744 745
745 # The index.html, options, and packages files 746 # The index.html, options, and packages files
746 JGSS_INDEX_FILE = $(JGSS_DOCDIR)/index.html 747 JGSS_INDEX_FILE = $(JGSS_DOCDIR)/index.html
747 JGSS_OPTIONS_FILE = $(DOCSTMPDIR)/jgss.options 748 JGSS_OPTIONS_FILE = $(DOCSTMPDIR)/jgss.options
748 JGSS_PACKAGES_FILE = $(DOCSTMPDIR)/jgss.packages 749 JGSS_PACKAGES_FILE = $(DOCSTMPDIR)/jgss.packages
749 750
750 jgssdocs: $(JGSS_INDEX_FILE) 751 jgssdocs: $(JGSS_INDEX_FILE)
751 752
752 # Set relative location to core api document root 753 # Set relative location to core api document root
755 # Run javadoc if the index file is out of date or missing 756 # Run javadoc if the index file is out of date or missing
756 $(JGSS_INDEX_FILE): $(JGSS_OPTIONS_FILE) $(JGSS_PACKAGES_FILE) coredocs 757 $(JGSS_INDEX_FILE): $(JGSS_OPTIONS_FILE) $(JGSS_PACKAGES_FILE) coredocs
757 $(prep-javadoc) 758 $(prep-javadoc)
758 $(call JavadocSummary,$(JGSS_OPTIONS_FILE),$(JGSS_PACKAGES_FILE)) 759 $(call JavadocSummary,$(JGSS_OPTIONS_FILE),$(JGSS_PACKAGES_FILE))
759 $(JAVADOC_CMD) -d $(@D) \ 760 $(JAVADOC_CMD) -d $(@D) \
760 @$(JGSS_OPTIONS_FILE) @$(JGSS_PACKAGES_FILE) 761 @$(JGSS_OPTIONS_FILE) @$(JGSS_PACKAGES_FILE)
761 762
762 # Create file with javadoc options in it 763 # Create file with javadoc options in it
763 $(JGSS_OPTIONS_FILE): $(JGSS_OVERVIEW) 764 $(JGSS_OPTIONS_FILE): $(JGSS_OVERVIEW)
764 $(prep-target) 765 $(prep-target)
765 @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \ 766 @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
766 $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \ 767 $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
767 $(call OptionPair,-encoding,ascii) ; \ 768 $(call OptionPair,-encoding,ascii) ; \
768 $(call OptionOnly,-nodeprecatedlist) ; \ 769 $(call OptionOnly,-nodeprecatedlist) ; \
769 $(call OptionPair,-overview,$(JGSS_OVERVIEW)) ; \ 770 $(call OptionPair,-overview,$(JGSS_OVERVIEW)) ; \
770 $(call OptionPair,-doctitle,$(JGSS_DOCTITLE)) ; \ 771 $(call OptionPair,-doctitle,$(JGSS_DOCTITLE)) ; \
771 $(call OptionPair,-windowtitle,$(JGSS_WINDOWTITLE) $(DRAFT_WINTITLE)); \ 772 $(call OptionPair,-windowtitle,$(JGSS_WINDOWTITLE) $(DRAFT_WINTITLE)); \
772 $(call OptionPair,-header,$(JGSS_HEADER)$(DRAFT_HEADER)) ; \ 773 $(call OptionPair,-header,$(JGSS_HEADER)$(DRAFT_HEADER)) ; \
773 $(call OptionPair,-bottom,$(JGSS_BOTTOM)$(DRAFT_BOTTOM)) ; \ 774 $(call OptionPair,-bottom,$(JGSS_BOTTOM)$(DRAFT_BOTTOM)) ; \
774 $(call OptionTrip,-linkoffline,$(JGSS2COREAPI),$(COREAPI_DOCSDIR)/); \ 775 $(call OptionTrip,-linkoffline,$(JGSS2COREAPI),$(COREAPI_DOCSDIR)/); \
775 ) >> $@ 776 ) >> $@
776 777
777 # Create a file with the package names in it 778 # Create a file with the package names in it
778 $(JGSS_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JGSS_PKGS)) 779 $(JGSS_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JGSS_PKGS))
779 $(prep-target) 780 $(prep-target)
780 $(call PackageFilter,$(JGSS_PKGS)) 781 $(call PackageFilter,$(JGSS_PKGS))
784 # smartcardiodocs 785 # smartcardiodocs
785 # 786 #
786 787
787 ALL_OTHER_TARGETS += smartcardiodocs 788 ALL_OTHER_TARGETS += smartcardiodocs
788 789
789 SMARTCARDIO_DOCDIR := $(JRE_API_DOCSDIR)/security/smartcardio/spec 790 SMARTCARDIO_DOCDIR := $(JRE_API_DOCSDIR)/security/smartcardio/spec
790 SMARTCARDIO2COREAPI := ../../../$(JDKJRE2COREAPI) 791 SMARTCARDIO2COREAPI := ../../../$(JDKJRE2COREAPI)
791 SMARTCARDIO_DOCTITLE := Java$(TRADEMARK) Smart Card I/O 792 SMARTCARDIO_DOCTITLE := Java$(TRADEMARK) Smart Card I/O
792 SMARTCARDIO_WINDOWTITLE := Java Smart Card I/O 793 SMARTCARDIO_WINDOWTITLE := Java Smart Card I/O
793 SMARTCARDIO_HEADER := <strong>Java Smart Card I/O</strong> 794 SMARTCARDIO_HEADER := <strong>Java Smart Card I/O</strong>
794 SMARTCARDIO_BOTTOM := $(call CommonBottom,$(SMARTCARDIO_FIRST_COPYRIGHT_YEAR)) 795 SMARTCARDIO_BOTTOM := $(call CommonBottom,$(SMARTCARDIO_FIRST_COPYRIGHT_YEAR))
795 # SMARTCARDIO_PKGS is located in NON_CORE_PKGS.gmk 796 # SMARTCARDIO_PKGS is located in NON_CORE_PKGS.gmk
796 797
797 # The index.html, options, and packages files 798 # The index.html, options, and packages files
798 SMARTCARDIO_INDEX_FILE = $(SMARTCARDIO_DOCDIR)/index.html 799 SMARTCARDIO_INDEX_FILE = $(SMARTCARDIO_DOCDIR)/index.html
799 SMARTCARDIO_OPTIONS_FILE = $(DOCSTMPDIR)/smartcardio.options 800 SMARTCARDIO_OPTIONS_FILE = $(DOCSTMPDIR)/smartcardio.options
800 SMARTCARDIO_PACKAGES_FILE = $(DOCSTMPDIR)/smartcardio.packages 801 SMARTCARDIO_PACKAGES_FILE = $(DOCSTMPDIR)/smartcardio.packages
801 802
802 smartcardiodocs: $(SMARTCARDIO_INDEX_FILE) 803 smartcardiodocs: $(SMARTCARDIO_INDEX_FILE)
803 804
804 # Set relative location to core api document root 805 # Set relative location to core api document root
807 # Run javadoc if the index file is out of date or missing 808 # Run javadoc if the index file is out of date or missing
808 $(SMARTCARDIO_INDEX_FILE): $(SMARTCARDIO_OPTIONS_FILE) $(SMARTCARDIO_PACKAGES_FILE) coredocs 809 $(SMARTCARDIO_INDEX_FILE): $(SMARTCARDIO_OPTIONS_FILE) $(SMARTCARDIO_PACKAGES_FILE) coredocs
809 $(prep-javadoc) 810 $(prep-javadoc)
810 $(call JavadocSummary,$(SMARTCARDIO_OPTIONS_FILE),$(SMARTCARDIO_PACKAGES_FILE)) 811 $(call JavadocSummary,$(SMARTCARDIO_OPTIONS_FILE),$(SMARTCARDIO_PACKAGES_FILE))
811 $(JAVADOC_CMD) -d $(@D) \ 812 $(JAVADOC_CMD) -d $(@D) \
812 @$(SMARTCARDIO_OPTIONS_FILE) @$(SMARTCARDIO_PACKAGES_FILE) 813 @$(SMARTCARDIO_OPTIONS_FILE) @$(SMARTCARDIO_PACKAGES_FILE)
813 814
814 # Create file with javadoc options in it 815 # Create file with javadoc options in it
815 $(SMARTCARDIO_OPTIONS_FILE): 816 $(SMARTCARDIO_OPTIONS_FILE):
816 $(prep-target) 817 $(prep-target)
817 @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \ 818 @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
818 $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \ 819 $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
819 $(call OptionPair,-encoding,ascii) ; \ 820 $(call OptionPair,-encoding,ascii) ; \
820 $(call OptionOnly,-nodeprecatedlist) ; \ 821 $(call OptionOnly,-nodeprecatedlist) ; \
821 $(call OptionPair,-doctitle,$(SMARTCARDIO_DOCTITLE)) ; \ 822 $(call OptionPair,-doctitle,$(SMARTCARDIO_DOCTITLE)) ; \
822 $(call OptionPair,-windowtitle,$(SMARTCARDIO_WINDOWTITLE) $(DRAFT_WINTITLE));\ 823 $(call OptionPair,-windowtitle,$(SMARTCARDIO_WINDOWTITLE) $(DRAFT_WINTITLE)); \
823 $(call OptionPair,-header,$(SMARTCARDIO_HEADER)$(DRAFT_HEADER)); \ 824 $(call OptionPair,-header,$(SMARTCARDIO_HEADER)$(DRAFT_HEADER)); \
824 $(call OptionPair,-bottom,$(SMARTCARDIO_BOTTOM)$(DRAFT_BOTTOM)); \ 825 $(call OptionPair,-bottom,$(SMARTCARDIO_BOTTOM)$(DRAFT_BOTTOM)); \
825 $(call OptionTrip,-linkoffline,$(SMARTCARDIO2COREAPI),$(COREAPI_DOCSDIR)/); \ 826 $(call OptionTrip,-linkoffline,$(SMARTCARDIO2COREAPI),$(COREAPI_DOCSDIR)/); \
826 ) >> $@ 827 ) >> $@
827 828
828 # Create a file with the package names in it 829 # Create a file with the package names in it
829 $(SMARTCARDIO_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SMARTCARDIO_PKGS)) 830 $(SMARTCARDIO_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SMARTCARDIO_PKGS))
830 $(prep-target) 831 $(prep-target)
831 $(call PackageFilter,$(SMARTCARDIO_PKGS)) 832 $(call PackageFilter,$(SMARTCARDIO_PKGS))
835 # httpserverdocs 836 # httpserverdocs
836 # 837 #
837 838
838 ALL_OTHER_TARGETS += httpserverdocs 839 ALL_OTHER_TARGETS += httpserverdocs
839 840
840 HTTPSERVER_DOCDIR := $(JRE_API_DOCSDIR)/net/httpserver/spec 841 HTTPSERVER_DOCDIR := $(JRE_API_DOCSDIR)/net/httpserver/spec
841 HTTPSERVER2COREAPI := ../../../$(JDKJRE2COREAPI) 842 HTTPSERVER2COREAPI := ../../../$(JDKJRE2COREAPI)
842 HTTPSERVER_DOCTITLE := Java$(TRADEMARK) HTTP Server 843 HTTPSERVER_DOCTITLE := Java$(TRADEMARK) HTTP Server
843 HTTPSERVER_WINDOWTITLE := Java HTTP Server 844 HTTPSERVER_WINDOWTITLE := Java HTTP Server
844 HTTPSERVER_HEADER := <strong>Java HTTP Server</strong> 845 HTTPSERVER_HEADER := <strong>Java HTTP Server</strong>
845 HTTPSERVER_BOTTOM := $(call CommonBottom,$(HTTPSERVER_FIRST_COPYRIGHT_YEAR)) 846 HTTPSERVER_BOTTOM := $(call CommonBottom,$(HTTPSERVER_FIRST_COPYRIGHT_YEAR))
846 # HTTPSERVER_PKGS is located in NON_CORE_PKGS.gmk 847 # HTTPSERVER_PKGS is located in NON_CORE_PKGS.gmk
847 848
848 HTTPSERVER_INDEX_HTML = $(HTTPSERVER_DOCDIR)/index.html 849 HTTPSERVER_INDEX_HTML = $(HTTPSERVER_DOCDIR)/index.html
849 HTTPSERVER_OPTIONS_FILE = $(DOCSTMPDIR)/httpserver.options 850 HTTPSERVER_OPTIONS_FILE = $(DOCSTMPDIR)/httpserver.options
850 HTTPSERVER_PACKAGES_FILE = $(DOCSTMPDIR)/httpserver.packages 851 HTTPSERVER_PACKAGES_FILE = $(DOCSTMPDIR)/httpserver.packages
851 852
852 httpserverdocs: $(HTTPSERVER_INDEX_HTML) 853 httpserverdocs: $(HTTPSERVER_INDEX_HTML)
853 854
854 # Set relative location to core api document root 855 # Set relative location to core api document root
857 # Run javadoc if the index file is out of date or missing 858 # Run javadoc if the index file is out of date or missing
858 $(HTTPSERVER_INDEX_HTML): $(HTTPSERVER_OPTIONS_FILE) $(HTTPSERVER_PACKAGES_FILE) coredocs 859 $(HTTPSERVER_INDEX_HTML): $(HTTPSERVER_OPTIONS_FILE) $(HTTPSERVER_PACKAGES_FILE) coredocs
859 $(prep-javadoc) 860 $(prep-javadoc)
860 $(call JavadocSummary,$(HTTPSERVER_OPTIONS_FILE),$(HTTPSERVER_PACKAGES_FILE)) 861 $(call JavadocSummary,$(HTTPSERVER_OPTIONS_FILE),$(HTTPSERVER_PACKAGES_FILE))
861 $(JAVADOC_CMD) -d $(@D) \ 862 $(JAVADOC_CMD) -d $(@D) \
862 @$(HTTPSERVER_OPTIONS_FILE) @$(HTTPSERVER_PACKAGES_FILE) 863 @$(HTTPSERVER_OPTIONS_FILE) @$(HTTPSERVER_PACKAGES_FILE)
863 864
864 # Create file with javadoc options in it 865 # Create file with javadoc options in it
865 $(HTTPSERVER_OPTIONS_FILE): 866 $(HTTPSERVER_OPTIONS_FILE):
866 $(prep-target) 867 $(prep-target)
867 @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \ 868 @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
868 $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \ 869 $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
869 $(call OptionPair,-encoding,ascii) ; \ 870 $(call OptionPair,-encoding,ascii) ; \
870 $(call OptionOnly,-nodeprecatedlist) ; \ 871 $(call OptionOnly,-nodeprecatedlist) ; \
871 $(call OptionPair,-doctitle,$(HTTPSERVER_DOCTITLE)) ; \ 872 $(call OptionPair,-doctitle,$(HTTPSERVER_DOCTITLE)) ; \
872 $(call OptionPair,-windowtitle,$(HTTPSERVER_WINDOWTITLE) $(DRAFT_WINTITLE));\ 873 $(call OptionPair,-windowtitle,$(HTTPSERVER_WINDOWTITLE) $(DRAFT_WINTITLE)); \
873 $(call OptionPair,-header,$(HTTPSERVER_HEADER)$(DRAFT_HEADER)); \ 874 $(call OptionPair,-header,$(HTTPSERVER_HEADER)$(DRAFT_HEADER)); \
874 $(call OptionPair,-bottom,$(HTTPSERVER_BOTTOM)$(DRAFT_BOTTOM)); \ 875 $(call OptionPair,-bottom,$(HTTPSERVER_BOTTOM)$(DRAFT_BOTTOM)); \
875 $(call OptionTrip,-linkoffline,$(HTTPSERVER2COREAPI),$(COREAPI_DOCSDIR)/); \ 876 $(call OptionTrip,-linkoffline,$(HTTPSERVER2COREAPI),$(COREAPI_DOCSDIR)/); \
876 ) >> $@ 877 ) >> $@
877 878
878 # Create a file with the package names in it 879 # Create a file with the package names in it
879 $(HTTPSERVER_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(HTTPSERVER_PKGS)) 880 $(HTTPSERVER_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(HTTPSERVER_PKGS))
880 $(prep-target) 881 $(prep-target)
881 $(call PackageFilter,$(HTTPSERVER_PKGS)) 882 $(call PackageFilter,$(HTTPSERVER_PKGS))
885 # mgmtdocs 886 # mgmtdocs
886 # 887 #
887 888
888 ALL_OTHER_TARGETS += mgmtdocs 889 ALL_OTHER_TARGETS += mgmtdocs
889 890
890 MGMT_DOCDIR := $(JRE_API_DOCSDIR)/management/extension 891 MGMT_DOCDIR := $(JRE_API_DOCSDIR)/management/extension
891 MGMT2COREAPI := ../../$(JDKJRE2COREAPI) 892 MGMT2COREAPI := ../../$(JDKJRE2COREAPI)
892 JVM_MIB_NAME := JVM-MANAGEMENT-MIB.mib 893 JVM_MIB_NAME := JVM-MANAGEMENT-MIB.mib
893 JVM_MIB_SRC := $(JDK_TOPDIR)/src/closed/share/classes/sun/management/snmp/$(JVM_MIB_NAME) 894 JVM_MIB_SRC := $(JDK_TOPDIR)/src/closed/share/classes/sun/management/snmp/$(JVM_MIB_NAME)
894 MGMT_DOCTITLE := Monitoring and Management Interface for the Java$(TRADEMARK) Platform 895 MGMT_DOCTITLE := Monitoring and Management Interface for the Java$(TRADEMARK) Platform
895 MGMT_WINDOWTITLE := Monitoring and Management Interface for the Java Platform 896 MGMT_WINDOWTITLE := Monitoring and Management Interface for the Java Platform
896 MGMT_HEADER := <strong>Monitoring and Management Interface for the Java Platform</strong> 897 MGMT_HEADER := <strong>Monitoring and Management Interface for the Java Platform</strong>
897 MGMT_BOTTOM := $(call CommonBottom,$(MGMT_FIRST_COPYRIGHT_YEAR)) 898 MGMT_BOTTOM := $(call CommonBottom,$(MGMT_FIRST_COPYRIGHT_YEAR))
898 MGMT_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/management/mgmt-overview.html 899 MGMT_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/management/mgmt-overview.html
899 # MGMT_PKGS is located in NON_CORE_PKGS.gmk 900 # MGMT_PKGS is located in NON_CORE_PKGS.gmk
900 901
901 # The index.html, options, and packages files 902 # The index.html, options, and packages files
902 MGMT_INDEX_FILE = $(MGMT_DOCDIR)/index.html 903 MGMT_INDEX_FILE = $(MGMT_DOCDIR)/index.html
903 MGMT_OPTIONS_FILE = $(DOCSTMPDIR)/mgmt.options 904 MGMT_OPTIONS_FILE = $(DOCSTMPDIR)/mgmt.options
904 MGMT_PACKAGES_FILE = $(DOCSTMPDIR)/mgmt.packages 905 MGMT_PACKAGES_FILE = $(DOCSTMPDIR)/mgmt.packages
905 906
906 mgmtdocs: $(MGMT_INDEX_FILE) 907 mgmtdocs: $(MGMT_INDEX_FILE)
907 908
908 # Set relative location to core api document root 909 # Set relative location to core api document root
909 $(MGMT_INDEX_FILE): GET2DOCSDIR=$(MGMT2COREAPI)/.. 910 $(MGMT_INDEX_FILE): GET2DOCSDIR=$(MGMT2COREAPI)/..
910 911
911 # Run javadoc if the index file is out of date or missing 912 # Run javadoc if the index file is out of date or missing
912 $(MGMT_INDEX_FILE): $(MGMT_OPTIONS_FILE) $(MGMT_PACKAGES_FILE) coredocs 913 $(MGMT_INDEX_FILE): $(MGMT_OPTIONS_FILE) $(MGMT_PACKAGES_FILE) coredocs
913 $(prep-javadoc) 914 $(prep-javadoc)
914 @if [ -f $(JVM_MIB_SRC) ] ; then \ 915 @if [ -f $(JVM_MIB_SRC) ] ; then \
915 $(ECHO) "$(CP) $(JVM_MIB_SRC) $(@D)/.."; \ 916 $(ECHO) "$(CP) $(JVM_MIB_SRC) $(@D)/.."; \
916 $(CP) $(JVM_MIB_SRC) $(@D)/.. ; \ 917 $(CP) $(JVM_MIB_SRC) $(@D)/.. ; \
917 else \ 918 else \
918 $(ECHO) "WARNING: File $(JVM_MIB_NAME) not available."; \ 919 $(ECHO) "WARNING: File $(JVM_MIB_NAME) not available."; \
919 fi 920 fi
920 $(call JavadocSummary,$(MGMT_OPTIONS_FILE),$(MGMT_PACKAGES_FILE)) 921 $(call JavadocSummary,$(MGMT_OPTIONS_FILE),$(MGMT_PACKAGES_FILE))
921 $(JAVADOC_CMD) -d $(@D) \ 922 $(JAVADOC_CMD) -d $(@D) \
922 @$(MGMT_OPTIONS_FILE) @$(MGMT_PACKAGES_FILE) 923 @$(MGMT_OPTIONS_FILE) @$(MGMT_PACKAGES_FILE)
923 924
924 # Create file with javadoc options in it 925 # Create file with javadoc options in it
925 $(MGMT_OPTIONS_FILE): $(MGMT_OVERVIEW) 926 $(MGMT_OPTIONS_FILE): $(MGMT_OVERVIEW)
926 $(prep-target) 927 $(prep-target)
927 @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \ 928 @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
928 $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \ 929 $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
929 $(call OptionPair,-encoding,ascii) ; \ 930 $(call OptionPair,-encoding,ascii) ; \
930 $(call OptionOnly,-nodeprecatedlist) ; \ 931 $(call OptionOnly,-nodeprecatedlist) ; \
931 $(call OptionPair,-overview,$(MGMT_OVERVIEW)) ; \ 932 $(call OptionPair,-overview,$(MGMT_OVERVIEW)) ; \
932 $(call OptionPair,-doctitle,$(MGMT_DOCTITLE)) ; \ 933 $(call OptionPair,-doctitle,$(MGMT_DOCTITLE)) ; \
933 $(call OptionPair,-windowtitle,$(MGMT_WINDOWTITLE) $(DRAFT_WINTITLE)); \ 934 $(call OptionPair,-windowtitle,$(MGMT_WINDOWTITLE) $(DRAFT_WINTITLE)); \
934 $(call OptionPair,-header,$(MGMT_HEADER)$(DRAFT_HEADER)) ; \ 935 $(call OptionPair,-header,$(MGMT_HEADER)$(DRAFT_HEADER)) ; \
935 $(call OptionPair,-bottom,$(MGMT_BOTTOM)$(DRAFT_BOTTOM)) ; \ 936 $(call OptionPair,-bottom,$(MGMT_BOTTOM)$(DRAFT_BOTTOM)) ; \
936 $(call OptionTrip,-linkoffline,$(MGMT2COREAPI),$(COREAPI_DOCSDIR)/); \ 937 $(call OptionTrip,-linkoffline,$(MGMT2COREAPI),$(COREAPI_DOCSDIR)/); \
937 ) >> $@ 938 ) >> $@
938 939
939 # Create a file with the package names in it 940 # Create a file with the package names in it
940 $(MGMT_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(MGMT_PKGS)) 941 $(MGMT_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(MGMT_PKGS))
941 $(prep-target) 942 $(prep-target)
942 $(call PackageFilter,$(MGMT_PKGS)) 943 $(call PackageFilter,$(MGMT_PKGS))
946 # attachdocs 947 # attachdocs
947 # 948 #
948 949
949 ALL_OTHER_TARGETS += attachdocs 950 ALL_OTHER_TARGETS += attachdocs
950 951
951 ATTACH_DOCDIR := $(JDK_API_DOCSDIR)/attach/spec 952 ATTACH_DOCDIR := $(JDK_API_DOCSDIR)/attach/spec
952 ATTACH2COREAPI := ../../$(JDKJRE2COREAPI) 953 ATTACH2COREAPI := ../../$(JDKJRE2COREAPI)
953 ATTACH_DOCTITLE := Attach API 954 ATTACH_DOCTITLE := Attach API
954 ATTACH_WINDOWTITLE := Attach API 955 ATTACH_WINDOWTITLE := Attach API
955 ATTACH_HEADER := <strong>Attach API</strong> 956 ATTACH_HEADER := <strong>Attach API</strong>
956 ATTACH_BOTTOM := $(call CommonBottom,$(ATTACH_FIRST_COPYRIGHT_YEAR)) 957 ATTACH_BOTTOM := $(call CommonBottom,$(ATTACH_FIRST_COPYRIGHT_YEAR))
957 # ATTACH_PKGS is located in NON_CORE_PKGS.gmk 958 # ATTACH_PKGS is located in NON_CORE_PKGS.gmk
958 959
959 ATTACH_INDEX_HTML = $(ATTACH_DOCDIR)/index.html 960 ATTACH_INDEX_HTML = $(ATTACH_DOCDIR)/index.html
960 ATTACH_OPTIONS_FILE = $(DOCSTMPDIR)/attach.options 961 ATTACH_OPTIONS_FILE = $(DOCSTMPDIR)/attach.options
961 ATTACH_PACKAGES_FILE = $(DOCSTMPDIR)/attach.packages 962 ATTACH_PACKAGES_FILE = $(DOCSTMPDIR)/attach.packages
962 963
963 attachdocs: $(ATTACH_INDEX_HTML) 964 attachdocs: $(ATTACH_INDEX_HTML)
964 965
965 # Set relative location to core api document root 966 # Set relative location to core api document root
968 # Run javadoc if the index file is out of date or missing 969 # Run javadoc if the index file is out of date or missing
969 $(ATTACH_INDEX_HTML): $(ATTACH_OPTIONS_FILE) $(ATTACH_PACKAGES_FILE) coredocs 970 $(ATTACH_INDEX_HTML): $(ATTACH_OPTIONS_FILE) $(ATTACH_PACKAGES_FILE) coredocs
970 $(prep-javadoc) 971 $(prep-javadoc)
971 $(call JavadocSummary,$(ATTACH_OPTIONS_FILE),$(ATTACH_PACKAGES_FILE)) 972 $(call JavadocSummary,$(ATTACH_OPTIONS_FILE),$(ATTACH_PACKAGES_FILE))
972 $(JAVADOC_CMD) -d $(@D) \ 973 $(JAVADOC_CMD) -d $(@D) \
973 @$(ATTACH_OPTIONS_FILE) @$(ATTACH_PACKAGES_FILE) 974 @$(ATTACH_OPTIONS_FILE) @$(ATTACH_PACKAGES_FILE)
974 975
975 # Create file with javadoc options in it 976 # Create file with javadoc options in it
976 $(ATTACH_OPTIONS_FILE): 977 $(ATTACH_OPTIONS_FILE):
977 $(prep-target) 978 $(prep-target)
978 @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \ 979 @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
979 $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \ 980 $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
980 $(call OptionPair,-encoding,ascii) ; \ 981 $(call OptionPair,-encoding,ascii) ; \
981 $(call OptionOnly,-nodeprecatedlist) ; \ 982 $(call OptionOnly,-nodeprecatedlist) ; \
982 $(call OptionPair,-doctitle,$(ATTACH_DOCTITLE)) ; \ 983 $(call OptionPair,-doctitle,$(ATTACH_DOCTITLE)) ; \
983 $(call OptionPair,-windowtitle,$(ATTACH_WINDOWTITLE) $(DRAFT_WINTITLE));\ 984 $(call OptionPair,-windowtitle,$(ATTACH_WINDOWTITLE) $(DRAFT_WINTITLE)); \
984 $(call OptionPair,-header,$(ATTACH_HEADER)$(DRAFT_HEADER)) ; \ 985 $(call OptionPair,-header,$(ATTACH_HEADER)$(DRAFT_HEADER)) ; \
985 $(call OptionPair,-bottom,$(ATTACH_BOTTOM)$(DRAFT_BOTTOM)) ; \ 986 $(call OptionPair,-bottom,$(ATTACH_BOTTOM)$(DRAFT_BOTTOM)) ; \
986 $(call OptionTrip,-linkoffline,$(ATTACH2COREAPI),$(COREAPI_DOCSDIR)/); \ 987 $(call OptionTrip,-linkoffline,$(ATTACH2COREAPI),$(COREAPI_DOCSDIR)/); \
987 ) >> $@ 988 ) >> $@
988 989
989 # Create a file with the package names in it 990 # Create a file with the package names in it
990 $(ATTACH_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(ATTACH_PKGS)) 991 $(ATTACH_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(ATTACH_PKGS))
991 $(prep-target) 992 $(prep-target)
992 $(call PackageFilter,$(ATTACH_PKGS)) 993 $(call PackageFilter,$(ATTACH_PKGS))
996 # jconsoledocs 997 # jconsoledocs
997 # 998 #
998 999
999 ALL_OTHER_TARGETS += jconsoledocs 1000 ALL_OTHER_TARGETS += jconsoledocs
1000 1001
1001 JCONSOLE_DOCDIR := $(JDK_API_DOCSDIR)/jconsole/spec 1002 JCONSOLE_DOCDIR := $(JDK_API_DOCSDIR)/jconsole/spec
1002 JCONSOLE2COREAPI := ../../$(JDKJRE2COREAPI) 1003 JCONSOLE2COREAPI := ../../$(JDKJRE2COREAPI)
1003 JCONSOLE_DOCTITLE := JConsole API 1004 JCONSOLE_DOCTITLE := JConsole API
1004 JCONSOLE_WINDOWTITLE := JConsole API 1005 JCONSOLE_WINDOWTITLE := JConsole API
1005 JCONSOLE_HEADER := <strong>JConsole API</strong> 1006 JCONSOLE_HEADER := <strong>JConsole API</strong>
1006 JCONSOLE_BOTTOM := $(call CommonBottom,$(JCONSOLE_FIRST_COPYRIGHT_YEAR)) 1007 JCONSOLE_BOTTOM := $(call CommonBottom,$(JCONSOLE_FIRST_COPYRIGHT_YEAR))
1007 # JCONSOLE_PKGS is located in NON_CORE_PKGS.gmk 1008 # JCONSOLE_PKGS is located in NON_CORE_PKGS.gmk
1008 1009
1009 JCONSOLE_INDEX_HTML = $(JCONSOLE_DOCDIR)/index.html 1010 JCONSOLE_INDEX_HTML = $(JCONSOLE_DOCDIR)/index.html
1010 JCONSOLE_OPTIONS_FILE = $(DOCSTMPDIR)/jconsole.options 1011 JCONSOLE_OPTIONS_FILE = $(DOCSTMPDIR)/jconsole.options
1011 JCONSOLE_PACKAGES_FILE = $(DOCSTMPDIR)/jconsole.packages 1012 JCONSOLE_PACKAGES_FILE = $(DOCSTMPDIR)/jconsole.packages
1012 1013
1013 jconsoledocs: $(JCONSOLE_INDEX_HTML) 1014 jconsoledocs: $(JCONSOLE_INDEX_HTML)
1014 1015
1015 # Set relative location to core api document root 1016 # Set relative location to core api document root
1018 # Run javadoc if the index file is out of date or missing 1019 # Run javadoc if the index file is out of date or missing
1019 $(JCONSOLE_INDEX_HTML): $(JCONSOLE_OPTIONS_FILE) $(JCONSOLE_PACKAGES_FILE) coredocs 1020 $(JCONSOLE_INDEX_HTML): $(JCONSOLE_OPTIONS_FILE) $(JCONSOLE_PACKAGES_FILE) coredocs
1020 $(prep-javadoc) 1021 $(prep-javadoc)
1021 $(call JavadocSummary,$(JCONSOLE_OPTIONS_FILE),$(JCONSOLE_PACKAGES_FILE)) 1022 $(call JavadocSummary,$(JCONSOLE_OPTIONS_FILE),$(JCONSOLE_PACKAGES_FILE))
1022 $(JAVADOC_CMD) -d $(@D) \ 1023 $(JAVADOC_CMD) -d $(@D) \
1023 @$(JCONSOLE_OPTIONS_FILE) @$(JCONSOLE_PACKAGES_FILE) 1024 @$(JCONSOLE_OPTIONS_FILE) @$(JCONSOLE_PACKAGES_FILE)
1024 1025
1025 # Create file with javadoc options in it 1026 # Create file with javadoc options in it
1026 $(JCONSOLE_OPTIONS_FILE): 1027 $(JCONSOLE_OPTIONS_FILE):
1027 $(prep-target) 1028 $(prep-target)
1028 @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \ 1029 @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1029 $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \ 1030 $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1030 $(call OptionPair,-encoding,ascii) ; \ 1031 $(call OptionPair,-encoding,ascii) ; \
1031 $(call OptionOnly,-nodeprecatedlist) ; \ 1032 $(call OptionOnly,-nodeprecatedlist) ; \
1032 $(call OptionPair,-doctitle,$(JCONSOLE_DOCTITLE)) ; \ 1033 $(call OptionPair,-doctitle,$(JCONSOLE_DOCTITLE)) ; \
1033 $(call OptionPair,-windowtitle,$(JCONSOLE_WINDOWTITLE) $(DRAFT_WINTITLE));\ 1034 $(call OptionPair,-windowtitle,$(JCONSOLE_WINDOWTITLE) $(DRAFT_WINTITLE)); \
1034 $(call OptionPair,-header,$(JCONSOLE_HEADER)$(DRAFT_HEADER)) ; \ 1035 $(call OptionPair,-header,$(JCONSOLE_HEADER)$(DRAFT_HEADER)) ; \
1035 $(call OptionPair,-bottom,$(JCONSOLE_BOTTOM)$(DRAFT_BOTTOM)) ; \ 1036 $(call OptionPair,-bottom,$(JCONSOLE_BOTTOM)$(DRAFT_BOTTOM)) ; \
1036 $(call OptionTrip,-linkoffline,$(JCONSOLE2COREAPI),$(COREAPI_DOCSDIR)/); \ 1037 $(call OptionTrip,-linkoffline,$(JCONSOLE2COREAPI),$(COREAPI_DOCSDIR)/); \
1037 ) >> $@ 1038 ) >> $@
1038 1039
1039 # Create a file with the package names in it 1040 # Create a file with the package names in it
1040 $(JCONSOLE_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JCONSOLE_PKGS)) 1041 $(JCONSOLE_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JCONSOLE_PKGS))
1041 $(prep-target) 1042 $(prep-target)
1042 $(call PackageFilter,$(JCONSOLE_PKGS)) 1043 $(call PackageFilter,$(JCONSOLE_PKGS))
1046 # treeapidocs 1047 # treeapidocs
1047 # 1048 #
1048 1049
1049 ALL_OTHER_TARGETS += treeapidocs 1050 ALL_OTHER_TARGETS += treeapidocs
1050 1051
1051 TREEAPI_DOCDIR := $(JDK_API_DOCSDIR)/javac/tree 1052 TREEAPI_DOCDIR := $(JDK_API_DOCSDIR)/javac/tree
1052 TREEAPI2COREAPI := ../../$(JDKJRE2COREAPI) 1053 TREEAPI2COREAPI := ../../$(JDKJRE2COREAPI)
1053 TREEAPI_DOCTITLE := Compiler Tree API 1054 TREEAPI_DOCTITLE := Compiler Tree API
1054 TREEAPI_WINDOWTITLE := Compiler Tree API 1055 TREEAPI_WINDOWTITLE := Compiler Tree API
1055 TREEAPI_HEADER := <strong>Compiler Tree API</strong> 1056 TREEAPI_HEADER := <strong>Compiler Tree API</strong>
1056 TREEAPI_BOTTOM := $(call CommonBottom,$(TREEAPI_FIRST_COPYRIGHT_YEAR)) 1057 TREEAPI_BOTTOM := $(call CommonBottom,$(TREEAPI_FIRST_COPYRIGHT_YEAR))
1057 TREEAPI_GROUPNAME := Packages 1058 TREEAPI_GROUPNAME := Packages
1058 TREEAPI_REGEXP := com.sun.source.* 1059 TREEAPI_REGEXP := com.sun.source.*
1059 # TREEAPI_PKGS is located in NON_CORE_PKGS.gmk 1060 # TREEAPI_PKGS is located in NON_CORE_PKGS.gmk
1060 1061
1061 TREEAPI_INDEX_HTML = $(TREEAPI_DOCDIR)/index.html 1062 TREEAPI_INDEX_HTML = $(TREEAPI_DOCDIR)/index.html
1062 TREEAPI_OPTIONS_FILE = $(DOCSTMPDIR)/treeapi.options 1063 TREEAPI_OPTIONS_FILE = $(DOCSTMPDIR)/treeapi.options
1063 TREEAPI_PACKAGES_FILE = $(DOCSTMPDIR)/treeapi.packages 1064 TREEAPI_PACKAGES_FILE = $(DOCSTMPDIR)/treeapi.packages
1064 1065
1065 treeapidocs: $(TREEAPI_INDEX_HTML) 1066 treeapidocs: $(TREEAPI_INDEX_HTML)
1066 1067
1067 # Set relative location to core api document root 1068 # Set relative location to core api document root
1070 # Run javadoc if the index file is out of date or missing 1071 # Run javadoc if the index file is out of date or missing
1071 $(TREEAPI_INDEX_HTML): $(TREEAPI_OPTIONS_FILE) $(TREEAPI_PACKAGES_FILE) coredocs 1072 $(TREEAPI_INDEX_HTML): $(TREEAPI_OPTIONS_FILE) $(TREEAPI_PACKAGES_FILE) coredocs
1072 $(prep-javadoc) 1073 $(prep-javadoc)
1073 $(call JavadocSummary,$(TREEAPI_OPTIONS_FILE),$(TREEAPI_PACKAGES_FILE)) 1074 $(call JavadocSummary,$(TREEAPI_OPTIONS_FILE),$(TREEAPI_PACKAGES_FILE))
1074 $(JAVADOC_CMD) -d $(@D) \ 1075 $(JAVADOC_CMD) -d $(@D) \
1075 @$(TREEAPI_OPTIONS_FILE) @$(TREEAPI_PACKAGES_FILE) 1076 @$(TREEAPI_OPTIONS_FILE) @$(TREEAPI_PACKAGES_FILE)
1076 1077
1077 # Create file with javadoc options in it 1078 # Create file with javadoc options in it
1078 $(TREEAPI_OPTIONS_FILE): 1079 $(TREEAPI_OPTIONS_FILE):
1079 $(prep-target) 1080 $(prep-target)
1080 @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \ 1081 @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1081 $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \ 1082 $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1082 $(call OptionPair,-encoding,ascii) ; \ 1083 $(call OptionPair,-encoding,ascii) ; \
1083 $(call OptionPair,-doctitle,$(TREEAPI_DOCTITLE)) ; \ 1084 $(call OptionPair,-doctitle,$(TREEAPI_DOCTITLE)) ; \
1084 $(call OptionPair,-windowtitle,$(TREEAPI_WINDOWTITLE) $(DRAFT_WINTITLE));\ 1085 $(call OptionPair,-windowtitle,$(TREEAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
1085 $(call OptionPair,-header,$(TREEAPI_HEADER)$(DRAFT_HEADER)) ; \ 1086 $(call OptionPair,-header,$(TREEAPI_HEADER)$(DRAFT_HEADER)) ; \
1086 $(call OptionPair,-tag,$(TAG_JLS)) ; \ 1087 $(call OptionPair,-tag,$(TAG_JLS)) ; \
1087 $(call OptionPair,-bottom,$(TREEAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \ 1088 $(call OptionPair,-bottom,$(TREEAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
1088 $(call OptionTrip,-group,$(TREEAPI_GROUPNAME),$(TREEAPI_REGEXP)); \ 1089 $(call OptionTrip,-group,$(TREEAPI_GROUPNAME),$(TREEAPI_REGEXP)); \
1089 $(call OptionTrip,-linkoffline,$(TREEAPI2COREAPI),$(COREAPI_DOCSDIR)/); \ 1090 $(call OptionTrip,-linkoffline,$(TREEAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
1090 ) >> $@ 1091 ) >> $@
1091 1092
1092 # Create a file with the package names in it 1093 # Create a file with the package names in it
1093 $(TREEAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TREEAPI_PKGS)) 1094 $(TREEAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TREEAPI_PKGS))
1094 $(prep-target) 1095 $(prep-target)
1095 $(call PackageFilter,$(TREEAPI_PKGS)) 1096 $(call PackageFilter,$(TREEAPI_PKGS))
1099 # sctpdocs 1100 # sctpdocs
1100 # 1101 #
1101 1102
1102 ALL_OTHER_TARGETS += sctpdocs 1103 ALL_OTHER_TARGETS += sctpdocs
1103 1104
1104 SCTPAPI_DOCDIR := $(JRE_API_DOCSDIR)/nio/sctp/spec 1105 SCTPAPI_DOCDIR := $(JRE_API_DOCSDIR)/nio/sctp/spec
1105 SCTPAPI2COREAPI := ../../../$(JDKJRE2COREAPI) 1106 SCTPAPI2COREAPI := ../../../$(JDKJRE2COREAPI)
1106 SCTPAPI_DOCTITLE := SCTP API 1107 SCTPAPI_DOCTITLE := SCTP API
1107 SCTPAPI_WINDOWTITLE := SCTP API 1108 SCTPAPI_WINDOWTITLE := SCTP API
1108 SCTPAPI_HEADER := <strong>SCTP API</strong> 1109 SCTPAPI_HEADER := <strong>SCTP API</strong>
1109 SCTPAPI_BOTTOM := $(call CommonBottom,$(SCTPAPI_FIRST_COPYRIGHT_YEAR)) 1110 SCTPAPI_BOTTOM := $(call CommonBottom,$(SCTPAPI_FIRST_COPYRIGHT_YEAR))
1110 # SCTPAPI_PKGS is located in NON_CORE_PKGS.gmk 1111 # SCTPAPI_PKGS is located in NON_CORE_PKGS.gmk
1111 1112
1112 SCTPAPI_INDEX_HTML = $(SCTPAPI_DOCDIR)/index.html 1113 SCTPAPI_INDEX_HTML = $(SCTPAPI_DOCDIR)/index.html
1113 SCTPAPI_OPTIONS_FILE = $(DOCSTMPDIR)/sctp.options 1114 SCTPAPI_OPTIONS_FILE = $(DOCSTMPDIR)/sctp.options
1114 SCTPAPI_PACKAGES_FILE = $(DOCSTMPDIR)/sctp.packages 1115 SCTPAPI_PACKAGES_FILE = $(DOCSTMPDIR)/sctp.packages
1115 1116
1116 sctpdocs: $(SCTPAPI_INDEX_HTML) 1117 sctpdocs: $(SCTPAPI_INDEX_HTML)
1117 1118
1118 # Set relative location to core api document root 1119 # Set relative location to core api document root
1121 # Run javadoc if the index file is out of date or missing 1122 # Run javadoc if the index file is out of date or missing
1122 $(SCTPAPI_INDEX_HTML): $(SCTPAPI_OPTIONS_FILE) $(SCTPAPI_PACKAGES_FILE) coredocs 1123 $(SCTPAPI_INDEX_HTML): $(SCTPAPI_OPTIONS_FILE) $(SCTPAPI_PACKAGES_FILE) coredocs
1123 $(prep-javadoc) 1124 $(prep-javadoc)
1124 $(call JavadocSummary,$(SCTPAPI_OPTIONS_FILE),$(SCTPAPI_PACKAGES_FILE)) 1125 $(call JavadocSummary,$(SCTPAPI_OPTIONS_FILE),$(SCTPAPI_PACKAGES_FILE))
1125 $(JAVADOC_CMD) -d $(@D) \ 1126 $(JAVADOC_CMD) -d $(@D) \
1126 @$(SCTPAPI_OPTIONS_FILE) @$(SCTPAPI_PACKAGES_FILE) 1127 @$(SCTPAPI_OPTIONS_FILE) @$(SCTPAPI_PACKAGES_FILE)
1127 1128
1128 # Create file with javadoc options in it 1129 # Create file with javadoc options in it
1129 $(SCTPAPI_OPTIONS_FILE): 1130 $(SCTPAPI_OPTIONS_FILE):
1130 $(prep-target) 1131 $(prep-target)
1131 @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \ 1132 @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
1132 $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \ 1133 $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
1133 $(call OptionPair,-encoding,ascii) ; \ 1134 $(call OptionPair,-encoding,ascii) ; \
1134 $(call OptionOnly,-nodeprecatedlist) ; \ 1135 $(call OptionOnly,-nodeprecatedlist) ; \
1135 $(call OptionPair,-doctitle,$(SCTPAPI_DOCTITLE)) ; \ 1136 $(call OptionPair,-doctitle,$(SCTPAPI_DOCTITLE)) ; \
1136 $(call OptionPair,-windowtitle,$(SCTPAPI_WINDOWTITLE) $(DRAFT_WINTITLE));\ 1137 $(call OptionPair,-windowtitle,$(SCTPAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
1137 $(call OptionPair,-header,$(SCTPAPI_HEADER)$(DRAFT_HEADER)) ; \ 1138 $(call OptionPair,-header,$(SCTPAPI_HEADER)$(DRAFT_HEADER)) ; \
1138 $(call OptionPair,-bottom,$(SCTPAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \ 1139 $(call OptionPair,-bottom,$(SCTPAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
1139 $(call OptionTrip,-linkoffline,$(SCTPAPI2COREAPI),$(COREAPI_DOCSDIR)/); \ 1140 $(call OptionTrip,-linkoffline,$(SCTPAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
1140 ) >> $@ 1141 ) >> $@
1141 1142
1142 # Create a file with the package names in it 1143 # Create a file with the package names in it
1143 $(SCTPAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SCTPAPI_PKGS)) 1144 $(SCTPAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SCTPAPI_PKGS))
1144 $(prep-target) 1145 $(prep-target)
1145 $(call PackageFilter,$(SCTPAPI_PKGS)) 1146 $(call PackageFilter,$(SCTPAPI_PKGS))
1148 # 1149 #
1149 # Get a cache of all the directories 1150 # Get a cache of all the directories
1150 1151
1151 $(DIRECTORY_CACHE): $(ALL_EXISTING_SOURCE_DIRS) 1152 $(DIRECTORY_CACHE): $(ALL_EXISTING_SOURCE_DIRS)
1152 $(prep-target) 1153 $(prep-target)
1153 @for cp in $(ALL_EXISTING_SOURCE_DIRS) ; do \ 1154 @for cp in $(ALL_EXISTING_SOURCE_DIRS) ; do \
1154 $(ECHO) "$(FIND) $${cp} -type f >> $@"; \ 1155 $(ECHO) "$(FIND) $${cp} -type f >> $@"; \
1155 $(FIND) $${cp} -type f >> $@; \ 1156 $(FIND) $${cp} -type f >> $@; \
1156 done 1157 done
1157 1158
1158 ############################################################# 1159 #############################################################
1159 #release version of core packages ######## 1160 #release version of core packages ########
1160 # Maximize performance and ensure that build number & milestone are set. 1161 # Maximize performance and ensure that build number & milestone are set.
1175 # DEBUG TARGET 1176 # DEBUG TARGET
1176 # List the values defined in the makefile hierarchy, to make sure everything 1177 # List the values defined in the makefile hierarchy, to make sure everything
1177 # is set properly, and to help identify values we can use instead of making new ones. 1178 # is set properly, and to help identify values we can use instead of making new ones.
1178 # (Most of them come from common/shared/Defs.gmk) 1179 # (Most of them come from common/shared/Defs.gmk)
1179 # 1180 #
1180 # Notes: 1181 # Notes:
1181 # * BUILD_NUMBER defaults to b00 if not set on command line with BUILD_NUMBER=<value> 1182 # * BUILD_NUMBER defaults to b00 if not set on command line with BUILD_NUMBER=<value>
1182 # * MILESTONE defaults to internal unless set to beta, rc, or fcs on command line 1183 # * MILESTONE defaults to internal unless set to beta, rc, or fcs on command line
1183 # 1184 #
1184 1185
1185 ############################################################# 1186 #############################################################
1186 .PHONY: all docs coredocs rel-docs otherdocs rel-coredocs \ 1187 .PHONY: all docs coredocs rel-docs otherdocs rel-coredocs \
1187 sanitycheckcoredocs $(ALL_OTHER_TARGETS) 1188 sanitycheckcoredocs $(ALL_OTHER_TARGETS)

Mercurial Repository: jdk8-mips64-public

mercurial