From ee400779a0f27884cabf6af5f8a3be69f25f69a7 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Fri, 6 Sep 2013 01:59:35 +0000 Subject: [PATCH] ICU-10366 allow inplace build, add note about xalan/xerces X-SVN-Rev: 34210 --- tools/release/java/Makefile | 23 ++++++--- tools/release/java/build.xml | 48 +++++++++---------- tools/release/java/readme.txt | 3 +- .../com/ibm/icu/dev/tools/docs/StableAPI.java | 6 +-- 4 files changed, 46 insertions(+), 34 deletions(-) diff --git a/tools/release/java/Makefile b/tools/release/java/Makefile index b0317207b7a..dd2c683721d 100644 --- a/tools/release/java/Makefile +++ b/tools/release/java/Makefile @@ -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 $* diff --git a/tools/release/java/build.xml b/tools/release/java/build.xml index aff0f733d83..e52636ca123 100644 --- a/tools/release/java/build.xml +++ b/tools/release/java/build.xml @@ -1,10 +1,10 @@ @@ -31,38 +31,38 @@ source="1.5" debug="on" deprecation="off" encoding="ascii"/> - + - + - + - - + + - + - + - + - + - + @@ -79,41 +79,41 @@ - + - +--> - + - + - + - + - + - + - - + + diff --git a/tools/release/java/readme.txt b/tools/release/java/readme.txt index 17d2e086b5e..e15c402f9a5 100644 --- a/tools/release/java/readme.txt +++ b/tools/release/java/readme.txt @@ -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 into ./lib/ To use the utility: 1. Put both old and new ICU source trees on your system 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 6d7b00d952a..f26322f4fd0 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 @@ -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); } -- 2.40.0