diff --git a/.gitattributes b/.gitattributes index 12d40265589..5a12b4c4821 100644 --- a/.gitattributes +++ b/.gitattributes @@ -575,6 +575,9 @@ tools/release/java/.classpath -text tools/release/java/.project -text tools/release/java/Makefile -text tools/release/java/icu4c.css -text +tools/release/java/src/com/ibm/icu/dev/tools/docs/dumpAllCFunc_xml.xslt -text +tools/release/java/src/com/ibm/icu/dev/tools/docs/dumpAllCppFunc_xml.xslt -text +tools/release/java/src/com/ibm/icu/dev/tools/docs/genreport_xml.xslt -text tools/trac/IcuCodeTools/icucodetools/__init__.py -text tools/trac/IcuCodeTools/icucodetools/dcut.py -text tools/trac/IcuCodeTools/icucodetools/htdocs/css/icuxtn.css -text diff --git a/.gitignore b/.gitignore index 3bfa5d95105..de2fdee23ca 100644 --- a/.gitignore +++ b/.gitignore @@ -944,10 +944,11 @@ tools/multi/packages/*.tgz tools/multi/proj/chello/out tools/multi/proj/provider/out tools/multi/tmp -tools/release/java/APIChangeReport.html +tools/release/java/APIChangeReport* tools/release/java/Makefile.local tools/release/java/classes tools/release/java/lib +tools/release/java/src/com/ibm/icu/dev/tools/misc/*.class tools/trac/IcuCodeTools/*.egg-info tools/trac/IcuCodeTools/build tools/trac/IcuCodeTools/icucodetools/*.pyc diff --git a/tools/release/java/Makefile b/tools/release/java/Makefile index 70743eab808..b6f9a8d3c86 100644 --- a/tools/release/java/Makefile +++ b/tools/release/java/Makefile @@ -54,6 +54,11 @@ $(TARGET): check-vars $(OLD_ICU)/$(XML) $(NEW_ICU)/$(XML) echo "Remember to run the non-ascii file detector if you get errors." $(ANT) -Dolddir="$(OLD_ICU)/$(XML)" -Dnewdir="$(NEW_ICU)/$(XML)" $(ANT_TARGET) +# check-vars $(OLD_ICU)/$(XML) $(NEW_ICU)/$(XML) +APIChangeReport.xml: + echo "Remember to run the non-ascii file detector if you get errors." + $(ANT) -Dolddir="$(OLD_ICU)/$(XML)" -Dnewdir="$(NEW_ICU)/$(XML)" $(ANT_TARGET)_xml + %/source/doc/xml: %/source/Doxyfile # don't care what GENERATE_XML is set to previously - set it to yes. @echo running doxyugen .. diff --git a/tools/release/java/build.xml b/tools/release/java/build.xml index 3f12195dd1c..d77030dccb5 100644 --- a/tools/release/java/build.xml +++ b/tools/release/java/build.xml @@ -1,7 +1,7 @@ - @@ -70,6 +69,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/release/java/src/com/ibm/icu/dev/tools/docs/StableAPI.java b/tools/release/java/src/com/ibm/icu/dev/tools/docs/StableAPI.java index ad0ffd9b27f..c7498e369ab 100644 --- a/tools/release/java/src/com/ibm/icu/dev/tools/docs/StableAPI.java +++ b/tools/release/java/src/com/ibm/icu/dev/tools/docs/StableAPI.java @@ -90,6 +90,8 @@ public class StableAPI { private File reportXsl; private File resultFile; + private String milestoneOf = ""; + final private static String nul = "None"; public static void main(String[] args) throws TransformerException, ParserConfigurationException, SAXException, IOException, XPathExpressionException { @@ -250,6 +252,16 @@ public class StableAPI { String initStr = initVal.getNodeValue().trim().replaceAll("\"",""); result = ICU_SPACE_PREFIX+initStr; System.err.println("Detected "+whichVer + " version: " + result); + if(whichVer.equals("new") && result.startsWith("ICU ")) { + String vers[] = result.substring(4).split("\\."); + int maj = Integer.parseInt(vers[0]); + int min = Integer.parseInt(vers[1]); + if((min%2)==1) { + milestoneOf = " ("+result+")"; + result = "ICU "+(maj)+"."+(min+1); + System.err.println(" .. " + milestoneOf + " is a milestone towards " + result); + } + } } } @@ -269,12 +281,20 @@ public class StableAPI { if(!result.equals(prevVer)) { System.err.println("Note: Detected " + result + " version but we'll use your requested --"+whichVer+"ver "+prevVer); result = prevVer; + if(!milestoneOf.isEmpty()&&whichVer.equals("new")) { + System.err.println(" .. ignoring milestone indicator " + milestoneOf); + milestoneOf = ""; + } } else { System.err.println("Note: You don't need to use '--"+whichVer+"ver "+result+"' anymore - we detected it correctly."); } } else { System.err.println("Note: Didn't detect version so we'll use your requested --"+whichVer+"ver "+prevVer); result = prevVer; + if(!milestoneOf.isEmpty()&&whichVer.equals("new")) { + System.err.println(" .. ignoring milestone indicator " + milestoneOf); + milestoneOf = ""; + } } } @@ -579,6 +599,7 @@ public class StableAPI { // report.setParameter("rightStatus", rightStatus); report.setParameter("ourYear", new Integer(new java.util.GregorianCalendar().get(java.util.Calendar.YEAR))); report.setParameter("rightVer", rightVer); + report.setParameter("rightMilestone", milestoneOf); report.setParameter("dateTime", new GregorianCalendar().getTime()); report.setParameter("nul", nul); diff --git a/tools/release/java/src/com/ibm/icu/dev/tools/docs/dumpAllCFunc_xml.xslt b/tools/release/java/src/com/ibm/icu/dev/tools/docs/dumpAllCFunc_xml.xslt new file mode 100644 index 00000000000..c490e29f10d --- /dev/null +++ b/tools/release/java/src/com/ibm/icu/dev/tools/docs/dumpAllCFunc_xml.xslt @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/release/java/src/com/ibm/icu/dev/tools/docs/dumpAllCppFunc_xml.xslt b/tools/release/java/src/com/ibm/icu/dev/tools/docs/dumpAllCppFunc_xml.xslt new file mode 100644 index 00000000000..88c3ff3c625 --- /dev/null +++ b/tools/release/java/src/com/ibm/icu/dev/tools/docs/dumpAllCppFunc_xml.xslt @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/release/java/src/com/ibm/icu/dev/tools/docs/genReport.xslt b/tools/release/java/src/com/ibm/icu/dev/tools/docs/genReport.xslt index 028d4a4de13..c4ea449fe49 100644 --- a/tools/release/java/src/com/ibm/icu/dev/tools/docs/genReport.xslt +++ b/tools/release/java/src/com/ibm/icu/dev/tools/docs/genReport.xslt @@ -15,6 +15,7 @@ + @@ -26,7 +27,7 @@ - ICU4C API Comparison: <xsl:value-of select="$leftVer"/> with <xsl:value-of select="$rightVer" /> + ICU4C API Comparison: <xsl:value-of select="$leftVer"/> with <xsl:value-of select="$rightVer" /><xsl:value-of select="$rightMilestone" /> @@ -34,7 +35,7 @@ -

ICU4C API Comparison: with

+

ICU4C API Comparison: with

  • Removed from
  • Deprecated or Obsoleted in
  • diff --git a/tools/release/java/src/com/ibm/icu/dev/tools/docs/genreport_xml.xslt b/tools/release/java/src/com/ibm/icu/dev/tools/docs/genreport_xml.xslt new file mode 100644 index 00000000000..fb01b152c54 --- /dev/null +++ b/tools/release/java/src/com/ibm/icu/dev/tools/docs/genreport_xml.xslt @@ -0,0 +1,239 @@ + + + + + + + + + + + + + + + Copyright (C) , International Business Machines Corporation, All Rights Reserved. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + 2 + + + center + + + + >Stable +
    +
    +
    + + + + + + + + + + +
    (changed) +
    + +
    (should be ) +
    + +
    (untagged) +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + 2 + + + center + + + + +
    +
    +
    + + + + + + + + + + + +
    +
    + +
    + + + +