AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-10366 allow inplace build, add note about xalan/xerces

Browse Source 
X-SVN-Rev: 34210
This commit is contained in:
Steven R. Loomis 2013-09-06 01:59:35 +00:00
parent bb7e5684de
commit ee400779a0
4 changed files with 46 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tools/release/java/Makefile
View File

@ -1,4 +1,4 @@
# Copyright (C) 2009-2011 IBM and Others. All Rights Reserved
# Copyright (C) 2009-2013 IBM and Others. All Rights Reserved
#
#
@ -6,7 +6,7 @@
#Usage:
# make OLD_ICU=/xsrl/E/401m40 NEW_ICU=/xsrl/E/icu4ct42
#
# you can put the OLD_ICU=xx and NEW_ICU=yy in separate lines in Makefile.local
# you can put the OLD_ICU=xx and NEW_ICU=yy in separate lines in Makefile.local
#
ANT=ant
@ -37,6 +37,16 @@ endif
all: $(TARGET) $(LOCAL_TARGET)
# auto "build" the "old" icu into OLD_ICU_BUILD
tmp-old: $(OLD_ICU)/source/configure
mkdir -p $(OLD_ICU_BUILD)/
( cd $(OLD_ICU_BUILD)/ && $(OLD_ICU)/source/configure )
# auto "build" the "old" icu into OLD_ICU_BUILD
tmp-new: $(NEW_ICU)/source/configure
mkdir -p $(NEW_ICU_BUILD)/
( cd $(NEW_ICU_BUILD)/ && $(NEW_ICU)/source/configure )
ifneq ($(NOTSET),)
check-vars:
@ -46,7 +56,7 @@ else
check-vars:
endif
.PHONY: check-vars classes clean-docs
.PHONY: check-vars classes clean-docs tmp-old
.PRECIOUS: $(TARGET) $(OLD_ICU_BUILD)/$(DOXYFILE) $(NEW_ICU_BUILD)/$(DOXYFILE)
@ -58,18 +68,19 @@ UVERSIONH=$(XML)/uversion_8h.xml
clean-docs: | check-vars
-rm -rf "$(OLD_ICU_BUILD)/$(XML)" "$(NEW_ICU_BUILD)/$(XML)"
$(TARGET): check-vars $(OLD_ICU_BUILD)/$(XML) $(NEW_ICU_BUILD)/$(XML)
$(TARGET): check-vars $(OLD_ICU_BUILD)/$(XML) $(NEW_ICU_BUILD)/$(XML)
echo "Remember to run the non-ascii file detector if you get errors."
$(ANT) -Dolddir="$(OLD_ICU_BUILD)/$(XML)" -Dnewdir="$(NEW_ICU_BUILD)/$(XML)" $(ANT_TARGET)
echo "If you get no-changes, see the readme- may need to add xalan/xerces jars."
# check-vars $(OLD_ICU_BUILD)/$(XML) $(NEW_ICU_BUILD)/$(XML)
# check-vars $(OLD_ICU_BUILD)/$(XML) $(NEW_ICU_BUILD)/$(XML)
APIChangeReport.xml:
echo "Remember to run the non-ascii file detector if you get errors."
$(ANT) -Dolddir="$(OLD_ICU_BUILD)/$(XML)" -Dnewdir="$(NEW_ICU_BUILD)/$(XML)" $(ANT_TARGET)_xml
%/doc/xml: %/Doxyfile
# don't care what GENERATE_XML is set to previously - set it to yes.
@echo running doxyugen ..
@echo running doxygen ..
( cd "$*/" && ( (cat ./Doxyfile | grep -v '^GENERATE_') ; echo 'GENERATE_XML=YES') | $(DOXYGEN) - )
@echo doxygen done in $*

48
tools/release/java/build.xml
View File

