From 34345f0371fc89ba57ea1a3a344189d32fadb57b Mon Sep 17 00:00:00 2001
From: John Emmons <emmo@us.ibm.com>
Date: Mon, 22 Sep 2008 17:16:32 +0000
Subject: [PATCH] ICU-6512 Fix dependency information for coll/root.txt to
 ucadata - Move ucadata and invuca to coll

X-SVN-Rev: 24616
---
 icu4c/source/data/Makefile.in            | 8 ++++----
 icu4c/source/data/coll/root.txt          | 2 +-
 icu4c/source/data/xml/collation/root.xml | 2 +-
 icu4c/source/i18n/ucol_bld.cpp           | 2 +-
 icu4c/source/i18n/ucol_res.cpp           | 2 +-
 icu4c/source/test/cintltst/udatatst.c    | 6 ++++++
 icu4c/source/tools/toolutil/pkgitems.cpp | 1 -
 7 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/icu4c/source/data/Makefile.in b/icu4c/source/data/Makefile.in
index 8ac64d3bc3e..139a4e1194d 100644
--- a/icu4c/source/data/Makefile.in
+++ b/icu4c/source/data/Makefile.in
@@ -1,5 +1,5 @@
 ## Makefile.in for ICU data
-## Copyright (c) 1999-2007, International Business Machines Corporation and
+## Copyright (c) 1999-2008, International Business Machines Corporation and
 ## others. All Rights Reserved.
 
 ## Source directory information
@@ -201,7 +201,7 @@ package390: $(OUTTMPDIR)/icudata390.lst $(PKGDATA_LIST) ./icupkg.inc packagedata
 #  2005-may-05 Removed Unicode properties files (unorm.icu, uprops.icu, ucase.icu, ubidi.icu)
 #  from data build. See Jitterbug 4497. (makedata.mak revision 1.117)
 #
-DAT_FILES_SHORT=pnames.icu unames.icu cnvalias.icu ucadata.icu invuca.icu uidna.spp 
+DAT_FILES_SHORT=pnames.icu unames.icu cnvalias.icu coll/ucadata.icu coll/invuca.icu uidna.spp 
 DAT_FILES=$(DAT_FILES_SHORT:%=$(BUILDDIR)/%)
 
 ## BRK files
@@ -403,8 +403,8 @@ $(BUILDDIR)/unorm.icu: $(UNICODEDATADIR)/UnicodeData.txt $(UNICODEDATADIR)/Deriv
 # ucadata.icu
 # used to depend on $(BUILDDIR)/$(ICUDT)unorm.icu $(BUILDDIR)/$(ICUDT)ucase.icu
 # see Jitterbug 4497
-$(BUILDDIR)/ucadata.icu $(BUILDDIR)/$(ICUDT)invuca.icu: $(UNICODEDATADIR)/FractionalUCA.txt $(BINDIR)/genuca$(EXEEXT)
-	$(INVOKE) $(BINDIR)/genuca -s $(UNICODEDATADIR) -d $(BUILDDIR) -i $(BUILDDIR) 
+$(COLBLDDIR)/ucadata.icu $(COLBLDDIR)/invuca.icu: $(UNICODEDATADIR)/FractionalUCA.txt $(BINDIR)/genuca$(EXEEXT)
+	$(INVOKE) $(BINDIR)/genuca -s $(UNICODEDATADIR) -d $(COLBLDDIR) -i $(BUILDDIR) 
 
 # unames.icu
 $(BUILDDIR)/unames.icu: $(UNICODEDATADIR)/UnicodeData.txt $(BINDIR)/gennames$(EXEEXT)
diff --git a/icu4c/source/data/coll/root.txt b/icu4c/source/data/coll/root.txt
index 5e8eadaa9ed..7ed255e7d65 100644
--- a/icu4c/source/data/coll/root.txt
+++ b/icu4c/source/data/coll/root.txt
@@ -19,5 +19,5 @@ root{
             Version{"1.6"}
         }
     }
-    depends:process(dependency){"../ucadata.icu"}
+    depends:process(dependency){"ucadata.icu"}
 }
