File icu4j-jdk9.patch of Package icu4j

Overview Repositories Revisions Requests Users Attributes Meta

File icu4j-jdk9.patch of Package icu4j (Revision 62897cfa7ba09983f7b94d647ef17815)

Currently displaying revision 62897cfa7ba09983f7b94d647ef17815 , Show latest

--- icu4j-58.1/build.xml	2017-09-18 10:37:37.542916656 +0200
+++ icu4j-58.1/build.xml	2017-09-18 12:02:43.275291752 +0200
@@ -72,6 +72,7 @@
             <contains string="${java.version}" substring="1.7."/>
             <contains string="${java.version}" substring="1.8."/>
             <contains string="${java.version}" substring="1.9."/>
+            <contains string="${java.version}" substring="9"/>
         </or>
     </condition>
     <fail message="The JDK version is too old or unknown.">
@@ -95,7 +96,10 @@
     </condition>
 
     <condition property="is.java9">
+        <or>
             <contains string="${java.version}" substring="1.9."/>
+            <contains string="${java.version}" substring="9"/>
+        </or>
     </condition>
 
     <condition property="is.java7.plus">
@@ -955,9 +959,9 @@
                 docencoding="UTF-8"
                 charset="UTF-8"
                 bottom="&lt;font size=-1&gt;Copyright (c) ${current.year} IBM Corporation and others.&lt;/font&gt;"
-                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 -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=${java.src.encoding}"
                 link="${icu4j.api.doc.jdk.link}"
-                source="1.5"
+                source="${javac.source}"
                 stylesheetfile="${docs.style.sheet}"
                 failonerror="true">
             <packageset dir="${icu4j.core.dir}/src">
@@ -990,9 +994,9 @@
                 docencoding="UTF-8"
                 charset="UTF-8"
                 bottom="&lt;font size=-1&gt;Copyright (c) ${current.year} IBM Corporation and others.&lt;/font&gt;"
-                additionalparam="${doclint.option} -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 -J-Dfile.encoding=${java.src.encoding}"
                 link="${icu4j.api.doc.jdk.link}"
-                source="1.5"
+                source="${javac.source}"
                 failonerror="true">
             <packageset dir="${icu4j.core.dir}/src">
                 <include name="com/ibm/icu/lang/**"/>
@@ -1222,7 +1226,7 @@
 
     
     <target name="checktags" depends="info, build-tools" description="Check API tags before release">
-        <javadoc source="1.6"
+        <javadoc source="${javac.source}"
                  bootclasspath="${java6.bootclasspath}"
                  encoding="${java.src.encoding}">
             <packageset dir="${icu4j.core.dir}/src">
@@ -1243,7 +1247,7 @@
 
     <target name="gatherapi" depends="info, build-tools" description="Run API database generator tool">
         <mkdir dir="${out.dir}"/>
-        <javadoc source="1.6"
+        <javadoc source="${javac.source}"
                  bootclasspath="${java6.bootclasspath}"
                  encoding="${java.src.encoding}">
             <packageset dir="${icu4j.core.dir}/src">
@@ -1288,7 +1292,7 @@
 
     <target name="gatherapiOld" depends="info, build-tools" description="Run API database generator tool (Pre Java 5 style)">
         <mkdir dir="${out.dir}"/>
-        <javadoc source="1.6"
+        <javadoc source="${javac.source}"
                  bootclasspath="${java6.bootclasspath}"
                  encoding="${java.src.encoding}">
             <packageset dir="${icu4j.core.dir}/src">

Places

File icu4j-jdk9.patch of Package icu4j (Revision 62897cfa7ba09983f7b94d647ef17815)

Places