@ -1,10 +1,10 @@
<!--
/*
*******************************************************************************
* Copyright (C) 2006-2011, International Business Machines Corporation and *
* Copyright (C) 2006-2013, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
* This is the ant build file for ICU tools.
* This is the ant build file for ICU tools.
*/
-->
<project name="release-tools" default="tools" basedir="." >
@ -31,38 +31,38 @@
source="1.5"
debug="on" deprecation="off"
encoding="ascii"/>
</target>
</target>
<target name="clean" depends="init" description="remove all build targets">
<delete dir="${build.dir}"/>
</target>
<target name="apireport" depends="tools">
<target name="apireport" depends="tools">
<java classname="com.ibm.icu.dev.tools.docs.StableAPI" fork="yes" failonerror="true">
<!--
<arg value = "-DELETEME-newver"/>
<arg value = "4.6"/>
-->
<arg value = "--olddir"/>
<arg value = "--olddir"/>
<arg value = "${olddir}"/>
<!--
!! Only need these if you must override. Remove the DELETEME
<arg value = "-DELETEME-newver"/>
<arg value = "${newver}"/>
-->
<arg value = "--newdir"/>
<arg value = "${newdir}"/>
<arg value = "--cppxslt"/>
<arg value = "${basedir}/src/com/ibm/icu/dev/tools/docs/dumpAllCppFunc.xslt"/>
<arg value = "--cxslt"/>
<arg value = "${basedir}/src/com/ibm/icu/dev/tools/docs/dumpAllCFunc.xslt"/>
<arg value = "--reportxslt"/>
<arg value = "${basedir}/src/com/ibm/icu/dev/tools/docs/genReport.xslt"/>
@ -79,41 +79,41 @@
</classpath>
</java>
</target>
<target name="apireport_xml" depends="tools">
<target name="apireport_xml" depends="tools">
<java classname="com.ibm.icu.dev.tools.docs.StableAPI" fork="yes" failonerror="true">
<!--
<arg value = "-DELETEME-newver"/>
<arg value = "4.4.1"/>
-->
<!--
<!--
<arg value = "-DELETEME-newver"/>
<arg value = "4.6"/>
-->
-->
<arg value = "--olddir"/>
<arg value = "--olddir"/>
<arg value = "${olddir}"/>
<!--
!! Only need these if you must override. Remove the DELETEME
<arg value = "-DELETEME-newver"/>
<arg value = "${newver}"/>
-->
<arg value = "--newdir"/>
<arg value = "${newdir}"/>
<arg value = "--cppxslt"/>
<arg value = "${basedir}/src/com/ibm/icu/dev/tools/docs/dumpAllCppFunc_xml.xslt"/>
<arg value = "--cxslt"/>
<arg value = "${basedir}/src/com/ibm/icu/dev/tools/docs/dumpAllCFunc_xml.xslt"/>
<arg value = "--reportxslt"/>
<arg value = "${basedir}/src/com/ibm/icu/dev/tools/docs/genReport_xml.xslt"/>
<arg value = "${basedir}/src/com/ibm/icu/dev/tools/docs/genreport_xml.xslt"/>
<arg value = "--resultfile"/>
<arg value = "${basedir}/APIChangeReport.xml"/>

3
tools/release/java/readme.txt
View File

@ -1,4 +1,4 @@
# Copyright (C) 2009-2011 IBM and Others. All Rights Reserved
# Copyright (C) 2009-2013 IBM and Others. All Rights Reserved
API Change Report:
@ -12,6 +12,7 @@ Requirements:
but an older Doxygen may work for the API Change Report.
- Java JDK 1.5+
- Apache Ant
- Note: if you have trouble with null output, put xalan.jar and xercesImpl.jar from <http://xalan.apache.org/xalan-j/downloads.html#latest-release> into ./lib/
To use the utility:
1. Put both old and new ICU source trees on your system

6
tools/release/java/src/com/ibm/icu/dev/tools/docs/StableAPI.java
View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (c) 2006-2012, International Business Machines
* Copyright (c) 2006-2013, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Created on 2006-7-24 ?
@ -344,7 +344,7 @@ public class StableAPI {
int min = vers.length>1?Integer.parseInt(vers[1]):0;
int micr = vers.length>2?Integer.parseInt(vers[2]):0;
int patch = vers.length>3?Integer.parseInt(vers[3]):0;
System.err.println(" == ["+vers.toString()+"] " + maj + " . " + min + " . " + micr + " . " + patch );
if(maj >= 49) {
// new scheme: 49 and following.
String truncVersion = "ICU " +maj;
@ -356,7 +356,7 @@ public class StableAPI {
result = "ICU "+(maj);
System.err.println(" .. " + milestoneOf + " is the release of " + truncVersion);
} else {
milestoneOf = " (update "+micr+"."+patch+")";
milestoneOf = " (update #"+(min-1)+": "+result.substring(4)+")";
result = "ICU "+(maj);
System.err.println(" .. " + milestoneOf + " is an update to " + truncVersion);
}