From ff552c0fdc1fd5d9c2db72aab3add09f05714af8 Mon Sep 17 00:00:00 2001 From: Yves Arrouye Date: Fri, 4 Jan 2002 23:48:46 +0000 Subject: [PATCH] ICU-1600 cleaning up of Makefile rules to show more information and less human-oriented comments. Associated cleaning up of tools to have most verbose messages only displayed when verbose options are used. X-SVN-Rev: 7382 --- icu4c/source/Makefile.in | 6 +-- icu4c/source/config/mh-aix | 6 +-- icu4c/source/config/mh-aix-va | 6 +-- icu4c/source/config/mh-alpha-linux-cc | 6 +-- icu4c/source/config/mh-alpha-linux-gcc | 6 +-- icu4c/source/config/mh-alpha-osf | 6 +-- icu4c/source/config/mh-bsd-gcc | 6 +-- icu4c/source/config/mh-cygwin | 6 +-- icu4c/source/config/mh-darwin | 6 +-- icu4c/source/config/mh-hpux-acc | 6 +-- icu4c/source/config/mh-hpux-cc | 6 +-- icu4c/source/config/mh-irix | 6 +-- icu4c/source/config/mh-linux | 6 +-- icu4c/source/config/mh-os390 | 6 +-- icu4c/source/config/mh-os400 | 6 +-- icu4c/source/config/mh-ptx | 6 +-- icu4c/source/config/mh-solaris | 6 +-- icu4c/source/config/mh-solaris-gcc | 6 +-- icu4c/source/data/Makefile.in | 7 ++-- icu4c/source/data/build/Makefile.in | 51 +++++++++---------------- icu4c/source/extra/Makefile.in | 2 +- icu4c/source/samples/Makefile.in | 2 +- icu4c/source/samples/layout/Makefile.in | 3 +- icu4c/source/samples/uresb/Makefile | 8 ++-- icu4c/source/test/Makefile.in | 2 +- icu4c/source/test/testdata/Makefile.in | 4 +- icu4c/source/tools/Makefile.in | 18 ++++----- icu4c/source/tools/genccode/genccode.c | 10 +++-- icu4c/source/tools/gencmn/gencmn.c | 12 +++--- icu4c/source/tools/genrb/genrb.c | 24 ++++++------ icu4c/source/tools/gentest/gentest.c | 2 +- icu4c/source/tools/gentz/gentz.cpp | 37 +++++++++++++----- icu4c/source/tools/genuca/genuca.cpp | 9 ++++- icu4c/source/tools/pkgdata/cmnmode.c | 2 +- icu4c/source/tools/pkgdata/dllmode.c | 2 +- 35 files changed, 160 insertions(+), 143 deletions(-) diff --git a/icu4c/source/Makefile.in b/icu4c/source/Makefile.in index de4172fa06c..7402b074dfe 100644 --- a/icu4c/source/Makefile.in +++ b/icu4c/source/Makefile.in @@ -68,8 +68,8 @@ check: all check-recursive check-local ifeq ($(DOXYGEN),) doc: - @echo Doxygen is required to generate documentation. Doxygen can be found on the - @echo Web at http://www.doxygen.org/ + @echo you need Doxygen to generate documentation. Doxygen can be found on the Web + @echo at http://www.doxygen.org/ else doc: Doxyfile $(DOXYGEN) @@ -86,7 +86,7 @@ all-recursive install-recursive clean-recursive distclean-recursive dist-recursi @dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(LOCAL_SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ + echo "$(MAKE)[$(MAKELEVEL)]: Making \`$$target' in \`$$subdir'"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ local_target="$$target-local"; \ diff --git a/icu4c/source/config/mh-aix b/icu4c/source/config/mh-aix index 6c80b3f99de..e249e09bd14 100644 --- a/icu4c/source/config/mh-aix +++ b/icu4c/source/config/mh-aix @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-aix,v 1.24 2001/10/16 00:29:51 grhoten-oss Exp $ +## $Id: mh-aix,v 1.25 2002/01/04 23:48:42 yves-oss Exp $ ## Commands to generate dependency files GEN_DEPS.c= $(CC) -E -M $(DEFS) $(CPPFLAGS) @@ -72,11 +72,11 @@ STATIC_O = o [ -s $@ ] || rm -f $@ ; rm -f $<' %.u : $(srcdir)/%.c - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" @$(SHELL) -ec '$(GEN_DEPS.c) $< > /dev/null' %.u : $(srcdir)/%.cpp - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" @$(SHELL) -ec '$(GEN_DEPS.cc) $< > /dev/null' ## Versioned libraries rules diff --git a/icu4c/source/config/mh-aix-va b/icu4c/source/config/mh-aix-va index 95f72e91c4a..6768190f24b 100644 --- a/icu4c/source/config/mh-aix-va +++ b/icu4c/source/config/mh-aix-va @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-aix-va,v 1.17 2001/11/30 00:37:50 grhoten-oss Exp $ +## $Id: mh-aix-va,v 1.18 2002/01/04 23:48:42 yves-oss Exp $ ## Commands to generate dependency files GEN_DEPS.c= $(CC) -E -M $(DEFS) $(CPPFLAGS) @@ -70,11 +70,11 @@ STATIC_O = o [ -s $@ ] || rm -f $@ ; rm -f $<' %.u : $(srcdir)/%.c - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" @$(SHELL) -ec '$(GEN_DEPS.c) $< > /dev/null' %.u : $(srcdir)/%.cpp - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" @$(SHELL) -ec '$(GEN_DEPS.cc) $< > /dev/null' ## Versioned libraries rules diff --git a/icu4c/source/config/mh-alpha-linux-cc b/icu4c/source/config/mh-alpha-linux-cc index cba357d0bf4..9fabde9f7fe 100644 --- a/icu4c/source/config/mh-alpha-linux-cc +++ b/icu4c/source/config/mh-alpha-linux-cc @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-alpha-linux-cc,v 1.5 2001/10/23 02:14:05 rviswanadha Exp $ +## $Id: mh-alpha-linux-cc,v 1.6 2002/01/04 23:48:42 yves-oss Exp $ ## Commands to generate dependency files #GEN_DEPS.c= $(CC) $(DEFS) $(CPPFLAGS) -MD -c -msg_quiet @@ -59,13 +59,13 @@ STATIC_O = ao ## Dependency rules #%.d: $(srcdir)/%.c -# @echo "Generating dependency information for $<" +# @echo "generating dependency information for $<" # @$(SHELL) -ec '$(GEN_DEPS.c) $< \ # | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ # [ -s $@ ] || rm -f $@' #%.d: $(srcdir)/%.cpp -# @echo "Generating dependency information for $<" +# @echo "generating dependency information for $<" # @$(SHELL) -ec '$(GEN_DEPS.cc) $< \ # | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ # [ -s $@ ] || rm -f $@' diff --git a/icu4c/source/config/mh-alpha-linux-gcc b/icu4c/source/config/mh-alpha-linux-gcc index e437049daaa..bf111ca6804 100644 --- a/icu4c/source/config/mh-alpha-linux-gcc +++ b/icu4c/source/config/mh-alpha-linux-gcc @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-alpha-linux-gcc,v 1.4 2001/10/03 23:32:11 grhoten-oss Exp $ +## $Id: mh-alpha-linux-gcc,v 1.5 2002/01/04 23:48:42 yves-oss Exp $ ## Commands to generate dependency files GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) @@ -54,13 +54,13 @@ STATIC_O = ao ## Dependency rules %.d: $(srcdir)/%.c - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" @$(SHELL) -ec '$(GEN_DEPS.c) $< \ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ [ -s $@ ] || rm -f $@' %.d: $(srcdir)/%.cpp - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" @$(SHELL) -ec '$(GEN_DEPS.cc) $< \ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ [ -s $@ ] || rm -f $@' diff --git a/icu4c/source/config/mh-alpha-osf b/icu4c/source/config/mh-alpha-osf index fb0e6f33f20..c70a4987fbe 100644 --- a/icu4c/source/config/mh-alpha-osf +++ b/icu4c/source/config/mh-alpha-osf @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-alpha-osf,v 1.1 2001/10/30 19:57:44 grhoten-oss Exp $ +## $Id: mh-alpha-osf,v 1.2 2002/01/04 23:48:42 yves-oss Exp $ ## Commands to generate dependency files #GEN_DEPS.c= $(CC) $(DEFS) $(CPPFLAGS) -MD -c -msg_quiet @@ -59,13 +59,13 @@ STATIC_O = ao ## Dependency rules #%.d: $(srcdir)/%.c -# @echo "Generating dependency information for $<" +# @echo "generating dependency information for $<" # @$(SHELL) -ec '$(GEN_DEPS.c) $< \ # | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ # [ -s $@ ] || rm -f $@' #%.d: $(srcdir)/%.cpp -# @echo "Generating dependency information for $<" +# @echo "generating dependency information for $<" # @$(SHELL) -ec '$(GEN_DEPS.cc) $< \ # | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ # [ -s $@ ] || rm -f $@' diff --git a/icu4c/source/config/mh-bsd-gcc b/icu4c/source/config/mh-bsd-gcc index 419eafe8880..d30527848a6 100644 --- a/icu4c/source/config/mh-bsd-gcc +++ b/icu4c/source/config/mh-bsd-gcc @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-bsd-gcc,v 1.4 2001/10/03 23:32:11 grhoten-oss Exp $ +## $Id: mh-bsd-gcc,v 1.5 2002/01/04 23:48:42 yves-oss Exp $ ## Commands to generate dependency files GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) @@ -46,13 +46,13 @@ STATIC_O = ao ## Dependency rules %.d : $(srcdir)/%.c - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" @$(SHELL) -ec '$(GEN_DEPS.c) $< \ | sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \ [ -s $@ ] || rm -f $@' %.d : $(srcdir)/%.cpp - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" @$(SHELL) -ec '$(GEN_DEPS.cc) $< \ | sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \ [ -s $@ ] || rm -f $@' diff --git a/icu4c/source/config/mh-cygwin b/icu4c/source/config/mh-cygwin index fb694f386b1..9a2e90b75f5 100644 --- a/icu4c/source/config/mh-cygwin +++ b/icu4c/source/config/mh-cygwin @@ -3,7 +3,7 @@ ## Copyright (c) 2001, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-cygwin,v 1.4 2002/01/03 22:35:03 weiv-oss Exp $ +## $Id: mh-cygwin,v 1.5 2002/01/04 23:48:42 yves-oss Exp $ ## Commands to generate dependency files GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) @@ -50,13 +50,13 @@ STATIC_O = lib ## Dependency rules %.d: $(srcdir)/%.c - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" @$(SHELL) -ec '$(GEN_DEPS.c) $< \ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ [ -s $@ ] || rm -f $@' %.d: $(srcdir)/%.cpp - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" @$(SHELL) -ec '$(GEN_DEPS.cc) $< \ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ [ -s $@ ] || rm -f $@' diff --git a/icu4c/source/config/mh-darwin b/icu4c/source/config/mh-darwin index 45db59501f5..54a23f1427a 100644 --- a/icu4c/source/config/mh-darwin +++ b/icu4c/source/config/mh-darwin @@ -4,7 +4,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-darwin,v 1.18 2001/10/03 23:32:11 grhoten-oss Exp $ +## $Id: mh-darwin,v 1.19 2002/01/04 23:48:42 yves-oss Exp $ ## Flags for position independent code SHAREDLIBCFLAGS = -dynamic @@ -52,13 +52,13 @@ STATIC_O = ao ## Dependency rules %.d : $(srcdir)/%.c - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" @$(SHELL) -ec '$(GEN_DEPS.c) $< \ | sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \ [ -s $@ ] || rm -f $@' %.d : $(srcdir)/%.cpp - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" @$(SHELL) -ec '$(GEN_DEPS.cc) $< \ | sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \ [ -s $@ ] || rm -f $@' diff --git a/icu4c/source/config/mh-hpux-acc b/icu4c/source/config/mh-hpux-acc index 8213c7cef48..27c23261ba5 100644 --- a/icu4c/source/config/mh-hpux-acc +++ b/icu4c/source/config/mh-hpux-acc @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-hpux-acc,v 1.25 2001/10/03 23:32:11 grhoten-oss Exp $ +## $Id: mh-hpux-acc,v 1.26 2002/01/04 23:48:42 yves-oss Exp $ ## Commands to generate dependency files GEN_DEPS.c= : @@ -55,11 +55,11 @@ STATIC_O = o ## Dependency rules %.d : $(srcdir)/%.c - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" @$(GEN_DEPS.c) $< > $@ %.d : $(srcdir)/%.cpp - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" @$(GEN_DEPS.cc) $< > $@ ## Versioned libraries rules diff --git a/icu4c/source/config/mh-hpux-cc b/icu4c/source/config/mh-hpux-cc index e3bb1636a12..768a98deb70 100644 --- a/icu4c/source/config/mh-hpux-cc +++ b/icu4c/source/config/mh-hpux-cc @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-hpux-cc,v 1.28 2001/10/03 23:32:11 grhoten-oss Exp $ +## $Id: mh-hpux-cc,v 1.29 2002/01/04 23:48:43 yves-oss Exp $ ## This causes source/tools/pkgdata generated makefiles to create and link @@ -62,11 +62,11 @@ STATIC_O = o ## Dependency rules %.d : $(srcdir)/%.c - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" @$(GEN_DEPS.c) $< > $@ %.d : $(srcdir)/%.cpp - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" @$(GEN_DEPS.cc) $< > $@ ## Versioned libraries rules diff --git a/icu4c/source/config/mh-irix b/icu4c/source/config/mh-irix index 9425ffd353d..41f375e2ca8 100644 --- a/icu4c/source/config/mh-irix +++ b/icu4c/source/config/mh-irix @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-irix,v 1.19 2001/10/03 23:32:11 grhoten-oss Exp $ +## $Id: mh-irix,v 1.20 2002/01/04 23:48:43 yves-oss Exp $ ## Flags for position independent code SHAREDLIBCFLAGS = -shared @@ -50,13 +50,13 @@ STATIC_O = ao ## Dependency rules %.d : $(srcdir)/%.c - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" @$(SHELL) -ec '$(GEN_DEPS.c) $< \ | sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \ [ -s $@ ] || rm -f $@' %.d : $(srcdir)/%.cpp - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" @$(SHELL) -ec '$(GEN_DEPS.cc) $< \ | sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \ [ -s $@ ] || rm -f $@' diff --git a/icu4c/source/config/mh-linux b/icu4c/source/config/mh-linux index 7dac24a9dad..e779a14e3ed 100644 --- a/icu4c/source/config/mh-linux +++ b/icu4c/source/config/mh-linux @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2001, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-linux,v 1.29 2001/10/03 23:32:11 grhoten-oss Exp $ +## $Id: mh-linux,v 1.30 2002/01/04 23:48:43 yves-oss Exp $ ## Commands to generate dependency files GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) @@ -46,13 +46,13 @@ STATIC_O = ao ## Dependency rules %.d: $(srcdir)/%.c - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" @$(SHELL) -ec '$(GEN_DEPS.c) $< \ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ [ -s $@ ] || rm -f $@' %.d: $(srcdir)/%.cpp - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" @$(SHELL) -ec '$(GEN_DEPS.cc) $< \ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ [ -s $@ ] || rm -f $@' diff --git a/icu4c/source/config/mh-os390 b/icu4c/source/config/mh-os390 index 11a829a46c2..2fc1946ece8 100644 --- a/icu4c/source/config/mh-os390 +++ b/icu4c/source/config/mh-os390 @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2001, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-os390,v 1.31 2001/12/05 17:46:30 grhoten-oss Exp $ +## $Id: mh-os390,v 1.32 2002/01/04 23:48:43 yves-oss Exp $ ################################################################### # IMPORTANT NOTE # @@ -114,12 +114,12 @@ LIBUSTDIO= $(top_builddir)/extra/ustdio/libustdio.$(SO_TARGET_VERSION).x [ -s $@ ] || rm -f $@ ; rm -f $<' %.u : $(srcdir)/%.c - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" @$(SHELL) -ec 'touch $*.u > /dev/null 2>&1' @$(SHELL) -ec '$(GEN_DEPS.c) -f $*.u $< > /dev/null 2>&1' %.u : $(srcdir)/%.cpp - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" @$(SHELL) -ec 'touch $*.u > /dev/null 2>&1' @$(SHELL) -ec '$(GEN_DEPS.cc) -f $*.u $< > /dev/null 2>&1' diff --git a/icu4c/source/config/mh-os400 b/icu4c/source/config/mh-os400 index cc61be27574..735a3e59692 100644 --- a/icu4c/source/config/mh-os400 +++ b/icu4c/source/config/mh-os400 @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2001, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-os400,v 1.14 2001/10/03 23:32:11 grhoten-oss Exp $ +## $Id: mh-os400,v 1.15 2002/01/04 23:48:43 yves-oss Exp $ GEN_DEPS.c= $(CC1) -E -M $(DEFS) $(CPPFLAGS) GEN_DEPS.cc= $(CXX1) -E -M $(DEFS) $(CPPFLAGS) @@ -101,12 +101,12 @@ LIBUSTDIO= $(top_builddir)/extra/ustdio/libustdio.o # [ -s $@ ] || rm -f $@ ; rm -f $<' %.u : $(srcdir)/%.c - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" # @$(SHELL) -ec 'touch $*.u > /dev/null 2>&1' # @$(SHELL) -ec '$(GEN_DEPS.c) -f $*.u $< > /dev/null 2>&1' %.u : $(srcdir)/%.cpp - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" # @$(SHELL) -ec 'touch $*.u > /dev/null 2>&1' # @$(SHELL) -ec '$(GEN_DEPS.cc) -f $*.u $< > /dev/null 2>&1' diff --git a/icu4c/source/config/mh-ptx b/icu4c/source/config/mh-ptx index 7aa60255830..c749c84ac8a 100644 --- a/icu4c/source/config/mh-ptx +++ b/icu4c/source/config/mh-ptx @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-ptx,v 1.16 2001/10/03 23:32:11 grhoten-oss Exp $ +## $Id: mh-ptx,v 1.17 2002/01/04 23:48:43 yves-oss Exp $ ## Flags for position independent code SHAREDLIBCFLAGS = -KPIC @@ -53,13 +53,13 @@ STATIC_O = ao ## Dependency rules %.d : $(srcdir)/%.c - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" @$(SHELL) -ec '$(GEN_DEPS.c) $< \ | sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \ [ -s $@ ] || rm -f $@' %.d : $(srcdir)/%.cpp - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" @$(SHELL) -ec '$(GEN_DEPS.cc) -o $@ $< \ | sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \ [ -s $@ ] || rm -f $@' diff --git a/icu4c/source/config/mh-solaris b/icu4c/source/config/mh-solaris index 7d9a5c9eb93..e84b8c21c97 100644 --- a/icu4c/source/config/mh-solaris +++ b/icu4c/source/config/mh-solaris @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-solaris,v 1.24 2001/10/03 23:32:11 grhoten-oss Exp $ +## $Id: mh-solaris,v 1.25 2002/01/04 23:48:43 yves-oss Exp $ ## Flags for position independent code SHAREDLIBCFLAGS = -KPIC @@ -59,11 +59,11 @@ STATIC_O = ao ## Dependency rules %.d : $(srcdir)/%.c - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" @$(GEN_DEPS.c) $< > $@ %.d : $(srcdir)/%.cpp - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" @$(GEN_DEPS.cc) $< > $@ ## Versioned libraries rules diff --git a/icu4c/source/config/mh-solaris-gcc b/icu4c/source/config/mh-solaris-gcc index 86bc4ad470d..bb4e4f65cc0 100644 --- a/icu4c/source/config/mh-solaris-gcc +++ b/icu4c/source/config/mh-solaris-gcc @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-solaris-gcc,v 1.24 2001/10/19 16:48:02 grhoten-oss Exp $ +## $Id: mh-solaris-gcc,v 1.25 2002/01/04 23:48:43 yves-oss Exp $ ## Flags for position independent code SHAREDLIBCFLAGS = -fPIC @@ -50,13 +50,13 @@ STATIC_O = ao ## Dependency rules %.d : $(srcdir)/%.c - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" @$(SHELL) -ec '$(GEN_DEPS.c) $< \ | sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \ [ -s $@ ] || rm -f $@' %.d : $(srcdir)/%.cpp - @echo "Generating dependency information for $<" + @echo "generating dependency information for $<" @$(SHELL) -ec '$(GEN_DEPS.cc) $< \ | sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \ [ -s $@ ] || rm -f $@' diff --git a/icu4c/source/data/Makefile.in b/icu4c/source/data/Makefile.in index 4967ccf340f..7fa3ab2ff66 100644 --- a/icu4c/source/data/Makefile.in +++ b/icu4c/source/data/Makefile.in @@ -69,7 +69,7 @@ all-recursive install-recursive clean-recursive distclean-recursive dist-recursi @dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ + echo "$(MAKE)[$(MAKELEVEL)]: Making \`$$target' in \`$$subdir'"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ local_target="$$target-local"; \ @@ -116,9 +116,8 @@ packagetest: $(TESTDATAOBJDIR)/testdata.lst $(top_builddir)/tools/pkgdata/icupkg cd $(TESTDATAOBJDIR) ; $(INVOKE) $(PKGDATA) -T . -s . -p testdata -m common testdata.lst cleanpackage: - @echo Cleaning up packaged data.. - @-cd build ; $(INVOKE) $(PKGDATA) -m $(PKGDATA_MODE) $(PKGDATA_VERSIONING) -s . -T . -p $(ICUDATA_NAME) icudata.lst --clean 2> /dev/null - @-cd $(TESTDATAOBJDIR) ; $(INVOKE) $(PKGDATA) -m common -T . -s . -p testdata testdata.lst --clean 2> /dev/null + -cd build ; $(INVOKE) $(PKGDATA) -m $(PKGDATA_MODE) $(PKGDATA_VERSIONING) -s . -T . -p $(ICUDATA_NAME) icudata.lst --clean 2> /dev/null + -cd $(TESTDATAOBJDIR) ; $(INVOKE) $(PKGDATA) -m common -T . -s . -p testdata testdata.lst --clean 2> /dev/null $(RMV) $(ICUDATA_NAME).* build/icudata.lst build/*.mak ## Install ICU data. Make a convenience link 'icudata' library if it's a library mode. diff --git a/icu4c/source/data/build/Makefile.in b/icu4c/source/data/build/Makefile.in index b1dcce822ed..2b29f95d469 100644 --- a/icu4c/source/data/build/Makefile.in +++ b/icu4c/source/data/build/Makefile.in @@ -97,14 +97,14 @@ ALL_TEST_FILES = $(TEST_DAT_FILES) $(TEST_BRK_FILES) $(TEST_CNV_FILES) $(TEST_RE CLEANFILES = *~ $(ALL_FILES) $(ALL_TEST_FILES) *.o *.c thaidict.brk icudata.lst: $(SRCLISTDEPS) - @echo Generating $@ list of data files + @echo "generating $@ (list of data files)" @-$(RMV) $@ @for file in $(ALL_FILES); do \ echo $$file >> $@; \ done; $(TESTOBJDATADIR)/testdata.lst: $(SRCLISTDEPS) - @echo Generating $@ list of data files + @echo "generating $@ (list of data files)" @-$(RMV) $@ @for file in $(TEST_RES_FILES) $(TEST_DAT_FILES); do \ echo $$file >> $@; \ @@ -119,17 +119,13 @@ endif # build-data: $(ALL_FILES) icudata.lst $(OS390LIST) - @echo "ICU data files are up to date." clean-local: - @echo '#' removing built files: .brk .dat .cnv .res ... - @$(RMV) $(CLEANFILES) - @echo Cleaning up.. + $(RMV) $(CLEANFILES) #$(ALL_TEST_FILES) -build-testdata: $(ALL_TEST_FILES) $(TESTOBJDATADIR)/testdata.lst ja_data.bin - @echo "ICU test data files are up to date." +build-testdata: $(ALL_TEST_FILES) $(TESTOBJDATADIR)/testdata.lst $(TESTOBJDATADIR)/ja_data.res # Now, sections for building each kind of data. @@ -138,45 +134,37 @@ build-testdata: $(ALL_TEST_FILES) $(TESTOBJDATADIR)/testdata.lst ja_data.bin # uprops.dat uprops.dat: $(UNICODEDATADIR)/UnicodeData.txt $(UNICODEDATADIR)/BidiMirroring.txt $(TOOLDIR)/genprops/genprops$(EXEEXT) - @echo Creating uprops.dat - @ICU_DATA=. $(INVOKE) $(TOOLDIR)/genprops/genprops -s $(UNICODEDATADIR) -d . -u $(UNICODE_VERSION) + ICU_DATA=. $(INVOKE) $(TOOLDIR)/genprops/genprops -s $(UNICODEDATADIR) -d . -u $(UNICODE_VERSION) # unorm.dat unorm.dat: $(UNICODEDATADIR)/UnicodeData.txt $(UNICODEDATADIR)/DerivedNormalizationProperties.txt $(UNICODEDATADIR)/BidiMirroring.txt $(TOOLDIR)/gennorm/gennorm$(EXEEXT) - @echo Creating unorm.dat - @ICU_DATA=. $(INVOKE) $(TOOLDIR)/gennorm/gennorm -s $(UNICODEDATADIR) -d . -u $(UNICODE_VERSION) + ICU_DATA=. $(INVOKE) $(TOOLDIR)/gennorm/gennorm -s $(UNICODEDATADIR) -d . -u $(UNICODE_VERSION) # ucadata.dat ucadata.dat: $(UNICODEDATADIR)/FractionalUCA.txt $(TOOLDIR)/genuca/genuca$(EXEEXT) - @echo Creating ucadata.dat and invuca.dat - @ICU_DATA=. $(INVOKE) $(TOOLDIR)/genuca/genuca -s $(UNICODEDATADIR) -d . + ICU_DATA=. $(INVOKE) $(TOOLDIR)/genuca/genuca -s $(UNICODEDATADIR) -d . # unames.dat unames.dat: $(UNICODEDATADIR)/UnicodeData.txt $(TOOLDIR)/gennames/gennames$(EXEEXT) - @echo Creating unames.dat - @ICU_DATA=. $(INVOKE) $(TOOLDIR)/gennames/gennames -d . $(UNICODEDATADIR)/UnicodeData.txt -u $(UNICODE_VERSION) + ICU_DATA=. $(INVOKE) $(TOOLDIR)/gennames/gennames -d . $(UNICODEDATADIR)/UnicodeData.txt -u $(UNICODE_VERSION) # cnvalias.dat cnvalias.dat: $(SRCDATADIR)/convrtrs.txt $(TOOLDIR)/gencnval/gencnval$(EXEEXT) - @echo Creating $@ - @ICU_DATA=. $(INVOKE) $(TOOLDIR)/gencnval/gencnval -d . $(SRCDATADIR)/convrtrs.txt + ICU_DATA=. $(INVOKE) $(TOOLDIR)/gencnval/gencnval -d . $(SRCDATADIR)/convrtrs.txt # tz.dat tz.dat: $(SRCDATADIR)/timezone.txt $(TOOLDIR)/gentz/gentz$(EXEEXT) - @echo Creating $@ - @ICU_DATA=. $(INVOKE) $(TOOLDIR)/gentz/gentz -d . $(SRCDATADIR)/timezone.txt + ICU_DATA=. $(INVOKE) $(TOOLDIR)/gentz/gentz -d . $(SRCDATADIR)/timezone.txt # test.dat $(TESTOBJDATADIR)/test.dat: $(TOOLDIR)/gentest/gentest$(EXEEXT) - @echo Creating $@ - @ICU_DATA=. $(INVOKE) $(TOOLDIR)/gentest/gentest -d $(TESTOBJDATADIR) + ICU_DATA=. $(INVOKE) $(TOOLDIR)/gentest/gentest -d $(TESTOBJDATADIR) #################################################### BRK # BRK FILES thaidict.brk: $(SRCDATADIR)/thaidict.brk - @echo $@ - @$(RMV) $@ && ln -s $< $@ + $(RMV) $@ && ln -s $< $@ # copy the right endianness @@ -191,24 +179,23 @@ endif #################################################### CNV # CNV FILES %.cnv: $(SRCDATADIR)/%.ucm $(TOOLDIR)/makeconv/makeconv$(EXEEXT) - @ICU_DATA=. $(INVOKE) $(TOOLDIR)/makeconv/makeconv -c -d . $(SRCDATADIR)/$(/dev/null +$(TESTOBJDATADIR)/ja_data.res: $(TESTSRCDATADIR)/ja_data.bin $(TOOLDIR)/genrb/genrb$(EXEEXT) + ICU_DATA=. $(INVOKE) $(TOOLDIR)/genrb/genrb -q -s $(TESTSRCDATADIR) -eISO_2022_JP -d $(TESTOBJDATADIR) $(/dev/null %.res: $(SRCDATADIR)/%.txt $(TOOLDIR)/genrb/genrb$(EXEEXT) ucadata.dat uprops.dat unorm.dat - @ICU_DATA=. $(INVOKE) $(TOOLDIR)/genrb/genrb -q -s $(SRCDATADIR) -d . $(> $@; \ diff --git a/icu4c/source/extra/Makefile.in b/icu4c/source/extra/Makefile.in index 7ddda626f8c..35e1d83524c 100644 --- a/icu4c/source/extra/Makefile.in +++ b/icu4c/source/extra/Makefile.in @@ -51,7 +51,7 @@ all-recursive install-recursive clean-recursive distclean-recursive dist-recursi @dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ + echo "$(MAKE)[$(MAKELEVEL)]: Making \`$$target' in \`$$subdir'"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ local_target="$$target-local"; \ diff --git a/icu4c/source/samples/Makefile.in b/icu4c/source/samples/Makefile.in index 5398aedc44a..81c88c1018b 100644 --- a/icu4c/source/samples/Makefile.in +++ b/icu4c/source/samples/Makefile.in @@ -43,7 +43,7 @@ all-recursive install-recursive clean-recursive distclean-recursive dist-recursi @dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ + echo "$(MAKE)[$(MAKELEVEL)]: Making \`$$target' in \`$$subdir'"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ local_target="$$target-local"; \ diff --git a/icu4c/source/samples/layout/Makefile.in b/icu4c/source/samples/layout/Makefile.in index 171571122c7..bc5248b5fe5 100644 --- a/icu4c/source/samples/layout/Makefile.in +++ b/icu4c/source/samples/layout/Makefile.in @@ -78,8 +78,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status # they were copied from the default rules in mh-linux which # is probably OK because this sample will only run on Linux... scrptrun.d: $(top_srcdir)/extra/scrptrun/scrptrun.cpp - @echo "Generating dependency information for $<" - @$(SHELL) -ec '$(GEN_DEPS.cc) $< \ + $(SHELL) -ec '$(GEN_DEPS.cc) $< \ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ [ -s $@ ] || rm -f $@' diff --git a/icu4c/source/samples/uresb/Makefile b/icu4c/source/samples/uresb/Makefile index 9a51cecff4f..9275603eca0 100644 --- a/icu4c/source/samples/uresb/Makefile +++ b/icu4c/source/samples/uresb/Makefile @@ -1,5 +1,5 @@ # Copyright (c) 2000 IBM, Inc. and others -# conversion sample code $Revision: 1.3 $ +# conversion sample code $Revision: 1.4 $ # Usage: @@ -74,15 +74,15 @@ distclean clean: ## resources root.res : root.txt - @echo "Generating $@" + #@echo "generating $@" $(GENRB) $(GENRBOPT) $? en.res : en.txt - @echo "Generating $@" + #@echo "generating $@" $(GENRB) $(GENRBOPT) $? sr.res : sr.txt - @echo "Generating $@" + #@echo "generating $@" $(GENRB) $(GENRBOPT) -e cp1251 $? diff --git a/icu4c/source/test/Makefile.in b/icu4c/source/test/Makefile.in index 3ad6ca82b7d..f65d7103823 100644 --- a/icu4c/source/test/Makefile.in +++ b/icu4c/source/test/Makefile.in @@ -48,7 +48,7 @@ all-recursive install-recursive clean-recursive distclean-recursive dist-recursi @dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ + echo "$(MAKE)[$(MAKELEVEL)]: Making \`$$target' in \`$$subdir'"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ local_target="$$target-local"; \ diff --git a/icu4c/source/test/testdata/Makefile.in b/icu4c/source/test/testdata/Makefile.in index 9246b926042..7feb36608eb 100644 --- a/icu4c/source/test/testdata/Makefile.in +++ b/icu4c/source/test/testdata/Makefile.in @@ -60,7 +60,7 @@ all-recursive install-recursive clean-recursive distclean-recursive dist-recursi @dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ + echo "$(MAKE)[$(MAKELEVEL)]: Making \`$$target' in \`$$subdir'"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ local_target="$$target-local"; \ @@ -86,7 +86,7 @@ doc: (cd $$subdir && \ $(MAKE) includedir=$$tmpdir/include install-headers); \ done; \ - echo "Generating html documentation..."; \ + echo "generating HTML documentation"; \ doc++ -H -d $$tmpdir/html $$tmpdir/include/*.h > /dev/null 2>&1; \ $(RMV) $$tmpdir diff --git a/icu4c/source/tools/Makefile.in b/icu4c/source/tools/Makefile.in index 99be982e6ec..6e472baaf59 100644 --- a/icu4c/source/tools/Makefile.in +++ b/icu4c/source/tools/Makefile.in @@ -82,7 +82,7 @@ all-recursive install-recursive clean-recursive distclean-recursive dist-recursi @dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ + echo "$(MAKE)[$(MAKELEVEL)]: Making \`$$target' in \`$$subdir'"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ local_target="$$target-local"; \ @@ -164,7 +164,7 @@ distclean-local: clean-local $(RMV) Makefile $(TMPDATADIR)/$(ICUDATA_NAME).lst: Makefile $(srcdir)/Makefile.in $(srcdir)/genrb/genrbfiles.mk $(srcdir)/makeconv/ucmfiles.mk - @echo Generating $@ list of data files + @echo "generating $@ (list of data files)" @$(MKINSTALLDIRS) $(TMPDATADIR) @-$(RMV) $(TMPDATADIR)/$(ICUDATA_NAME).lst @for file in $(DATAFILESL); do \ @@ -172,20 +172,20 @@ $(TMPDATADIR)/$(ICUDATA_NAME).lst: Makefile $(srcdir)/Makefile.in $(srcdir)/genr done; $(TMPDATADIR)/testdata.lst: Makefile - @$(MKINSTALLDIRS) $(TMPDATADIR) - @echo $(DATABUILDDIR)/test.dat > $@ + $(MKINSTALLDIRS) $(TMPDATADIR) + echo $(DATABUILDDIR)/test.dat > $@ $(TMPDATADIR)2/testdata.lst: Makefile $(top_builddir)/test/testdata/root.res - @$(MKINSTALLDIRS) $(TMPDATADIR)2 - @echo $(DATABUILDDIR)/test.dat > $@ - @echo $(DATABUILDDIR)/../test/testdata/root.res >> $@ + $(MKINSTALLDIRS) $(TMPDATADIR)2 + echo $(DATABUILDDIR)/test.dat > $@ + echo $(DATABUILDDIR)/../test/testdata/root.res >> $@ $(TMPDATADIR)/icupkg.inc: pkgdata/icupkg.inc - @$(MKINSTALLDIRS) $(TMPDATADIR) + $(MKINSTALLDIRS) $(TMPDATADIR) cp pkgdata/icupkg.inc $(TMPDATADIR)/icupkg.inc $(TMPDATADIR)2/icupkg.inc: pkgdata/icupkg.inc - @$(MKINSTALLDIRS) $(TMPDATADIR)2 + $(MKINSTALLDIRS) $(TMPDATADIR)2 cp pkgdata/icupkg.inc $(TMPDATADIR)2/icupkg.inc # build the ICU and test data diff --git a/icu4c/source/tools/genccode/genccode.c b/icu4c/source/tools/genccode/genccode.c index 88a2a1a7879..1924c2bdb9b 100644 --- a/icu4c/source/tools/genccode/genccode.c +++ b/icu4c/source/tools/genccode/genccode.c @@ -72,6 +72,8 @@ char symPrefix[100]; extern int main(int argc, char* argv[]) { + UBool verbose = FALSE; + options[2].value = "."; /* read command line options */ @@ -117,17 +119,19 @@ main(int argc, char* argv[]) { void (*writeCode)(const char *, const char *); #ifdef CAN_GENERATE_OBJECTS if(options[5].doesOccur) { - message="Generating object code for %s\n"; + message="generating object code for %s\n"; writeCode=&writeObjectCode; } else #endif { - message="Generating C code for %s\n"; + message="generating C code for %s\n"; writeCode=&writeCCode; } while(--argc) { filename=getLongPathname(argv[argc]); - fprintf(stdout, message, filename); + if (verbose) { + fprintf(stdout, message, filename); + } column=0xffff; writeCode(filename, options[2].value); } diff --git a/icu4c/source/tools/gencmn/gencmn.c b/icu4c/source/tools/gencmn/gencmn.c index 1b336cdfa5c..4ecbaae5d9f 100644 --- a/icu4c/source/tools/gencmn/gencmn.c +++ b/icu4c/source/tools/gencmn/gencmn.c @@ -176,10 +176,12 @@ main(int argc, char* argv[]) { } } - if(sourceTOC) { - printf("Generating %s_%s.c Table of Contents source file\n", options[6].value, options[7].value); - } else { - printf("Generating %s.%s common data file with Table of Contents\n", options[6].value, options[7].value); + if (options[2].doesOccur) { + if(sourceTOC) { + printf("Generating %s_%s.c Table of Contents source file\n", options[6].value, options[7].value); + } else { + printf("Generating %s.%s common data file with Table of Contents\n", options[6].value, options[7].value); + } } /* read the list of files and get their lengths */ @@ -210,7 +212,7 @@ main(int argc, char* argv[]) { } if(fileCount==0) { - printf("gencmn: no files listed in %s\n", argc==2 ? "" : argv[2]); + fprintf(stderr, "gencmn: no files listed in %s\n", argc==2 ? "" : argv[2]); return 0; } diff --git a/icu4c/source/tools/genrb/genrb.c b/icu4c/source/tools/genrb/genrb.c index 4006c808364..87ec2fa40b7 100644 --- a/icu4c/source/tools/genrb/genrb.c +++ b/icu4c/source/tools/genrb/genrb.c @@ -54,7 +54,7 @@ enum { HELP1, HELP2, -/* VERBOSE, */ + VERBOSE, QUIET, VERSION, SOURCEDIR, @@ -67,7 +67,7 @@ enum UOption options[]={ UOPTION_HELP_H, UOPTION_HELP_QUESTION_MARK, -/* UOPTION_VERBOSE, */ + UOPTION_VERBOSE, UOPTION_QUIET, UOPTION_VERSION, UOPTION_SOURCEDIR, @@ -82,6 +82,8 @@ UOption options[]={ #include #endif +static UBool verbose = FALSE; + int main(int argc, char* argv[]) { @@ -90,7 +92,6 @@ main(int argc, const char *outputDir = NULL; /* NULL = no output directory, use current */ const char *inputDir = NULL; const char *encoding = ""; -/* UBool verbose; */ int i; #ifdef XP_MAC_CONSOLE @@ -102,7 +103,7 @@ main(int argc, /* error handling, printing usage message */ if(argc<0) { - fprintf(stderr, "error in command line argument \"%s\"\n", argv[-argc]); + fprintf(stderr, "%s: error in command line argument \"%s\"\n", argv[0], argv[-argc]); } else if(argc<2) { argc = -1; } @@ -142,9 +143,9 @@ main(int argc, return argc < 0 ? U_ILLEGAL_ARGUMENT_ERROR : U_ZERO_ERROR; } -/* if(options[VERBOSE].doesOccur) { + if(options[VERBOSE].doesOccur) { verbose = TRUE; - }*/ + } if(options[QUIET].doesOccur) { setShowWarning(FALSE); @@ -177,8 +178,9 @@ main(int argc, status = U_ZERO_ERROR; arg = getLongPathname(argv[i]); - printf("genrb: processing file \"%s\"\n", arg); - + if (verbose) { + printf("%s: processing file \"%s\"\n", argv[0], arg); + } processFile(arg, encoding, inputDir, outputDir, &status); } @@ -251,12 +253,12 @@ processFile(const char *filename, const char *cp, const char *inputDir, const ch if(in == 0) { *status = U_FILE_ACCESS_ERROR; - fprintf(stderr, "Couldn't open file %s\n", openFileName == NULL ? filename : openFileName); + fprintf(stderr, "couldn't open file %s\n", openFileName == NULL ? filename : openFileName); goto finish; } else { /* auto detect popular encodings */ - if (*cp=='\0' &&ucbuf_autodetect(in, &cp)) { - printf("Autodetected encoding %s\n", cp); + if (*cp=='\0' && ucbuf_autodetect(in, &cp) && verbose) { + printf("%s: autodetected encoding %s\n", cp); } } diff --git a/icu4c/source/tools/gentest/gentest.c b/icu4c/source/tools/gentest/gentest.c index 8c9014fe82f..7777be4cbd6 100644 --- a/icu4c/source/tools/gentest/gentest.c +++ b/icu4c/source/tools/gentest/gentest.c @@ -75,7 +75,7 @@ main(int argc, char* argv[]) { return argc<0 ? U_ILLEGAL_ARGUMENT_ERROR : U_ZERO_ERROR; } - printf("Generating the test memory mapped file\n"); + /* printf("Generating the test memory mapped file\n"); */ createData(options[2].value); return 0; } diff --git a/icu4c/source/tools/gentz/gentz.cpp b/icu4c/source/tools/gentz/gentz.cpp index 66c3221adad..d0274607878 100644 --- a/icu4c/source/tools/gentz/gentz.cpp +++ b/icu4c/source/tools/gentz/gentz.cpp @@ -110,6 +110,8 @@ class gentz { uint32_t equivCount; // Number of equivalency groups UBool useCopyright; + UBool verbose; + public: int MMain(int argc, char *argv[]); @@ -169,7 +171,8 @@ static UOption options[]={ UOPTION_HELP_H, UOPTION_HELP_QUESTION_MARK, UOPTION_COPYRIGHT, - UOPTION_DESTDIR + UOPTION_DESTDIR, + UOPTION_VERBOSE }; int gentz::MMain(int argc, char* argv[]) { @@ -191,6 +194,7 @@ int gentz::MMain(int argc, char* argv[]) { "\tread the timezone file produced by tz.pl and create " TZ_DATA_NAME "." TZ_DATA_TYPE "\n" "\toptions:\n" "\t\t-h or -? or --help this usage text\n" + "\t\t-v or --verbose turn on verbose output\n" "\t\t-c or --copyright include a copyright notice\n" "\t\t-d or --destdir destination directory, followed by the path\n", argv[0]); @@ -199,13 +203,17 @@ int gentz::MMain(int argc, char* argv[]) { /* get the options values */ useCopyright=options[2].doesOccur; + verbose = options[4].doesOccur; + //////////////////////////////////////////////////////////// // Read the input file //////////////////////////////////////////////////////////// *buffer = NUL; lineNumber = 0; - fprintf(stdout, "Input file: %s\n", argv[1]); + if (verbose) { + fprintf(stdout, "Input file: %s\n", argv[1]); + } FileStream* in = T_FileStream_open(argv[1], "r"); if (in == 0) { die("Cannot open input file"); @@ -218,8 +226,10 @@ int gentz::MMain(int argc, char* argv[]) { // Write the output file //////////////////////////////////////////////////////////// int32_t wlen = writeTzDatFile(options[3].value); - fprintf(stdout, "Output file: %s.%s, %ld bytes\n", + if (verbose) { + fprintf(stdout, "Output file: %s.%s, %ld bytes\n", TZ_DATA_NAME, TZ_DATA_TYPE, (long)wlen); + } return 0; // success } @@ -435,8 +445,10 @@ TZEquivalencyGroup* gentz::parseEquivTable(FileStream* in) { } equivTableSize = (int8_t*)eg - (int8_t*)result; readEndMarker(in); - fprintf(stdout, " Read %lu equivalency table entries, in-memory size %ld bytes\n", + if (verbose) { + fprintf(stdout, " Read %lu equivalency table entries, in-memory size %ld bytes\n", (unsigned long)equivCount, (long)equivTableSize); + } return (TZEquivalencyGroup*)result; } @@ -508,8 +520,10 @@ OffsetIndex* gentz::parseOffsetIndexTable(FileStream* in) { die("Yikes! Interal error while constructing offset index table"); } readEndMarker(in); - fprintf(stdout, " Read %lu offset index table entries, in-memory size %ld bytes\n", + if (verbose) { + fprintf(stdout, " Read %lu offset index table entries, in-memory size %ld bytes\n", (unsigned long)n, (long)offsetIndexSize); + } return (OffsetIndex*)result; } @@ -567,8 +581,9 @@ CountryIndex* gentz::parseCountryIndexTable(FileStream* in) { countryIndexSize += pad; *(uint16_t*)index = 0; // Clear pad bits } - fprintf(stdout, " Read %lu country index table entries, in-memory size %ld bytes\n", - (unsigned long)n, (long)countryIndexSize); + if (verbose) { + fprintf(stdout, " Read %lu country index table entries, in-memory size %ld bytes\n", (unsigned long)n, (long)countryIndexSize); + } return (CountryIndex*)result; } @@ -594,9 +609,11 @@ void gentz::parseHeader(FileStream* in) { readEndMarker(in); - fprintf(stdout, " Read header, data version %u(%u), in-memory size %ld bytes\n", + if (verbose) { + fprintf(stdout, " Read header, data version %u(%u), in-memory size %ld bytes\n", header.versionYear, header.versionSuffix, (unsigned long)sizeof(header)); + } } void gentz::parseDSTRule(char*& p, TZRule& rule) { @@ -665,8 +682,10 @@ char* gentz::parseNameTable(FileStream* in) { die("Name table shorter than declared size"); } readEndMarker(in); - fprintf(stdout, " Read %ld names, in-memory size %ld bytes\n", + if (verbose) { + fprintf(stdout, " Read %ld names, in-memory size %ld bytes\n", (long)n, (long)nameTableSize); + } return names; } diff --git a/icu4c/source/tools/genuca/genuca.cpp b/icu4c/source/tools/genuca/genuca.cpp index a9ae6843c31..1faed0e932a 100644 --- a/icu4c/source/tools/genuca/genuca.cpp +++ b/icu4c/source/tools/genuca/genuca.cpp @@ -311,9 +311,11 @@ static void writeOutInverseData(InverseTableHeader *data, } /* write the data to the file */ - fprintf(stdout, "Writing out inverse UCA table: %s%s.%s\n", outputDir, + if (VERBOSE) { + fprintf(stdout, "Writing out inverse UCA table: %s%c%s.%s\n", outputDir, U_FILE_SEP_CHAR, INVC_DATA_NAME, INVC_DATA_TYPE); + } udata_writeBlock(pData, data, data->byteSize); /* finish up */ @@ -547,9 +549,12 @@ void writeOutData(UCATableHeader *data, } /* write the data to the file */ - fprintf(stdout, "Writing out UCA table: %s%s.%s\n", outputDir, + if (VERBOSE) { + fprintf(stdout, "Writing out UCA table: %s%c%s.%s\n", outputDir, + U_FILE_SEP_CHAR, UCA_DATA_NAME, UCA_DATA_TYPE); + } udata_writeBlock(pData, data, size); if(noOfcontractions != 0) { diff --git a/icu4c/source/tools/pkgdata/cmnmode.c b/icu4c/source/tools/pkgdata/cmnmode.c index 0b807fd4682..fa4716a5f1b 100644 --- a/icu4c/source/tools/pkgdata/cmnmode.c +++ b/icu4c/source/tools/pkgdata/cmnmode.c @@ -83,7 +83,7 @@ void pkg_mode_common(UPKGOptions *o, FileStream *makefile, UErrorCode *status) "\tcat $(LISTFILES) > $(CMNLIST)\n\n"); } else { T_FileStream_writeLine(makefile, "$(CMNLIST): \n" - "\t@echo Generating $@ list of data files\n" + "\t@echo \"generating $@ (list of data files)\"\n" "\t@-$(RMV) $@\n" "\t@for file in $(DATAFILEPATHS); do \\\n" "\t echo $$file >> $@; \\\n" diff --git a/icu4c/source/tools/pkgdata/dllmode.c b/icu4c/source/tools/pkgdata/dllmode.c index 299add472fe..cfa845814ce 100644 --- a/icu4c/source/tools/pkgdata/dllmode.c +++ b/icu4c/source/tools/pkgdata/dllmode.c @@ -179,7 +179,7 @@ void pkg_mode_dll(UPKGOptions *o, FileStream *makefile, UErrorCode *status) "\tcat $(LISTFILES) > $(CMNLIST)\n\n"); } else { T_FileStream_writeLine(makefile, "$(CMNLIST): \n" - "\t@echo Generating $@ list of data files\n" + "\t@echo \"generating $@ (list of data files)\"\n" "\t@-$(RMV) $@\n" "\t@for file in $(DATAFILEPATHS); do \\\n" "\t echo $$file >> $@; \\\n"