022d4ddcc1
The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/icu4j#646ab0b96bd370b0657498a457b7328ca78a52b7
106 lines
5.6 KiB
Diff
106 lines
5.6 KiB
Diff
From dc2458b2ec4fae2b4d75758362a4149334d101d7 Mon Sep 17 00:00:00 2001
|
|
From: Mat Booth <mat.booth@redhat.com>
|
|
Date: Fri, 24 Jul 2020 10:12:54 +0100
|
|
Subject: [PATCH 2/2] Use default doclet
|
|
|
|
---
|
|
build.xml | 26 ++++++--------------------
|
|
1 file changed, 6 insertions(+), 20 deletions(-)
|
|
|
|
diff --git a/build.xml b/build.xml
|
|
index 3dde055..883c535 100644
|
|
--- a/build.xml
|
|
+++ b/build.xml
|
|
@@ -423,7 +423,7 @@
|
|
</patternset>
|
|
|
|
<!-- meta build targets -->
|
|
- <target name="all" depends="info, main, tests, build-tools, tools, demos, samples, perf-tests, jar, docs" description="Build all primary targets"/>
|
|
+ <target name="all" depends="info, main, tests, tools, demos, samples, perf-tests, jar, docs" description="Build all primary targets"/>
|
|
<target name="main" depends="info, core, collate, charset, currdata, langdata, regiondata, translit, localespi" description="Build ICU4J runtime library classes"/>
|
|
<target name="tests" depends="info, core-tests, charset-tests, collate-tests, packaging-tests, translit-tests, localespi-tests" description="Build ICU4J test classes"/>
|
|
|
|
@@ -1261,7 +1261,7 @@
|
|
</target>
|
|
|
|
<!-- doc targets -->
|
|
- <target name="docs" depends="info, build-tools, _checkJCite, _docsWithJCite, _docsWithoutJCite" description="Build API documents"/>
|
|
+ <target name="docs" depends="info, _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">
|
|
@@ -1315,7 +1315,7 @@
|
|
docencoding="UTF-8"
|
|
charset="UTF-8"
|
|
bottom="${icu4j.api.doc.copyright.footer}"
|
|
- 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"
|
|
+ additionalparam="${doclint.option} -breakiterator -use -J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=UTF-8"
|
|
link="${icu4j.api.doc.jdk.link}"
|
|
source="1.7"
|
|
stylesheetfile="${docs.style.sheet}"
|
|
@@ -1351,7 +1351,7 @@
|
|
docencoding="UTF-8"
|
|
charset="UTF-8"
|
|
bottom="${icu4j.api.doc.copyright.footer}"
|
|
- additionalparam="${doclint.option} -breakiterator -use -tagletpath ${icu4j.build-tools.jar} -taglet com.ibm.icu.dev.tool.docs.ICUTaglet"
|
|
+ additionalparam="${doclint.option} -breakiterator -use"
|
|
link="${icu4j.api.doc.jdk.link}"
|
|
source="1.7"
|
|
failonerror="true">
|
|
@@ -1396,7 +1396,7 @@
|
|
docencoding="UTF-8"
|
|
charset="UTF-8"
|
|
bottom="${icu4j.api.doc.copyright.footer}"
|
|
- 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"
|
|
+ additionalparam="${doclint.option} -breakiterator -use -J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=UTF-8"
|
|
link="${icu4j.api.doc.jdk.link}"
|
|
source="1.7"
|
|
stylesheetfile="${docs.style.sheet}"
|
|
@@ -1435,7 +1435,7 @@
|
|
docencoding="UTF-8"
|
|
charset="UTF-8"
|
|
bottom="${icu4j.api.doc.copyright.footer}"
|
|
- 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"
|
|
+ additionalparam="${doclint.option} -breakiterator -use -J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=UTF-8"
|
|
link="${icu4j.api.doc.jdk.link}"
|
|
source="1.7"
|
|
stylesheetfile="${docs.style.sheet}"
|
|
@@ -1619,7 +1619,6 @@
|
|
<packageset dir="${icu4j.charset.dir}/src">
|
|
<include name="com/ibm/icu/charset/**"/>
|
|
</packageset>
|
|
- <doclet name="com.ibm.icu.dev.tool.docs.CheckTags" path="${icu4j.build-tools.jar}"/>
|
|
</javadoc>
|
|
</target>
|
|
|
|
@@ -1645,13 +1644,6 @@
|
|
<packageset dir="${icu4j.translit.dir}/src">
|
|
<include name="com/ibm/icu/text/**"/>
|
|
</packageset>
|
|
- <doclet name="com.ibm.icu.dev.tool.docs.GatherAPIData" path="${icu4j.build-tools.jar}">
|
|
- <param name="-name" value="ICU4J ${icu4j.impl.version}"/>
|
|
- <param name="-output" value="${out.dir}/icu4j${api.report.version}.api3"/>
|
|
- <param name="-internal"/>
|
|
- <param name="-version"/>
|
|
- <param name="-gzip"/>
|
|
- </doclet>
|
|
</javadoc>
|
|
</target>
|
|
|
|
@@ -1691,12 +1683,6 @@
|
|
<packageset dir="${icu4j.translit.dir}/src">
|
|
<include name="com/ibm/icu/text/**"/>
|
|
</packageset>
|
|
- <doclet name="com.ibm.icu.dev.tool.docs.GatherAPIDataOld" path="${icu4j.build-tools.jar}">
|
|
- <param name="-name" value="ICU4J ${icu4j.impl.version}"/>
|
|
- <param name="-output" value="${out.dir}/icu4j${api.report.version}.api"/>
|
|
- <param name="-internal"/>
|
|
- <param name="-gzip"/>
|
|
- </doclet>
|
|
</javadoc>
|
|
</target>
|
|
|
|
--
|
|
2.26.2
|
|
|