ICU-12005 Fixed doc build problem with JDK 8. Added a build target 'docsStrict' which does all jlint check. Changed numeric character references in API doc with raw code points, so javadoc does not invalidate them in doclint.
X-SVN-Rev: 38444
This commit is contained in:
Yoshito Umaoka
parent
e68ab082c1
commit
a48cbfd993
@ -88,14 +88,13 @@
|
||||
<contains string="${java.version}" substring="1.8."/>
|
||||
</or>
|
||||
</condition>
|
||||
<condition property="is.pre.java8">
|
||||
|
||||
<condition property="is.java8.plus">
|
||||
<or>
|
||||
<contains string="${java.version}" substring="1.5."/>
|
||||
<contains string="${java.version}" substring="1.6."/>
|
||||
<contains string="${java.version}" substring="1.7."/>
|
||||
<contains string="${java.version}" substring="1.8."/>
|
||||
<contains string="${java.version}" substring="1.9."/>
|
||||
</or>
|
||||
</condition>
|
||||
|
||||
</condition>
|
||||
|
||||
<!-- Build environment info -->
|
||||
<property name="env.COMPUTERNAME" value="${env.HOSTNAME}"/>
|
||||
@ -766,6 +765,13 @@
|
||||
<!-- doc targets -->
|
||||
<target name="docs" depends="info, build-tools, _checkJCite, _docsWithJCite, _docsWithoutJCite" description="Build API documents"/>
|
||||
|
||||
<target name="docsStrict" description="Build API documents with all doclint check enabled">
|
||||
<condition property="doclint.option" value="-Xdoclint:all">
|
||||
<isset property="is.java8.plus"/>
|
||||
</condition>
|
||||
<antcall target="docs"/>
|
||||
</target>
|
||||
|
||||
<target name="_checkJCite" if="env.JCITE_DIR">
|
||||
<fileset dir="${env.JCITE_DIR}" id="jcite.files">
|
||||
<include name="build/*.jar"/>
|
||||
@ -787,20 +793,18 @@
|
||||
</condition>
|
||||
</target>
|
||||
|
||||
<!-- doclint in V8 is too strict to handle existing html in javadoc -->
|
||||
<!-- doclint options are: html, accessibiltiy, missing, reference, syntax -->
|
||||
<target name="_setLintV8" unless="is.pre.java8">
|
||||
<property name="lintParam" value="-Xdoclint:-html"/>
|
||||
</target>
|
||||
<target name="_setLintPreV8" if="is.pre.java8">
|
||||
<property name="lintParam" value=""/>
|
||||
<target name="_docsLintOption" unless="doclint.options">
|
||||
<!-- syntax check is disabled because JCite tag name "@.jcite" is invalidated -->
|
||||
<condition property="doclint.option" value="-Xdoclint:all,-accessibility,-syntax" else="">
|
||||
<isset property="is.java8.plus"/>
|
||||
</condition>
|
||||
</target>
|
||||
|
||||
<target name="_docsWithJCite" depends="_docsStyleSheet, _setLintV8, _setLintPreV8" if="jcite.libs">
|
||||
<target name="_docsWithJCite" depends="_docsStyleSheet, _docsLintOption" if="jcite.libs">
|
||||
<echo message="Javadoc lint option: ${doclint.option}"/>
|
||||
<echo message="JCite library path: ${jcite.libs}"/>
|
||||
<echo message="JCite additional source path: ${jcite.addl.src}"/>
|
||||
<echo message="Custom stylesheet: ${docs.style.sheet}"/>
|
||||
<echo message="lintParam: ${lintParam}"/>
|
||||
<javadoc
|
||||
destdir="${doc.dir}"
|
||||
nodeprecatedlist="true"
|
||||
@ -811,11 +815,11 @@
|
||||
docencoding="UTF-8"
|
||||
charset="UTF-8"
|
||||
bottom="<font size=-1>Copyright (c) ${current.year} IBM Corporation and others.</font>"
|
||||
additionalparam="${lintParam} -breakiterator -use -tagletpath ${icu4j.build-tools.jar}${path.separator}${jcite.libs} -taglet com.ibm.icu.dev.tool.docs.ICUTaglet -taglet ch.arrenbrecht.jcite.JCiteTaglet -J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=UTF-8"
|
||||
additionalparam="${doclint.option} -breakiterator -use -tagletpath ${icu4j.build-tools.jar}${path.separator}${jcite.libs} -taglet com.ibm.icu.dev.tool.docs.ICUTaglet -taglet ch.arrenbrecht.jcite.JCiteTaglet -J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=UTF-8"
|
||||
link="${icu4j.api.doc.jdk.link}"
|
||||
source="1.6"
|
||||
bootclasspath="${java6.bootclasspath}"
|
||||
stylesheetfile="${docs.style.sheet}">
|
||||
source="1.5"
|
||||
stylesheetfile="${docs.style.sheet}"
|
||||
failonerror="true">
|
||||
<packageset dir="${icu4j.core.dir}/src">
|
||||
<include name="com/ibm/icu/lang/**"/>
|
||||
<include name="com/ibm/icu/math/**"/>
|
||||
@ -834,8 +838,8 @@
|
||||
</javadoc>
|
||||
</target>
|
||||
|
||||
<target name="_docsWithoutJCite" unless="jcite.libs, _setLintV8, _setLintPreV8">
|
||||
<echo message="lintParam: ${lintParam}"/>
|
||||
<target name="_docsWithoutJCite" depends="_docsStyleSheet, _docsLintOption" unless="jcite.libs">
|
||||
<echo message="Javadoc lint option: ${doclint.option}"/>
|
||||
<javadoc
|
||||
destdir="${doc.dir}"
|
||||
nodeprecatedlist="true"
|
||||
@ -846,10 +850,10 @@
|
||||
docencoding="UTF-8"
|
||||
charset="UTF-8"
|
||||
bottom="<font size=-1>Copyright (c) ${current.year} IBM Corporation and others.</font>"
|
||||
additionalparam="${lintParam} -breakiterator -use -tagletpath ${icu4j.build-tools.jar} -taglet com.ibm.icu.dev.tool.docs.ICUTaglet"
|
||||
additionalparam="${doclint.option} -breakiterator -use -tagletpath ${icu4j.build-tools.jar} -taglet com.ibm.icu.dev.tool.docs.ICUTaglet"
|
||||
link="${icu4j.api.doc.jdk.link}"
|
||||
source="1.6"
|
||||
bootclasspath="${java6.bootclasspath}">
|
||||
source="1.5"
|
||||
failonerror="true">
|
||||
<packageset dir="${icu4j.core.dir}/src">
|
||||
<include name="com/ibm/icu/lang/**"/>
|
||||
<include name="com/ibm/icu/math/**"/>
|
||||
|
||||
@ -57,7 +57,7 @@ import com.ibm.icu.util.VersionInfo;
|
||||
* <li>TERTIARY strength: Upper and lower case differences in characters are
|
||||
* distinguished at tertiary strength (for example, "ao" < "Ao" <
|
||||
* "aò"). In addition, a variant of a letter differs from the base
|
||||
* form on the tertiary strength (such as "A" and "Ⓐ"). Another
|
||||
* form on the tertiary strength (such as "A" and "Ⓐ"). Another
|
||||
* example is the
|
||||
* difference between large and small Kana. A tertiary difference is ignored
|
||||
* when there is a primary or secondary difference anywhere in the strings.
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/*
|
||||
*******************************************************************************
|
||||
* Copyright (C) 2005-2014, International Business Machines Corporation and *
|
||||
* Copyright (C) 2005-2016, International Business Machines Corporation and *
|
||||
* others. All Rights Reserved. *
|
||||
*******************************************************************************
|
||||
*/
|
||||
@ -26,93 +26,91 @@ public final class CopticCalendar extends CECalendar
|
||||
private static final long serialVersionUID = 5903818751846742911L;
|
||||
|
||||
/**
|
||||
* Constant for ωογτ/تﻮﺗ,
|
||||
* Constant for ωογτ / تﻮﺗ,
|
||||
* the 1st month of the Coptic year.
|
||||
* @stable ICU 3.4
|
||||
*/
|
||||
public static final int TOUT = 0;
|
||||
|
||||
/**
|
||||
* Constant for Παοπι/ﻪﺑﺎﺑ,
|
||||
* Constant for Παοπι / ﻪﺑﺎﺑ,
|
||||
* the 2nd month of the Coptic year.
|
||||
* @stable ICU 3.4
|
||||
*/
|
||||
public static final int BABA = 1;
|
||||
|
||||
/**
|
||||
* Constant for Αθορ/رﻮﺗﺎﻫ,
|
||||
* Constant for Αθορ / رﻮﺗﺎﻫ,
|
||||
* the 3rd month of the Coptic year.
|
||||
* @stable ICU 3.4
|
||||
*/
|
||||
public static final int HATOR = 2;
|
||||
|
||||
/**
|
||||
* Constant for Χοιακ/ﻚﻬﻴﻛ,
|
||||
* Constant for Χοιακ / ﻚﻬﻴﻛ;,
|
||||
* the 4th month of the Coptic year.
|
||||
* @stable ICU 3.4
|
||||
*/
|
||||
public static final int KIAHK = 3;
|
||||
|
||||
/**
|
||||
* Constant for Τωβι/طﻮﺒﻫ,
|
||||
* Constant for Τωβι / طﻮﺒﻫ,
|
||||
* the 5th month of the Coptic year.
|
||||
* @stable ICU 3.4
|
||||
*/
|
||||
public static final int TOBA = 4;
|
||||
|
||||
/**
|
||||
* Constant for Μεϣιρ/ﺮﻴﺸﻣأ,
|
||||
* Constant for Μεϣιρ / ﺮﻴﺸﻣأ,
|
||||
* the 6th month of the Coptic year.
|
||||
* @stable ICU 3.4
|
||||
*/
|
||||
public static final int AMSHIR = 5;
|
||||
|
||||
/**
|
||||
* Constant for Παρεμϩατ/تﺎﻬﻣﺮﺑ,
|
||||
* Constant for Παρεμϩατ / تﺎﻬﻣﺮﺑ,
|
||||
* the 7th month of the Coptic year.
|
||||
* @stable ICU 3.4
|
||||
*/
|
||||
public static final int BARAMHAT = 6;
|
||||
|
||||
/**
|
||||
* Constant for Φαρμοθι/هدﻮﻣﺮﺑ,
|
||||
* Constant for Φαρμοθι / هدﻮﻣﺮﺑ,
|
||||
* the 8th month of the Coptic year.
|
||||
* @stable ICU 3.4
|
||||
*/
|
||||
public static final int BARAMOUDA = 7;
|
||||
|
||||
/**
|
||||
* Constant for Παϣαν/ﺲﻨﺸﺑ,
|
||||
* Constant for Παϣαν / ﺲﻨﺸﺑ;,
|
||||
* the 9th month of the Coptic year.
|
||||
* @stable ICU 3.4
|
||||
*/
|
||||
public static final int BASHANS = 8;
|
||||
|
||||
/**
|
||||
* Constant for Παωνι/ﻪﻧؤﻮﺑ,
|
||||
* Constant for Παωνι / ﻪﻧؤﻮﺑ,
|
||||
* the 10th month of the Coptic year.
|
||||
* @stable ICU 3.4
|
||||
*/
|
||||
public static final int PAONA = 9;
|
||||
|
||||
/**
|
||||
* Constant for Επηπ/ﺐﻴﺑأ,
|
||||
* Constant for Επηπ / ﺐﻴﺑأ,
|
||||
* the 11th month of the Coptic year.
|
||||
* @stable ICU 3.4
|
||||
*/
|
||||
public static final int EPEP = 10;
|
||||
|
||||
/**
|
||||
* Constant for Μεϲωρη/ىﺮﺴﻣ,
|
||||
* Constant for Μεϲωρη / ىﺮﺴﻣ,
|
||||
* the 12th month of the Coptic year.
|
||||
* @stable ICU 3.4
|
||||
*/
|
||||
public static final int MESRA = 11;
|
||||
|
||||
/**
|
||||
* Constant for Πικογϫι
|
||||
* μαβοτ/ﺮﻴﻐﺼﻟا
|
||||
* ﺮﻬﺸﻟا,
|
||||
* Constant for Πικογϫι μαβοτ / ﺮﻴﻐﺼﻟاﺮﻬﺸﻟا,
|
||||
* the 13th month of the Coptic year.
|
||||
* @stable ICU 3.4
|
||||
*/
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/*
|
||||
*******************************************************************************
|
||||
* Copyright (C) 2005-2014, International Business Machines Corporation and
|
||||
* Copyright (C) 2005-2016, International Business Machines Corporation and
|
||||
* others. All Rights Reserved.
|
||||
*******************************************************************************
|
||||
*/
|
||||
@ -29,79 +29,79 @@ public final class EthiopicCalendar extends CECalendar
|
||||
private static final long serialVersionUID = -2438495771339315608L;
|
||||
|
||||
/**
|
||||
* Constant for መስከረም, the 1st month of the Ethiopic year.
|
||||
* Constant for መስከረም, the 1st month of the Ethiopic year.
|
||||
* @stable ICU 3.4
|
||||
*/
|
||||
public static final int MESKEREM = 0;
|
||||
|
||||
/**
|
||||
* Constant for ጥቅምት, the 2nd month of the Ethiopic year.
|
||||
* Constant for ጥቅምት, the 2nd month of the Ethiopic year.
|
||||
* @stable ICU 3.4
|
||||
*/
|
||||
public static final int TEKEMT = 1;
|
||||
|
||||
/**
|
||||
* Constant for ኅዳር, the 3rd month of the Ethiopic year.
|
||||
* Constant for ኅዳር, the 3rd month of the Ethiopic year.
|
||||
* @stable ICU 3.4
|
||||
*/
|
||||
public static final int HEDAR = 2;
|
||||
|
||||
/**
|
||||
* Constant for ታኅሣሥ, the 4th month of the Ethiopic year.
|
||||
* Constant for ታኅሣሥ, the 4th month of the Ethiopic year.
|
||||
* @stable ICU 3.4
|
||||
*/
|
||||
public static final int TAHSAS = 3;
|
||||
|
||||
/**
|
||||
* Constant for ጥር, the 5th month of the Ethiopic year.
|
||||
* Constant for ጥር, the 5th month of the Ethiopic year.
|
||||
* @stable ICU 3.4
|
||||
*/
|
||||
public static final int TER = 4;
|
||||
|
||||
/**
|
||||
* Constant for የካቲት, the 6th month of the Ethiopic year.
|
||||
* Constant for የካቲት, the 6th month of the Ethiopic year.
|
||||
* @stable ICU 3.4
|
||||
*/
|
||||
public static final int YEKATIT = 5;
|
||||
|
||||
/**
|
||||
* Constant for መጋቢት, the 7th month of the Ethiopic year.
|
||||
* Constant for መጋቢት, the 7th month of the Ethiopic year.
|
||||
* @stable ICU 3.4
|
||||
*/
|
||||
public static final int MEGABIT = 6;
|
||||
|
||||
/**
|
||||
* Constant for ሚያዝያ, the 8th month of the Ethiopic year.
|
||||
* Constant for ሚያዝያ, the 8th month of the Ethiopic year.
|
||||
* @stable ICU 3.4
|
||||
*/
|
||||
public static final int MIAZIA = 7;
|
||||
|
||||
/**
|
||||
* Constant for ግንቦት, the 9th month of the Ethiopic year.
|
||||
* Constant for ግንቦት, the 9th month of the Ethiopic year.
|
||||
* @stable ICU 3.4
|
||||
*/
|
||||
public static final int GENBOT = 8;
|
||||
|
||||
/**
|
||||
* Constant for ሰኔ, the 10th month of the Ethiopic year.
|
||||
* Constant for ሰኔ, the 10th month of the Ethiopic year.
|
||||
* @stable ICU 3.4
|
||||
*/
|
||||
public static final int SENE = 9;
|
||||
|
||||
/**
|
||||
* Constant for ሐምሌ, the 11th month of the Ethiopic year.
|
||||
* Constant for ሐምሌ, the 11th month of the Ethiopic year.
|
||||
* @stable ICU 3.4
|
||||
*/
|
||||
public static final int HAMLE = 10;
|
||||
|
||||
/**
|
||||
* Constant for ነሐሴ, the 12th month of the Ethiopic year.
|
||||
* Constant for ነሐሴ, the 12th month of the Ethiopic year.
|
||||
* @stable ICU 3.4
|
||||
*/
|
||||
public static final int NEHASSE = 11;
|
||||
|
||||
/**
|
||||
* Constant for ጳጉሜን, the 13th month of the Ethiopic year.
|
||||
* Constant for ጳጉሜን, the 13th month of the Ethiopic year.
|
||||
* @stable ICU 3.4
|
||||
*/
|
||||
public static final int PAGUMEN = 12;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user