From 246977f9301930ff109a77afc0345817674e15a8 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl@icu-project.org>
Date: Wed, 31 Jul 2002 21:06:04 +0000
Subject: [PATCH] ICU-1992 data packaging

X-SVN-Rev: 9475
---
 icu4c/source/data/makedata.mak         | 2 +-
 icu4c/source/extra/uconv/makedata.mak  | 4 ++--
 icu4c/source/extra/uconv/uconv.cpp     | 2 +-
 icu4c/source/test/testdata/testdata.mk | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/icu4c/source/data/makedata.mak b/icu4c/source/data/makedata.mak
index e9d88aaf6bd..ed5b457a4d6 100644
--- a/icu4c/source/data/makedata.mak
+++ b/icu4c/source/data/makedata.mak
@@ -247,7 +247,7 @@ BRK_FILES = "$(ICUBLD)\$(ICUDT)sent.brk" "$(ICUBLD)\$(ICUDT)char.brk" "$(ICUBLD)
 "$(DLL_OUTPUT)\$(U_ICUDATA_NAME).dll" : "$(ICUTOOLS)\pkgdata\$(CFG)\pkgdata.exe" $(CNV_FILES) $(BRK_FILES) "$(ICUBLD)\$(ICUDT)uprops.icu" "$(ICUBLD)\$(ICUDT)unames.icu" "$(ICUBLD)\$(ICUDT)unorm.icu" "$(ICUBLD)\$(ICUDT)cnvalias.icu" "$(ICUBLD)\$(ICUDT)tz.icu" "$(ICUBLD)\$(ICUDT)ucadata.icu" "$(ICUBLD)\$(ICUDT)invuca.icu" $(ALL_RES) "$(ICUBLD)\$(ICUDT)icudata.res" "$(ICUP)\source\stubdata\stubdatabuilt.txt"
 	@echo Building icu data
 	@cd "$(ICUBLD)"
- 	@"$(ICUTOOLS)\pkgdata\$(CFG)\pkgdata" -e $(U_ICUDATA_NAME) -v -m dll -c -p $(ICUPKG) -O "$(PKGOPT)" -d "$(ICUBLD)" -s . <<pkgdatain.txt
+ 	@"$(ICUTOOLS)\pkgdata\$(CFG)\pkgdata" -f -e $(U_ICUDATA_NAME) -v -m dll -c -p $(ICUPKG) -O "$(PKGOPT)" -d "$(ICUBLD)" -s . <<pkgdatain.txt
 $(ICUDT)uprops.icu
 $(ICUDT)unames.icu
 $(ICUDT)unorm.icu
diff --git a/icu4c/source/extra/uconv/makedata.mak b/icu4c/source/extra/uconv/makedata.mak
index b47cb957b1b..159553c6a50 100644
--- a/icu4c/source/extra/uconv/makedata.mak
+++ b/icu4c/source/extra/uconv/makedata.mak
@@ -93,7 +93,7 @@ ALL : GODATA  $(OUTPUT) GOBACK #$(RESNAME).dat
 # invoke pkgdata - static
 "$(DLL_OUTPUT)\$(RESNAME).lib" :  $(RB_FILES) $(RESFILES)
 	@echo Building $(RESNAME).lib
-	@"$(ICUTOOLS)\pkgdata" -v -m static -c -p $(RESNAME) -O "$(PKGOPT)" -d "$(DLL_OUTPUT)" -s "$(RESDIR)" <<pkgdatain.txt
+	@"$(ICUTOOLS)\pkgdata" -f -v -m static -c -p $(RESNAME) -O "$(PKGOPT)" -d "$(DLL_OUTPUT)" -s "$(RESDIR)" <<pkgdatain.txt
 $(RB_FILES:.res =.res
 )
 <<KEEP
@@ -115,7 +115,7 @@ CLEAN :
 	-@erase "base*.*"
 	@cd "$(ICUTOOLS)"
     -@erase "$(RB_FILES)"
-    -@"$(ICUTOOLS)\pkgdata" --clean -v -m static -c -p $(RESNAME) -O "$(PKGOPT)" -d "$(DLL_OUTPUT)" -s "$(RESDIR)" pkgdatain.txt
+    -@"$(ICUTOOLS)\pkgdata" -f --clean -v -m static -c -p $(RESNAME) -O "$(PKGOPT)" -d "$(DLL_OUTPUT)" -s "$(RESDIR)" pkgdatain.txt
 
 # Inference rule for creating resource bundles
 .txt.res:
diff --git a/icu4c/source/extra/uconv/uconv.cpp b/icu4c/source/extra/uconv/uconv.cpp
index c0131a12b6f..b3464324535 100644
--- a/icu4c/source/extra/uconv/uconv.cpp
+++ b/icu4c/source/extra/uconv/uconv.cpp
@@ -84,7 +84,7 @@ static void initMsg(const char *pname) {
 #ifdef UCONVMSG_LINK
             fprintf(stderr,
                     "%s: setAppData was called, internal data %s failed to load\n",
-                        UCONVMSG);
+                        pname, UCONVMSG);
 #endif
  
             err = U_ZERO_ERROR;
diff --git a/icu4c/source/test/testdata/testdata.mk b/icu4c/source/test/testdata/testdata.mk
index d862bed0044..f0d4260817a 100644
--- a/icu4c/source/test/testdata/testdata.mk
+++ b/icu4c/source/test/testdata/testdata.mk
@@ -17,7 +17,7 @@ ALL : "$(TESTDATAOUT)\testdata.dat"
 "$(TESTDATAOUT)\testdata.dat" : "$(TESTDATABLD)\casing.res" "$(TESTDATABLD)\root.res" "$(TESTDATABLD)\te.res" "$(TESTDATABLD)\te_IN.res" "$(TESTDATABLD)\testaliases.res" "$(TESTDATABLD)\testtypes.res" "$(TESTDATABLD)\testempty.res" "$(TESTDATABLD)\ja_data.res" "$(TESTDATABLD)\DataDrivenCollationTest.res" $(TESTDATABLD)\testdata_test.icu "$(TESTDATABLD)\testdata_test1.cnv" "$(TESTDATABLD)\testdata_test3.cnv" "$(TESTDATABLD)\testdata_test4.cnv" 
 	@echo Building test data
 	@copy "$(TESTDATABLD)\testdata_te.res" "$(TESTDATAOUT)\testdata_nam.typ"
-	@"$(ICUTOOLS)\pkgdata\$(CFG)\pkgdata" -v -m common -c -p"$(TESTPKG)"  -O "$(PKGOPT)" -d "$(TESTDATAOUT)" -T "$(TESTDATABLD)" -s "$(TESTDATABLD)" <<
+	@"$(ICUTOOLS)\pkgdata\$(CFG)\pkgdata" -f -v -m common -c -p"$(TESTPKG)"  -O "$(PKGOPT)" -d "$(TESTDATAOUT)" -T "$(TESTDATABLD)" -s "$(TESTDATABLD)" <<
 testdata_casing.res
 testdata_root.res
 testdata_te.res