mirror of
https://github.com/openjdk/jdk.git
synced 2026-04-07 21:48:41 +00:00
7025412: make381 issues with quotes in jdk/make/docs/Makefile and other places
Reviewed-by: mchung, herrick
This commit is contained in:
Kelly O'Hair
parent
8469345e05
commit
5fccff3de9
@ -64,7 +64,7 @@ COPYRIGHT_SYMBOL = &\#x00a9;
|
||||
# Macro to construct the copyright line
|
||||
# (The GNU make 3.78.1 "if" conditional is broken, fixed in GNU make 3.81)
|
||||
define CopyrightLine # optionalurl optionalfirstyear optionaladdress
|
||||
$(if $(strip $1),<a href=\"$(strip $1)\">Copyright</a>,Copyright) \
|
||||
$(if $(strip $1),<a href="$(strip $1)">Copyright</a>,Copyright) \
|
||||
$(COPYRIGHT_SYMBOL) $(if $2,$2${COMMA},) $(COPYRIGHT_YEAR),\
|
||||
$(FULL_COMPANY_NAME). $3 All rights reserved.
|
||||
endef
|
||||
|
||||
@ -113,7 +113,7 @@ ifeq ($(PLATFORM), linux)
|
||||
ALSA_INCLUDE=/usr/include/alsa/version.h
|
||||
ALSA_LIBRARY=/usr/lib/libasound.so
|
||||
_ALSA_VERSION := $(shell $(EGREP) SND_LIB_VERSION_STR $(ALSA_INCLUDE) | \
|
||||
$(SED) -e 's@.*\"\(.*\)\".*@\1@' )
|
||||
$(SED) -e 's@.*"\(.*\)".*@\1@' )
|
||||
ALSA_VERSION := $(call GetVersion,$(_ALSA_VERSION))
|
||||
endif
|
||||
|
||||
@ -333,12 +333,12 @@ sane-locale:
|
||||
ifneq ($(PLATFORM), windows)
|
||||
@if [ "$(LC_ALL)" != "" -a "$(LC_ALL)" != "C" ]; then \
|
||||
$(ECHO) "WARNING: LC_ALL has been set to $(LC_ALL), this can cause build failures. \n" \
|
||||
" Try setting LC_ALL to \"C\". \n" \
|
||||
" Try setting LC_ALL to 'C'. \n" \
|
||||
"" >> $(WARNING_FILE) ; \
|
||||
fi
|
||||
@if [ "$(LANG)" != "" -a "$(LANG)" != "C" ]; then \
|
||||
$(ECHO) "WARNING: LANG has been set to $(LANG), this can cause build failures. \n" \
|
||||
" Try setting LANG to \"C\". \n" \
|
||||
" Try setting LANG to 'C'. \n" \
|
||||
"" >> $(WARNING_FILE) ; \
|
||||
fi
|
||||
endif
|
||||
@ -1327,9 +1327,9 @@ ifdef LINK_VER
|
||||
fi
|
||||
@if [ "$(LINK_CHECK)" != "same" ]; then \
|
||||
$(ECHO) "WARNING: To build Java 2 SDK $(JDK_VERSION) you need : \n" \
|
||||
" $(REQUIRED_COMPILER_VERSION) - link.exe version \"$(REQUIRED_LINK_VER)\" \n" \
|
||||
" $(REQUIRED_COMPILER_VERSION) - link.exe version '$(REQUIRED_LINK_VER)' \n" \
|
||||
" Specifically the $(REQUIRED_COMPILER_NAME) link.exe. \n " \
|
||||
" $(YOU_ARE_USING) Linker version \"$(LINK_VER)\" \n" \
|
||||
" $(YOU_ARE_USING) Linker version '$(LINK_VER)' \n" \
|
||||
"" >> $(WARNING_FILE) ; \
|
||||
fi
|
||||
endif
|
||||
|
||||
@ -43,7 +43,7 @@ COPYRIGHT_URL = $(COPYRIGHT_URL-$(JDK_MINOR_VERSION))
|
||||
BUG_SUBMIT_URL = http://bugs.sun.com/services/bugreport/index.jsp
|
||||
|
||||
# Common line for how to submit a bug or rfe
|
||||
BUG_SUBMIT_LINE = <a href=\"$(BUG_SUBMIT_URL)\">Submit a bug or feature</a>
|
||||
BUG_SUBMIT_LINE = <a href="$(BUG_SUBMIT_URL)">Submit a bug or feature</a>
|
||||
|
||||
# Url to devdocs page
|
||||
# Was: http://java.sun.com/javase/6/webnotes/devdocs-vs-specs.html
|
||||
@ -166,21 +166,32 @@ JDKJRE2COREAPI = ../../api
|
||||
|
||||
# Common bottom argument
|
||||
define CommonBottom # year
|
||||
<font size=\"-1\"><br> $(call CopyrightLine,,$1,)</font>
|
||||
<font size="-1"><br> $(call CopyrightLine,,$1,)</font>
|
||||
endef
|
||||
|
||||
# Common trademark bottom argument (Not sure why this is used sometimes)
|
||||
define CommonTrademarkBottom # year
|
||||
<font size=\"-1\">\
|
||||
<font size="-1">\
|
||||
$(BUG_SUBMIT_LINE)<br>$(JAVA_TRADEMARK_LINE)<br>\
|
||||
$(call CopyrightLine,,$1,$(COMPANY_ADDRESS))\
|
||||
</font>
|
||||
endef
|
||||
|
||||
# Common echo of option
|
||||
define OptionOnly # opt
|
||||
$(PRINTF) "%s\n" "$1"
|
||||
endef
|
||||
define OptionPair # opt arg
|
||||
$(PRINTF) "%s '%s'\n" "$1" '$2'
|
||||
endef
|
||||
define OptionTrip # opt arg arg
|
||||
$(PRINTF) "%s '%s' '%s'\n" "$1" '$2' '$3'
|
||||
endef
|
||||
|
||||
# Core api bottom argument (with special sauce)
|
||||
COREAPI_BOTTOM = <font size=\"-1\"> $(BUG_SUBMIT_LINE)\
|
||||
COREAPI_BOTTOM = <font size="-1"> $(BUG_SUBMIT_LINE)\
|
||||
<br>For further API reference and developer documentation, \
|
||||
see <a href=\"$(DEV_DOCS_URL)\" target=\"_blank\">Java SE Documentation</a>. \
|
||||
see <a href="$(DEV_DOCS_URL)" target="_blank">Java SE Documentation</a>. \
|
||||
That documentation contains more detailed, developer-targeted descriptions, \
|
||||
with conceptual overviews, definitions of terms, workarounds, \
|
||||
and working code examples.<br>\
|
||||
@ -212,11 +223,11 @@ ifeq ($(JDK_IS_FCS),false)
|
||||
DRAFT_WINTITLE = $(BUILD_NUMBER)
|
||||
# Early access top text (not used in FCS releases)
|
||||
COREAPI_TOP_EARLYACCESS = \
|
||||
<div style=\"background-color: \#EEEEEE\"> \
|
||||
<div style=\"padding: 6px; margin-top: 2px; margin-bottom: 6px; \
|
||||
<div style="background-color: \#EEEEEE"> \
|
||||
<div style="padding: 6px; margin-top: 2px; margin-bottom: 6px; \
|
||||
margin-left: 6px; margin-right: 6px; text-align: justify; \
|
||||
font-size: 80%; font-family: Helvetica, Arial, sans-serif; \
|
||||
font-weight: normal;\"> \
|
||||
font-weight: normal;"> \
|
||||
Please note that the specifications and other information \
|
||||
contained herein are not final and are subject to change. \
|
||||
The information is being made available to you solely for purpose of \
|
||||
@ -281,15 +292,9 @@ COREAPI_WINDOWTITLE = Java Platform SE $(JDK_MINOR_VERSION)
|
||||
COREAPI_HEADER = \
|
||||
<strong>Java$(TRADEMARK) Platform<br>Standard Ed. $(JDK_MINOR_VERSION)</strong>
|
||||
|
||||
# Ignored tags
|
||||
IGNORED_TAGS = beaninfo revised since.unbundled spec specdefault Note ToDo
|
||||
|
||||
# Java language specification cite
|
||||
JLS3_CITE = <a href=\"$(JLS3_URL)\"> \
|
||||
The Java Language Specification, Third Edition</a>
|
||||
TAG_JLS3 = -tag 'jls3:a:See <cite>$(JLS3_CITE)</cite>:'
|
||||
|
||||
TAGS = $(IGNORED_TAGS:%=-tag %:X) $(TAG_JLS3)
|
||||
TAG_JLS3 = jls3:a:See <cite><a href="$(JLS3_URL)"> \
|
||||
The Java Language Specification, Third Edition</a></cite>:
|
||||
|
||||
# Overview file for core apis
|
||||
COREAPI_OVERVIEW = $(SHARE_SRC)/classes/overview-core.html
|
||||
@ -314,19 +319,26 @@ $(COREAPI_INDEX_FILE): $(COREAPI_OPTIONS_FILE) $(COREAPI_PACKAGES_FILE)
|
||||
# Create file with javadoc options in it
|
||||
$(COREAPI_OPTIONS_FILE): $(COREAPI_OVERVIEW)
|
||||
$(prep-target)
|
||||
@($(ECHO) "$(COMMON_JAVADOCFLAGS)" ; \
|
||||
$(ECHO) "-sourcepath \"$(RELEASEDOCS_SOURCEPATH)\"" ; \
|
||||
$(ECHO) "$(TAGS)" ; \
|
||||
$(ECHO) "-encoding ISO-8859-1" ; \
|
||||
$(ECHO) "-splitIndex" ; \
|
||||
$(ECHO) "-overview $(COREAPI_OVERVIEW)" ; \
|
||||
$(ECHO) "-doctitle '$(COREAPI_DOCTITLE)'" ; \
|
||||
$(ECHO) "-windowtitle '$(COREAPI_WINDOWTITLE) $(DRAFT_WINTITLE)'";\
|
||||
$(ECHO) "-header '$(COREAPI_HEADER)$(DRAFT_HEADER)'" ; \
|
||||
$(ECHO) "-bottom '$(COREAPI_BOTTOM)$(DRAFT_BOTTOM)'" ; \
|
||||
@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
|
||||
$(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
|
||||
$(call OptionPair,-encoding,ISO-8859-1) ; \
|
||||
$(call OptionPair,-tag,beaninfo:X) ; \
|
||||
$(call OptionPair,-tag,revised:X) ; \
|
||||
$(call OptionPair,-tag,since.unbundled:X) ; \
|
||||
$(call OptionPair,-tag,spec:X) ; \
|
||||
$(call OptionPair,-tag,specdefault:X) ; \
|
||||
$(call OptionPair,-tag,Note:X) ; \
|
||||
$(call OptionPair,-tag,ToDo:X) ; \
|
||||
$(call OptionPair,-tag,$(TAG_JLS3)) ; \
|
||||
$(call OptionOnly,-splitIndex) ; \
|
||||
$(call OptionPair,-overview,$(COREAPI_OVERVIEW)) ; \
|
||||
$(call OptionPair,-doctitle,$(COREAPI_DOCTITLE)) ; \
|
||||
$(call OptionPair,-windowtitle,$(COREAPI_WINDOWTITLE) $(DRAFT_WINTITLE)) ;\
|
||||
$(call OptionPair,-header,$(COREAPI_HEADER)$(DRAFT_HEADER)) ; \
|
||||
$(call OptionPair,-bottom,$(COREAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
|
||||
) >> $@
|
||||
ifdef COREAPI_TOP_EARLYACCESS
|
||||
@$(ECHO) "-top '$(COREAPI_TOP_EARLYACCESS)'" >> $@
|
||||
@$(call OptionPair,-top,$(COREAPI_TOP_EARLYACCESS)) >> $@
|
||||
endif
|
||||
|
||||
# Create a file with the package names in it
|
||||
@ -375,16 +387,16 @@ $(MIRROR_INDEX_FILE): $(MIRROR_OPTIONS_FILE) $(MIRROR_PACKAGES_FILE)
|
||||
# Create file with javadoc options in it
|
||||
$(MIRROR_OPTIONS_FILE): $(MIRROR_OVERVIEW)
|
||||
$(prep-target)
|
||||
@($(ECHO) "$(COMMON_JAVADOCFLAGS)" ; \
|
||||
$(ECHO) "-sourcepath \"$(RELEASEDOCS_SOURCEPATH)\"" ; \
|
||||
$(ECHO) "-encoding ascii" ; \
|
||||
$(ECHO) "-overview $(MIRROR_OVERVIEW)" ; \
|
||||
$(ECHO) "-doctitle '$(MIRROR_DOCTITLE)'" ; \
|
||||
$(ECHO) "-windowtitle '$(MIRROR_WINDOWTITLE) $(DRAFT_WINTITLE)'";\
|
||||
$(ECHO) "-header '$(MIRROR_HEADER)$(DRAFT_HEADER)'" ; \
|
||||
$(ECHO) "-bottom '$(MIRROR_BOTTOM)$(DRAFT_BOTTOM)'" ; \
|
||||
$(ECHO) "-group $(MIRROR_GROUPNAME) $(MIRROR_REGEXP)" ; \
|
||||
$(ECHO) "-linkoffline $(MIRROR2COREAPI) $(COREAPI_DOCSDIR)/"; \
|
||||
@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
|
||||
$(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
|
||||
$(call OptionPair,-encoding,ascii) ; \
|
||||
$(call OptionPair,-overview,$(MIRROR_OVERVIEW)) ; \
|
||||
$(call OptionPair,-doctitle,$(MIRROR_DOCTITLE)) ; \
|
||||
$(call OptionPair,-windowtitle,$(MIRROR_WINDOWTITLE) $(DRAFT_WINTITLE));\
|
||||
$(call OptionPair,-header,$(MIRROR_HEADER)$(DRAFT_HEADER)) ; \
|
||||
$(call OptionPair,-bottom,$(MIRROR_BOTTOM)$(DRAFT_BOTTOM)) ; \
|
||||
$(call OptionTrip,-group,$(MIRROR_GROUPNAME),$(MIRROR_REGEXP)); \
|
||||
$(call OptionTrip,-linkoffline,$(MIRROR2COREAPI),$(COREAPI_DOCSDIR)); \
|
||||
) >> $@
|
||||
|
||||
# Create a file with the package names in it
|
||||
@ -432,16 +444,16 @@ $(DOCLETAPI_INDEX_FILE): $(DOCLETAPI_OPTIONS_FILE) $(DOCLETAPI_PACKAGES_FILE)
|
||||
# Create file with javadoc options in it
|
||||
$(DOCLETAPI_OPTIONS_FILE):
|
||||
$(prep-target)
|
||||
@($(ECHO) "$(COMMON_JAVADOCFLAGS)" ; \
|
||||
$(ECHO) "-sourcepath \"$(RELEASEDOCS_SOURCEPATH)\"" ; \
|
||||
$(ECHO) "-breakiterator" ; \
|
||||
$(ECHO) "-encoding ascii" ; \
|
||||
$(ECHO) "-doctitle '$(DOCLETAPI_DOCTITLE)'" ; \
|
||||
$(ECHO) "-windowtitle '$(DOCLETAPI_WINDOWTITLE) $(DRAFT_WINTITLE)'";\
|
||||
$(ECHO) "-header '$(DOCLETAPI_HEADER)$(DRAFT_HEADER)'" ; \
|
||||
$(ECHO) "-bottom '$(DOCLETAPI_BOTTOM)$(DRAFT_BOTTOM)'" ; \
|
||||
$(ECHO) "-group $(DOCLETAPI_GROUPNAME) $(DOCLETAPI_REGEXP)" ; \
|
||||
$(ECHO) "-linkoffline $(DOCLETAPI2COREAPI) $(COREAPI_DOCSDIR)/"; \
|
||||
@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
|
||||
$(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
|
||||
$(call OptionPair,-encoding,ascii) ; \
|
||||
$(call OptionOnly,-breakiterator) ; \
|
||||
$(call OptionPair,-doctitle,$(DOCLETAPI_DOCTITLE)) ; \
|
||||
$(call OptionPair,-windowtitle,$(DOCLETAPI_WINDOWTITLE) $(DRAFT_WINTITLE));\
|
||||
$(call OptionPair,-header,$(DOCLETAPI_HEADER)$(DRAFT_HEADER)) ; \
|
||||
$(call OptionPair,-bottom,$(DOCLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
|
||||
$(call OptionTrip,-group,$(DOCLETAPI_GROUPNAME),$(DOCLETAPI_REGEXP)); \
|
||||
$(call OptionTrip,-linkoffline,$(DOCLETAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
|
||||
) >> $@
|
||||
|
||||
# Create a file with the package names in it
|
||||
@ -492,13 +504,13 @@ $(TAGLETAPI_INDEX_FILE): $(TAGLETAPI_OPTIONS_FILE) $(TAGLETAPI_PACKAGES_FILE)
|
||||
# Create file with javadoc options in it
|
||||
$(TAGLETAPI_OPTIONS_FILE):
|
||||
$(prep-target)
|
||||
@($(ECHO) "$(COMMON_JAVADOCFLAGS)" ; \
|
||||
$(ECHO) "-sourcepath \"$(RELEASEDOCS_SOURCEPATH)\"" ; \
|
||||
$(ECHO) "-encoding ascii" ; \
|
||||
$(ECHO) "-nonavbar" ; \
|
||||
$(ECHO) "-noindex" ; \
|
||||
$(ECHO) "-bottom '$(TAGLETAPI_BOTTOM)$(DRAFT_BOTTOM)'" ; \
|
||||
$(ECHO) "-linkoffline $(TAGLETAPI2COREAPI) $(COREAPI_DOCSDIR)/"; \
|
||||
@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
|
||||
$(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
|
||||
$(call OptionPair,-encoding,ascii) ; \
|
||||
$(call OptionOnly,-nonavbar) ; \
|
||||
$(call OptionOnly,-noindex) ; \
|
||||
$(call OptionPair,-bottom,$(TAGLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
|
||||
$(call OptionTrip,-linkoffline,$(TAGLETAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
|
||||
) >> $@
|
||||
|
||||
# Create a file with the package names in it
|
||||
@ -543,16 +555,16 @@ $(DOMAPI_INDEX_FILE): $(DOMAPI_OPTIONS_FILE) $(DOMAPI_PACKAGES_FILE)
|
||||
# Create file with javadoc options in it
|
||||
$(DOMAPI_OPTIONS_FILE):
|
||||
$(prep-target)
|
||||
@($(ECHO) "$(COMMON_JAVADOCFLAGS)" ; \
|
||||
$(ECHO) "-sourcepath \"$(RELEASEDOCS_SOURCEPATH)\"" ; \
|
||||
$(ECHO) "-encoding ascii" ; \
|
||||
$(ECHO) "-splitIndex" ; \
|
||||
$(ECHO) "-doctitle '$(DOMAPI_DOCTITLE)'" ; \
|
||||
$(ECHO) "-windowtitle '$(DOMAPI_WINDOWTITLE) $(DRAFT_WINTITLE)'";\
|
||||
$(ECHO) "-header '$(DOMAPI_HEADER)$(DRAFT_HEADER)'" ; \
|
||||
$(ECHO) "-bottom '$(DOMAPI_BOTTOM)$(DRAFT_BOTTOM)'" ; \
|
||||
$(ECHO) "-group $(DOMAPI_GROUPNAME) $(DOMAPI_REGEXP)" ; \
|
||||
$(ECHO) "-linkoffline $(DOMAPI2COREAPI) $(COREAPI_DOCSDIR)/" ; \
|
||||
@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
|
||||
$(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
|
||||
$(call OptionPair,-encoding,ascii) ; \
|
||||
$(call OptionOnly,-splitIndex) ; \
|
||||
$(call OptionPair,-doctitle,$(DOMAPI_DOCTITLE)) ; \
|
||||
$(call OptionPair,-windowtitle,$(DOMAPI_WINDOWTITLE) $(DRAFT_WINTITLE));\
|
||||
$(call OptionPair,-header,$(DOMAPI_HEADER)$(DRAFT_HEADER)) ; \
|
||||
$(call OptionPair,-bottom,$(DOMAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
|
||||
$(call OptionTrip,-group,$(DOMAPI_GROUPNAME),$(DOMAPI_REGEXP)); \
|
||||
$(call OptionTrip,-linkoffline,$(DOMAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
|
||||
) >> $@
|
||||
|
||||
# Create a file with the package names in it
|
||||
@ -605,15 +617,15 @@ $(JDI_INDEX_FILE): $(JDI_OPTIONS_FILE) $(JDI_PACKAGES_FILE)
|
||||
# Create file with javadoc options in it
|
||||
$(JDI_OPTIONS_FILE): $(JDI_OVERVIEW)
|
||||
$(prep-target)
|
||||
@($(ECHO) "$(COMMON_JAVADOCFLAGS)" ; \
|
||||
$(ECHO) "-sourcepath \"$(RELEASEDOCS_SOURCEPATH)\"" ; \
|
||||
$(ECHO) "-encoding ascii" ; \
|
||||
$(ECHO) "-overview $(JDI_OVERVIEW)" ; \
|
||||
$(ECHO) "-doctitle '$(JDI_DOCTITLE)'" ; \
|
||||
$(ECHO) "-windowtitle '$(JDI_WINDOWTITLE) $(DRAFT_WINTITLE)'" ; \
|
||||
$(ECHO) "-header '$(JDI_HEADER)$(DRAFT_HEADER)'" ; \
|
||||
$(ECHO) "-bottom '$(JDI_BOTTOM)$(DRAFT_BOTTOM)'" ; \
|
||||
$(ECHO) "-linkoffline $(JDI2COREAPI) $(COREAPI_DOCSDIR)/" ; \
|
||||
@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
|
||||
$(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
|
||||
$(call OptionPair,-encoding,ascii) ; \
|
||||
$(call OptionPair,-overview,$(JDI_OVERVIEW)) ; \
|
||||
$(call OptionPair,-doctitle,$(JDI_DOCTITLE)) ; \
|
||||
$(call OptionPair,-windowtitle,$(JDI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
|
||||
$(call OptionPair,-header,$(JDI_HEADER)$(DRAFT_HEADER)) ; \
|
||||
$(call OptionPair,-bottom,$(JDI_BOTTOM)$(DRAFT_BOTTOM)) ; \
|
||||
$(call OptionTrip,-linkoffline,$(JDI2COREAPI),$(COREAPI_DOCSDIR)/); \
|
||||
) >> $@
|
||||
|
||||
# Create a file with the package names in it
|
||||
@ -693,15 +705,15 @@ $(JAAS_INDEX_FILE): $(JAAS_OPTIONS_FILE) $(JAAS_PACKAGES_FILE)
|
||||
# Create file with javadoc options in it
|
||||
$(JAAS_OPTIONS_FILE): $(JAAS_OVERVIEW)
|
||||
$(prep-target)
|
||||
@($(ECHO) "$(COMMON_JAVADOCFLAGS)" ; \
|
||||
$(ECHO) "-sourcepath \"$(RELEASEDOCS_SOURCEPATH)\"" ; \
|
||||
$(ECHO) "-encoding ascii" ; \
|
||||
$(ECHO) "-overview $(JAAS_OVERVIEW)" ; \
|
||||
$(ECHO) "-doctitle '$(JAAS_DOCTITLE)'" ; \
|
||||
$(ECHO) "-windowtitle '$(JAAS_WINDOWTITLE) $(DRAFT_WINTITLE)'"; \
|
||||
$(ECHO) "-header '$(JAAS_HEADER)$(DRAFT_HEADER)'" ; \
|
||||
$(ECHO) "-bottom '$(JAAS_BOTTOM)$(DRAFT_BOTTOM)'" ; \
|
||||
$(ECHO) "-linkoffline $(JAAS2COREAPI) $(COREAPI_DOCSDIR)/" ; \
|
||||
@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
|
||||
$(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
|
||||
$(call OptionPair,-encoding,ascii) ; \
|
||||
$(call OptionPair,-overview,$(JAAS_OVERVIEW)) ; \
|
||||
$(call OptionPair,-doctitle,$(JAAS_DOCTITLE)) ; \
|
||||
$(call OptionPair,-windowtitle,$(JAAS_WINDOWTITLE) $(DRAFT_WINTITLE)); \
|
||||
$(call OptionPair,-header,$(JAAS_HEADER)$(DRAFT_HEADER)) ; \
|
||||
$(call OptionPair,-bottom,$(JAAS_BOTTOM)$(DRAFT_BOTTOM)) ; \
|
||||
$(call OptionTrip,-linkoffline,$(JAAS2COREAPI),$(COREAPI_DOCSDIR)/); \
|
||||
) >> $@
|
||||
|
||||
# Create a file with the package names in it
|
||||
@ -745,16 +757,16 @@ $(JGSS_INDEX_FILE): $(JGSS_OPTIONS_FILE) $(JGSS_PACKAGES_FILE)
|
||||
# Create file with javadoc options in it
|
||||
$(JGSS_OPTIONS_FILE): $(JGSS_OVERVIEW)
|
||||
$(prep-target)
|
||||
@($(ECHO) "$(COMMON_JAVADOCFLAGS)" ; \
|
||||
$(ECHO) "-sourcepath \"$(RELEASEDOCS_SOURCEPATH)\"" ; \
|
||||
$(ECHO) "-encoding ascii" ; \
|
||||
$(ECHO) "-nodeprecatedlist" ; \
|
||||
$(ECHO) "-overview $(JGSS_OVERVIEW)" ; \
|
||||
$(ECHO) "-doctitle '$(JGSS_DOCTITLE)'" ; \
|
||||
$(ECHO) "-windowtitle '$(JGSS_WINDOWTITLE) $(DRAFT_WINTITLE)'"; \
|
||||
$(ECHO) "-header '$(JGSS_HEADER)$(DRAFT_HEADER)'" ; \
|
||||
$(ECHO) "-bottom '$(JGSS_BOTTOM)$(DRAFT_BOTTOM)'" ; \
|
||||
$(ECHO) "-linkoffline $(JGSS2COREAPI) $(COREAPI_DOCSDIR)/" ; \
|
||||
@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
|
||||
$(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
|
||||
$(call OptionPair,-encoding,ascii) ; \
|
||||
$(call OptionOnly,-nodeprecatedlist) ; \
|
||||
$(call OptionPair,-overview,$(JGSS_OVERVIEW)) ; \
|
||||
$(call OptionPair,-doctitle,$(JGSS_DOCTITLE)) ; \
|
||||
$(call OptionPair,-windowtitle,$(JGSS_WINDOWTITLE) $(DRAFT_WINTITLE)); \
|
||||
$(call OptionPair,-header,$(JGSS_HEADER)$(DRAFT_HEADER)) ; \
|
||||
$(call OptionPair,-bottom,$(JGSS_BOTTOM)$(DRAFT_BOTTOM)) ; \
|
||||
$(call OptionTrip,-linkoffline,$(JGSS2COREAPI),$(COREAPI_DOCSDIR)/); \
|
||||
) >> $@
|
||||
|
||||
# Create a file with the package names in it
|
||||
@ -797,15 +809,15 @@ $(SMARTCARDIO_INDEX_FILE): $(SMARTCARDIO_OPTIONS_FILE) $(SMARTCARDIO_PACKAGES_FI
|
||||
# Create file with javadoc options in it
|
||||
$(SMARTCARDIO_OPTIONS_FILE):
|
||||
$(prep-target)
|
||||
@($(ECHO) "$(COMMON_JAVADOCFLAGS)" ; \
|
||||
$(ECHO) "-sourcepath \"$(RELEASEDOCS_SOURCEPATH)\"" ; \
|
||||
$(ECHO) "-encoding ascii" ; \
|
||||
$(ECHO) "-nodeprecatedlist" ; \
|
||||
$(ECHO) "-doctitle '$(SMARTCARDIO_DOCTITLE)'" ; \
|
||||
$(ECHO) "-windowtitle '$(SMARTCARDIO_WINDOWTITLE) $(DRAFT_WINTITLE)'";\
|
||||
$(ECHO) "-header '$(SMARTCARDIO_HEADER)$(DRAFT_HEADER)'" ; \
|
||||
$(ECHO) "-bottom '$(SMARTCARDIO_BOTTOM)$(DRAFT_BOTTOM)'" ; \
|
||||
$(ECHO) "-linkoffline $(SMARTCARDIO2COREAPI) $(COREAPI_DOCSDIR)/"; \
|
||||
@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
|
||||
$(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
|
||||
$(call OptionPair,-encoding,ascii) ; \
|
||||
$(call OptionOnly,-nodeprecatedlist) ; \
|
||||
$(call OptionPair,-doctitle,$(SMARTCARDIO_DOCTITLE)) ; \
|
||||
$(call OptionPair,-windowtitle,$(SMARTCARDIO_WINDOWTITLE) $(DRAFT_WINTITLE));\
|
||||
$(call OptionPair,-header,$(SMARTCARDIO_HEADER)$(DRAFT_HEADER)); \
|
||||
$(call OptionPair,-bottom,$(SMARTCARDIO_BOTTOM)$(DRAFT_BOTTOM)); \
|
||||
$(call OptionTrip,-linkoffline,$(SMARTCARDIO2COREAPI),$(COREAPI_DOCSDIR)/); \
|
||||
) >> $@
|
||||
|
||||
# Create a file with the package names in it
|
||||
@ -847,15 +859,15 @@ $(HTTPSERVER_INDEX_HTML): $(HTTPSERVER_OPTIONS_FILE) $(HTTPSERVER_PACKAGES_FILE)
|
||||
# Create file with javadoc options in it
|
||||
$(HTTPSERVER_OPTIONS_FILE):
|
||||
$(prep-target)
|
||||
@($(ECHO) "$(COMMON_JAVADOCFLAGS)" ; \
|
||||
$(ECHO) "-sourcepath \"$(RELEASEDOCS_SOURCEPATH)\"" ; \
|
||||
$(ECHO) "-encoding ascii" ; \
|
||||
$(ECHO) "-nodeprecatedlist" ; \
|
||||
$(ECHO) "-doctitle '$(HTTPSERVER_DOCTITLE)'" ; \
|
||||
$(ECHO) "-windowtitle '$(HTTPSERVER_WINDOWTITLE) $(DRAFT_WINTITLE)'";\
|
||||
$(ECHO) "-header '$(HTTPSERVER_HEADER)$(DRAFT_HEADER)'" ; \
|
||||
$(ECHO) "-bottom '$(HTTPSERVER_BOTTOM)$(DRAFT_BOTTOM)'" ; \
|
||||
$(ECHO) "-linkoffline $(HTTPSERVER2COREAPI) $(COREAPI_DOCSDIR)/"; \
|
||||
@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
|
||||
$(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
|
||||
$(call OptionPair,-encoding,ascii) ; \
|
||||
$(call OptionOnly,-nodeprecatedlist) ; \
|
||||
$(call OptionPair,-doctitle,$(HTTPSERVER_DOCTITLE)) ; \
|
||||
$(call OptionPair,-windowtitle,$(HTTPSERVER_WINDOWTITLE) $(DRAFT_WINTITLE));\
|
||||
$(call OptionPair,-header,$(HTTPSERVER_HEADER)$(DRAFT_HEADER)); \
|
||||
$(call OptionPair,-bottom,$(HTTPSERVER_BOTTOM)$(DRAFT_BOTTOM)); \
|
||||
$(call OptionTrip,-linkoffline,$(HTTPSERVER2COREAPI),$(COREAPI_DOCSDIR)/); \
|
||||
) >> $@
|
||||
|
||||
# Create a file with the package names in it
|
||||
@ -907,16 +919,16 @@ $(MGMT_INDEX_FILE): $(MGMT_OPTIONS_FILE) $(MGMT_PACKAGES_FILE)
|
||||
# Create file with javadoc options in it
|
||||
$(MGMT_OPTIONS_FILE): $(MGMT_OVERVIEW)
|
||||
$(prep-target)
|
||||
@($(ECHO) "$(COMMON_JAVADOCFLAGS)" ; \
|
||||
$(ECHO) "-sourcepath \"$(RELEASEDOCS_SOURCEPATH)\"" ; \
|
||||
$(ECHO) "-encoding ascii" ; \
|
||||
$(ECHO) "-nodeprecatedlist" ; \
|
||||
$(ECHO) "-overview $(MGMT_OVERVIEW)" ; \
|
||||
$(ECHO) "-doctitle '$(MGMT_DOCTITLE)'" ; \
|
||||
$(ECHO) "-windowtitle '$(MGMT_WINDOWTITLE) $(DRAFT_WINTITLE)'"; \
|
||||
$(ECHO) "-header '$(MGMT_HEADER)$(DRAFT_HEADER)'" ; \
|
||||
$(ECHO) "-bottom '$(MGMT_BOTTOM)$(DRAFT_BOTTOM)'" ; \
|
||||
$(ECHO) "-linkoffline $(MGMT2COREAPI) $(COREAPI_DOCSDIR)/" ; \
|
||||
@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
|
||||
$(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
|
||||
$(call OptionPair,-encoding,ascii) ; \
|
||||
$(call OptionOnly,-nodeprecatedlist) ; \
|
||||
$(call OptionPair,-overview,$(MGMT_OVERVIEW)) ; \
|
||||
$(call OptionPair,-doctitle,$(MGMT_DOCTITLE)) ; \
|
||||
$(call OptionPair,-windowtitle,$(MGMT_WINDOWTITLE) $(DRAFT_WINTITLE)); \
|
||||
$(call OptionPair,-header,$(MGMT_HEADER)$(DRAFT_HEADER)) ; \
|
||||
$(call OptionPair,-bottom,$(MGMT_BOTTOM)$(DRAFT_BOTTOM)) ; \
|
||||
$(call OptionTrip,-linkoffline,$(MGMT2COREAPI),$(COREAPI_DOCSDIR)/); \
|
||||
) >> $@
|
||||
|
||||
# Create a file with the package names in it
|
||||
@ -958,15 +970,15 @@ $(ATTACH_INDEX_HTML): $(ATTACH_OPTIONS_FILE) $(ATTACH_PACKAGES_FILE)
|
||||
# Create file with javadoc options in it
|
||||
$(ATTACH_OPTIONS_FILE):
|
||||
$(prep-target)
|
||||
@($(ECHO) "$(COMMON_JAVADOCFLAGS)" ; \
|
||||
$(ECHO) "-sourcepath \"$(RELEASEDOCS_SOURCEPATH)\"" ; \
|
||||
$(ECHO) "-encoding ascii" ; \
|
||||
$(ECHO) "-nodeprecatedlist" ; \
|
||||
$(ECHO) "-doctitle '$(ATTACH_DOCTITLE)'" ; \
|
||||
$(ECHO) "-windowtitle '$(ATTACH_WINDOWTITLE) $(DRAFT_WINTITLE)'";\
|
||||
$(ECHO) "-header '$(ATTACH_HEADER)$(DRAFT_HEADER)'" ; \
|
||||
$(ECHO) "-bottom '$(ATTACH_BOTTOM)$(DRAFT_BOTTOM)'" ; \
|
||||
$(ECHO) "-linkoffline $(ATTACH2COREAPI) $(COREAPI_DOCSDIR)/" ; \
|
||||
@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
|
||||
$(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
|
||||
$(call OptionPair,-encoding,ascii) ; \
|
||||
$(call OptionOnly,-nodeprecatedlist) ; \
|
||||
$(call OptionPair,-doctitle,$(ATTACH_DOCTITLE)) ; \
|
||||
$(call OptionPair,-windowtitle,$(ATTACH_WINDOWTITLE) $(DRAFT_WINTITLE));\
|
||||
$(call OptionPair,-header,$(ATTACH_HEADER)$(DRAFT_HEADER)) ; \
|
||||
$(call OptionPair,-bottom,$(ATTACH_BOTTOM)$(DRAFT_BOTTOM)) ; \
|
||||
$(call OptionTrip,-linkoffline,$(ATTACH2COREAPI),$(COREAPI_DOCSDIR)/); \
|
||||
) >> $@
|
||||
|
||||
# Create a file with the package names in it
|
||||
@ -1008,15 +1020,15 @@ $(JCONSOLE_INDEX_HTML): $(JCONSOLE_OPTIONS_FILE) $(JCONSOLE_PACKAGES_FILE)
|
||||
# Create file with javadoc options in it
|
||||
$(JCONSOLE_OPTIONS_FILE):
|
||||
$(prep-target)
|
||||
@($(ECHO) "$(COMMON_JAVADOCFLAGS)" ; \
|
||||
$(ECHO) "-sourcepath \"$(RELEASEDOCS_SOURCEPATH)\"" ; \
|
||||
$(ECHO) "-encoding ascii" ; \
|
||||
$(ECHO) "-nodeprecatedlist" ; \
|
||||
$(ECHO) "-doctitle '$(JCONSOLE_DOCTITLE)'" ; \
|
||||
$(ECHO) "-windowtitle '$(JCONSOLE_WINDOWTITLE) $(DRAFT_WINTITLE)'";\
|
||||
$(ECHO) "-header '$(JCONSOLE_HEADER)$(DRAFT_HEADER)'" ; \
|
||||
$(ECHO) "-bottom '$(JCONSOLE_BOTTOM)$(DRAFT_BOTTOM)'" ; \
|
||||
$(ECHO) "-linkoffline $(JCONSOLE2COREAPI) $(COREAPI_DOCSDIR)/"; \
|
||||
@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
|
||||
$(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
|
||||
$(call OptionPair,-encoding,ascii) ; \
|
||||
$(call OptionOnly,-nodeprecatedlist) ; \
|
||||
$(call OptionPair,-doctitle,$(JCONSOLE_DOCTITLE)) ; \
|
||||
$(call OptionPair,-windowtitle,$(JCONSOLE_WINDOWTITLE) $(DRAFT_WINTITLE));\
|
||||
$(call OptionPair,-header,$(JCONSOLE_HEADER)$(DRAFT_HEADER)) ; \
|
||||
$(call OptionPair,-bottom,$(JCONSOLE_BOTTOM)$(DRAFT_BOTTOM)) ; \
|
||||
$(call OptionTrip,-linkoffline,$(JCONSOLE2COREAPI),$(COREAPI_DOCSDIR)/); \
|
||||
) >> $@
|
||||
|
||||
# Create a file with the package names in it
|
||||
@ -1063,15 +1075,15 @@ $(TREEAPI_INDEX_HTML): $(TREEAPI_OPTIONS_FILE) $(TREEAPI_PACKAGES_FILE)
|
||||
# Create file with javadoc options in it
|
||||
$(TREEAPI_OPTIONS_FILE):
|
||||
$(prep-target)
|
||||
@($(ECHO) "$(COMMON_JAVADOCFLAGS)" ; \
|
||||
$(ECHO) "-sourcepath \"$(RELEASEDOCS_SOURCEPATH)\"" ; \
|
||||
$(ECHO) "-encoding ascii" ; \
|
||||
$(ECHO) "-doctitle '$(TREEAPI_DOCTITLE)'" ; \
|
||||
$(ECHO) "-windowtitle '$(TREEAPI_WINDOWTITLE) $(DRAFT_WINTITLE)'";\
|
||||
$(ECHO) "-header '$(TREEAPI_HEADER)$(DRAFT_HEADER)'" ; \
|
||||
$(ECHO) "-bottom '$(TREEAPI_BOTTOM)$(DRAFT_BOTTOM)'" ; \
|
||||
$(ECHO) "-group $(TREEAPI_GROUPNAME) $(TREEAPI_REGEXP)" ; \
|
||||
$(ECHO) "-linkoffline $(TREEAPI2COREAPI) $(COREAPI_DOCSDIR)/" ; \
|
||||
@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
|
||||
$(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
|
||||
$(call OptionPair,-encoding,ascii) ; \
|
||||
$(call OptionPair,-doctitle,$(TREEAPI_DOCTITLE)) ; \
|
||||
$(call OptionPair,-windowtitle,$(TREEAPI_WINDOWTITLE) $(DRAFT_WINTITLE));\
|
||||
$(call OptionPair,-header,$(TREEAPI_HEADER)$(DRAFT_HEADER)) ; \
|
||||
$(call OptionPair,-bottom,$(TREEAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
|
||||
$(call OptionTrip,-group,$(TREEAPI_GROUPNAME),$(TREEAPI_REGEXP)); \
|
||||
$(call OptionTrip,-linkoffline,$(TREEAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
|
||||
) >> $@
|
||||
|
||||
# Create a file with the package names in it
|
||||
@ -1113,15 +1125,15 @@ $(SCTPAPI_INDEX_HTML): $(SCTPAPI_OPTIONS_FILE) $(SCTPAPI_PACKAGES_FILE)
|
||||
# Create file with javadoc options in it
|
||||
$(SCTPAPI_OPTIONS_FILE):
|
||||
$(prep-target)
|
||||
@($(ECHO) "$(COMMON_JAVADOCFLAGS)" ; \
|
||||
$(ECHO) "-sourcepath \"$(RELEASEDOCS_SOURCEPATH)\"" ; \
|
||||
$(ECHO) "-encoding ascii" ; \
|
||||
$(ECHO) "-nodeprecatedlist" ; \
|
||||
$(ECHO) "-doctitle '$(SCTPAPI_DOCTITLE)'" ; \
|
||||
$(ECHO) "-windowtitle '$(SCTPAPI_WINDOWTITLE) $(DRAFT_WINTITLE)'";\
|
||||
$(ECHO) "-header '$(SCTPAPI_HEADER)$(DRAFT_HEADER)'" ; \
|
||||
$(ECHO) "-bottom '$(SCTPAPI_BOTTOM)$(DRAFT_BOTTOM)'" ; \
|
||||
$(ECHO) "-linkoffline $(SCTPAPI2COREAPI) $(COREAPI_DOCSDIR)/" ; \
|
||||
@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
|
||||
$(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
|
||||
$(call OptionPair,-encoding,ascii) ; \
|
||||
$(call OptionOnly,-nodeprecatedlist) ; \
|
||||
$(call OptionPair,-doctitle,$(SCTPAPI_DOCTITLE)) ; \
|
||||
$(call OptionPair,-windowtitle,$(SCTPAPI_WINDOWTITLE) $(DRAFT_WINTITLE));\
|
||||
$(call OptionPair,-header,$(SCTPAPI_HEADER)$(DRAFT_HEADER)) ; \
|
||||
$(call OptionPair,-bottom,$(SCTPAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
|
||||
$(call OptionTrip,-linkoffline,$(SCTPAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
|
||||
) >> $@
|
||||
|
||||
# Create a file with the package names in it
|
||||
@ -1163,15 +1175,15 @@ $(TRACING_INDEX_HTML): $(TRACING_OPTIONS_FILE) $(TRACING_PACKAGES_FILE)
|
||||
# Create file with javadoc options in it
|
||||
$(TRACING_OPTIONS_FILE):
|
||||
$(prep-target)
|
||||
@($(ECHO) "$(COMMON_JAVADOCFLAGS)" ; \
|
||||
$(ECHO) "-sourcepath \"$(RELEASEDOCS_SOURCEPATH)\"" ; \
|
||||
$(ECHO) "-encoding ascii" ; \
|
||||
$(ECHO) "-nodeprecatedlist" ; \
|
||||
$(ECHO) "-doctitle '$(TRACING_DOCTITLE)'" ; \
|
||||
$(ECHO) "-windowtitle '$(TRACING_WINDOWTITLE) $(DRAFT_WINTITLE)'";\
|
||||
$(ECHO) "-header '$(TRACING_HEADER)$(DRAFT_HEADER)'" ; \
|
||||
$(ECHO) "-bottom '$(TRACING_BOTTOM)$(DRAFT_BOTTOM)'" ; \
|
||||
$(ECHO) "-linkoffline $(TRACING2COREAPI) $(COREAPI_DOCSDIR)/" ; \
|
||||
@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
|
||||
$(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
|
||||
$(call OptionPair,-encoding,ascii) ; \
|
||||
$(call OptionOnly,-nodeprecatedlist) ; \
|
||||
$(call OptionPair,-doctitle,$(TRACING_DOCTITLE)) ; \
|
||||
$(call OptionPair,-windowtitle,$(TRACING_WINDOWTITLE) $(DRAFT_WINTITLE));\
|
||||
$(call OptionPair,-header,$(TRACING_HEADER)$(DRAFT_HEADER)) ; \
|
||||
$(call OptionPair,-bottom,$(TRACING_BOTTOM)$(DRAFT_BOTTOM)) ; \
|
||||
$(call OptionTrip,-linkoffline,$(TRACING2COREAPI),$(COREAPI_DOCSDIR)/); \
|
||||
) >> $@
|
||||
|
||||
# Create a file with the package names in it
|
||||
|
||||
@ -83,7 +83,7 @@ RELEASE_DIR = $(OUTPUTDIR)/jce-release
|
||||
|
||||
define release-warning
|
||||
@$(ECHO) \
|
||||
"\n***The jar files built by the \"release\" target must***" \
|
||||
"\n***The jar files built by the 'release' target must***" \
|
||||
"\n***still be checked into the closed workspace! ***" \
|
||||
$(README-MAKEFILE_WARNING)
|
||||
endef
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user