diff --git a/icu4c/source/data/xml/collation/root.xml b/icu4c/source/data/xml/collation/root.xml
index 6a4b6e1432d..5be23c9a99d 100644
--- a/icu4c/source/data/xml/collation/root.xml
+++ b/icu4c/source/data/xml/collation/root.xml
@@ -16,7 +16,7 @@
     </identity>
     <special xmlns:icu="http://www.icu-project.org/">
         <icu:UCARules icu:uca_rules="../unidata/UCARules.txt"/>
-        <icu:depends icu:dependency="../ucadata.icu"/>
+        <icu:depends icu:dependency="ucadata.icu"/>
     </special>
 </ldml>
 
diff --git a/icu4c/source/i18n/ucol_bld.cpp b/icu4c/source/i18n/ucol_bld.cpp
index 46ab7ce169b..4151adfd20f 100644
--- a/icu4c/source/i18n/ucol_bld.cpp
+++ b/icu4c/source/i18n/ucol_bld.cpp
@@ -1335,7 +1335,7 @@ ucol_initInverseUCA(UErrorCode *status)
 
     if(needsInit) {
         InverseUCATableHeader *newInvUCA = NULL;
-        UDataMemory *result = udata_openChoice(NULL, INVC_DATA_TYPE, INVC_DATA_NAME, isAcceptableInvUCA, NULL, status);
+        UDataMemory *result = udata_openChoice(U_ICUDATA_COLL, INVC_DATA_TYPE, INVC_DATA_NAME, isAcceptableInvUCA, NULL, status);
 
         if(U_FAILURE(*status)) {
             if (result) {
diff --git a/icu4c/source/i18n/ucol_res.cpp b/icu4c/source/i18n/ucol_res.cpp
index e259cc6f7b6..20bac0ed705 100644
--- a/icu4c/source/i18n/ucol_res.cpp
+++ b/icu4c/source/i18n/ucol_res.cpp
@@ -108,7 +108,7 @@ ucol_initUCA(UErrorCode *status) {
     UMTX_CHECK(NULL, (_staticUCA == NULL), needsInit);
 
     if(needsInit) {
-        UDataMemory *result = udata_openChoice(NULL, UCA_DATA_TYPE, UCA_DATA_NAME, isAcceptableUCA, NULL, status);
+        UDataMemory *result = udata_openChoice(U_ICUDATA_COLL, UCA_DATA_TYPE, UCA_DATA_NAME, isAcceptableUCA, NULL, status);
 
         if(U_SUCCESS(*status)){
             UCollator *newUCA = ucol_initCollator((const UCATableHeader *)udata_getMemory(result), NULL, NULL, status);
diff --git a/icu4c/source/test/cintltst/udatatst.c b/icu4c/source/test/cintltst/udatatst.c
index e609b476f1d..2c05ba58dcc 100644
--- a/icu4c/source/test/cintltst/udatatst.c
+++ b/icu4c/source/test/cintltst/udatatst.c
@@ -48,6 +48,7 @@
 #include "ucnv_io.h"
 #include "uprops.h"
 #include "ucase.h"
+#include "ucol_imp.h"
 #include "ucol_swp.h"
 #include "ucnv_bld.h"
 #include "unormimp.h"
@@ -1643,6 +1644,11 @@ TestSwapData() {
             pkg=U_ICUDATA_BRKITR;
             nm=swapCases[i].name;
             uprv_strcpy(name, U_ICUDATA_BRKITR);
+        } else if (uprv_strcmp(swapCases[i].name, "ucadata")==0
+            || uprv_strcmp(swapCases[i].name, "invuca")==0) {
+            pkg=U_ICUDATA_COLL;
+            nm=swapCases[i].name;
+            uprv_strcpy(name, U_ICUDATA_COLL);
         } else {
             pkg=NULL;
             nm=swapCases[i].name;
diff --git a/icu4c/source/tools/toolutil/pkgitems.cpp b/icu4c/source/tools/toolutil/pkgitems.cpp
index 7c36ef98e81..a374133a983 100644
--- a/icu4c/source/tools/toolutil/pkgitems.cpp
+++ b/icu4c/source/tools/toolutil/pkgitems.cpp
@@ -215,7 +215,6 @@ ures_enumDependencies(const UDataSwapper *ds,
                 break;
             }
             useResSuffix = FALSE;
-            break;
         } else {
             // we ignore all other strings
             break;