common/makefiles/javadoc/Javadoc.gmk

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

mercurial