From 2f30c04d517d4407bf7300a636fffcf3ef3e1d61 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Wed, 31 Jul 2002 00:51:06 +0000 Subject: [PATCH] ICU-1992 data packaging, update to uconv X-SVN-Rev: 9454 --- icu4c/source/extra/uconv/makedata.mak | 2 +- icu4c/source/extra/uconv/uconv.cpp | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/icu4c/source/extra/uconv/makedata.mak b/icu4c/source/extra/uconv/makedata.mak index 6162deb86fa..b47cb957b1b 100644 --- a/icu4c/source/extra/uconv/makedata.mak +++ b/icu4c/source/extra/uconv/makedata.mak @@ -120,7 +120,7 @@ CLEAN : # Inference rule for creating resource bundles .txt.res: @echo Making Resource Bundle files - "$(ICUTOOLS)\genrb" -s $(@D) -d $(@D) $(?F) + "$(ICUTOOLS)\genrb" -t -p $(RESNAME) -s $(@D) -d $(@D) $(?F) $(RESSRC) : {"$(ICUTOOLS)"}genrb.exe diff --git a/icu4c/source/extra/uconv/uconv.cpp b/icu4c/source/extra/uconv/uconv.cpp index 2b1c9213883..c0131a12b6f 100644 --- a/icu4c/source/extra/uconv/uconv.cpp +++ b/icu4c/source/extra/uconv/uconv.cpp @@ -81,16 +81,22 @@ static void initMsg(const char *pname) { fprintf(stderr, "%s: warning: couldn't open bundle %s: %s\n", pname, UCONVMSG, u_errorName(err)); +#ifdef UCONVMSG_LINK + fprintf(stderr, + "%s: setAppData was called, internal data %s failed to load\n", + UCONVMSG); +#endif err = U_ZERO_ERROR; /* that was try #1, try again with a path */ uprv_strcpy(dataPath, u_getDataDirectory()); + uprv_strcat(dataPath, U_FILE_SEP_STRING); uprv_strcat(dataPath, UCONVMSG); gBundle = u_wmsg_setPath(dataPath, &err); if (U_FAILURE(err)) { fprintf(stderr, - "%s: warning: couldn't open bundle %s: %s\n", + "%s: warning: still couldn't open bundle %s: %s\n", pname, dataPath, u_errorName(err)); fprintf(stderr, "%s: warning: messages will not be displayed\n", pname); }