From 7497b4f8b0bf18ec838795a0a82569e6cb5c78d9 Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Sun, 18 Jul 2004 22:04:47 +0000 Subject: [PATCH] ICU-2095 Make sure that tools don't depend on ICU_DATA X-SVN-Rev: 16049 --- icu4c/source/data/makedata.mak | 15 +++------------ icu4c/source/tools/genuca/genuca.cpp | 9 ++++----- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/icu4c/source/data/makedata.mak b/icu4c/source/data/makedata.mak index 40e952f7666..3af805feb45 100644 --- a/icu4c/source/data/makedata.mak +++ b/icu4c/source/data/makedata.mak @@ -117,9 +117,6 @@ TESTDATA=$(ICUP)\source\test\testdata # # TESTDATAOUT # The destination directory for the built test data .dat file -# When running the tests, ICU_DATA environment variable is set to here -# so that test data files can be loaded. (Tests are NOT run from this makefile, -# only the data is put in place.) TESTDATAOUT=$(ICUP)\source\test\testdata\out\ # @@ -432,7 +429,7 @@ res_index { @"$(ICUTOOLS)\genrb\$(CFG)\genrb" -k -d"$(ICUBLD)\$(ICUCOL)" .\$(ICUCOL)\res_index.txt {$(ICUSRCDATA_RELATIVE_PATH)\$(ICURBNF)}.txt{$(ICURBNF)}.res:: - @echo Making RBNF files $(RBNF_SOURCE) $(RBNF_RES_FILES) + @echo Making RBNF files @"$(ICUTOOLS)\genrb\$(CFG)\genrb" -k -i "$(ICUBLD)" -d"$(ICUBLD)\$(ICURBNF)" $< $(INDEX_RBNF_FILES): @@ -469,39 +466,33 @@ res_index { # Targets for unames.icu "$(ICUBLD)\unames.icu": "$(ICUUNIDATA)\*.txt" "$(ICUTOOLS)\gennames\$(CFG)\gennames.exe" @echo Creating data file for Unicode Names - @set ICU_DATA=$(ICUBLD) @"$(ICUTOOLS)\gennames\$(CFG)\gennames" -1 -u $(UNICODE_VERSION) "$(ICUUNIDATA)\UnicodeData.txt" # Targets for pnames.icu # >> Depends on the Unicode data as well as uchar.h and uscript.h << "$(ICUBLD)\pnames.icu": "$(ICUUNIDATA)\*.txt" "$(ICUTOOLS)\genpname\$(CFG)\genpname.exe" "$(ICUP)\source\common\unicode\uchar.h" "$(ICUP)\source\common\unicode\uscript.h" @echo Creating data file for Unicode Property Names - @set ICU_DATA=$(ICUBLD) @"$(ICUTOOLS)\genpname\$(CFG)\genpname" -d "$(ICUBLD)" # Targets for uprops.icu "$(ICUBLD)\uprops.icu": "$(ICUUNIDATA)\*.txt" "$(ICUTOOLS)\genprops\$(CFG)\genprops.exe" "$(ICUBLD)\pnames.icu" @echo Creating data file for Unicode Character Properties - @set ICU_DATA=$(ICUBLD) - @"$(ICUTOOLS)\genprops\$(CFG)\genprops" -u $(UNICODE_VERSION) -s "$(ICUUNIDATA)" + @"$(ICUTOOLS)\genprops\$(CFG)\genprops" -u $(UNICODE_VERSION) -i "$(ICUBLD)" -s "$(ICUUNIDATA)" # Targets for unorm.icu "$(ICUBLD)\unorm.icu": "$(ICUUNIDATA)\*.txt" "$(ICUTOOLS)\gennorm\$(CFG)\gennorm.exe" @echo Creating data file for Unicode Normalization - @set ICU_DATA=$(ICUBLD) @"$(ICUTOOLS)\gennorm\$(CFG)\gennorm" -u $(UNICODE_VERSION) -s "$(ICUUNIDATA)" # Targets for converters "$(ICUBLD)\cnvalias.icu" : {"$(ICUSRCDATA)\$(ICUUCM)"}\convrtrs.txt "$(ICUTOOLS)\gencnval\$(CFG)\gencnval.exe" @echo Creating data file for Converter Aliases - @set ICU_DATA=$(ICUBLD) @"$(ICUTOOLS)\gencnval\$(CFG)\gencnval" "$(ICUSRCDATA)\$(ICUUCM)\convrtrs.txt" # Targets for ucadata.icu & invuca.icu "$(ICUBLD)\invuca.icu" "$(ICUBLD)\ucadata.icu": "$(ICUUNIDATA)\FractionalUCA.txt" "$(ICUTOOLS)\genuca\$(CFG)\genuca.exe" "$(ICUBLD)\uprops.icu" "$(ICUBLD)\unorm.icu" @echo Creating UCA data files - @set ICU_DATA=$(ICUBLD) - @"$(ICUTOOLS)\genuca\$(CFG)\genuca" -s "$(ICUUNIDATA)" + @"$(ICUTOOLS)\genuca\$(CFG)\genuca" -d "$(ICUBLD)" -i "$(ICUBLD)" -s "$(ICUUNIDATA)" # Targets for uidna.spp "$(ICUBLD)\uidna.spp" : "$(ICUUNIDATA)\*.txt" "$(ICUMISC)\NamePrepProfile.txt" diff --git a/icu4c/source/tools/genuca/genuca.cpp b/icu4c/source/tools/genuca/genuca.cpp index 4441ed47c9e..b2cf97fd59b 100644 --- a/icu4c/source/tools/genuca/genuca.cpp +++ b/icu4c/source/tools/genuca/genuca.cpp @@ -357,7 +357,7 @@ static void writeOutInverseData(InverseUCATableHeader *data, copyright, status); if(U_FAILURE(*status)) { - fprintf(stderr, "Error: unable to create data memory, error %d\n", *status); + fprintf(stderr, "Error: unable to create %s"INVC_DATA_NAME", error %s\n", outputDir, u_errorName(*status)); return; } @@ -704,7 +704,7 @@ void writeOutData(UCATableHeader *data, copyright, status); if(U_FAILURE(*status)) { - fprintf(stderr, "Error: unable to create data memory, error %d\n", *status); + fprintf(stderr, "Error: unable to create %s"UCA_DATA_NAME", error %s\n", outputDir, u_errorName(*status)); return; } @@ -1042,15 +1042,14 @@ int main(int argc, char* argv[]) { return argc<0 ? U_ILLEGAL_ARGUMENT_ERROR : U_ZERO_ERROR; } if(options[3].doesOccur) { - fprintf(stdout, "genuca version %hu.%hu, ICU tool to read UCA text data and create UCA data tables for collation.\n", + fprintf(stdout, "genuca version %hu.%hu, ICU tool to read UCA text data and create UCA data tables for collation.\n", #if UCONFIG_NO_COLLATION 0, 0 #else ucaDataInfo.formatVersion[0], ucaDataInfo.formatVersion[1] #endif ); - fprintf(stdout, "Copyright (C) 2000-2001, International Business Machines\n"); - fprintf(stdout, "Corporation and others. All Rights Reserved.\n"); + fprintf(stdout, U_COPYRIGHT_STRING"\n"); exit(0); }