ICU-4620 uconfig test updates

X-SVN-Rev: 18158

icu4c/source/tools/gennorm/gennorm.c

@@ -161,7 +161,7 @@ main(int argc, char* argv[]) {
         "gennorm writes a dummy " U_ICUDATA_NAME "_" DATA_NAME "." DATA_TYPE
         " because UCONFIG_NO_NORMALIZATION is set, \n"
         "see icu/source/common/unicode/uconfig.h\n");
-    generateData(destDir);
+    generateData(destDir, options[CSOURCE].doesOccur);
 
 #else
 

icu4c/source/tools/gennorm/store.c

@@ -1941,6 +1941,11 @@ generateData(const char *dataDir, UBool csource) {
 #endif
 
     if(csource) {
+#if UCONFIG_NO_NORMALIZATION
+    /* no csource for dummy mode..? */
+    fprintf(stderr, "gennorm error: UCONFIG_NO_NORMALIZATION is on in csource mode.\n");
+    exit(1);
+#else
         /* write .c file for hardcoded data */
         UTrie normTrie2={ NULL }, fcdTrie2={ NULL }, auxTrie2={ NULL };
         FILE *f;
@@ -2021,6 +2026,7 @@ generateData(const char *dataDir, UBool csource) {
                 "\n};\n\n");
             fclose(f);
         }
+#endif
     } else {
         /* write the data */
         pData=udata_create(dataDir, DATA_TYPE, DATA_NAME, &dataInfo,

icu4c/source/tools/genrb/parse.c

@@ -401,6 +401,7 @@ parseUCARules(char *tag, uint32_t startline, const struct UString* comment, UErr
 static struct SResource *
 parseTransliterator(char *tag, uint32_t startline, const struct UString* comment, UErrorCode *status)
 {
+#if !UCONFIG_NO_TRANSLITERATION
     struct SResource *result = NULL;
     struct UString   *tokenValue;
     FileStream       *file          = NULL;
@@ -469,6 +470,9 @@ parseTransliterator(char *tag, uint32_t startline, const struct UString* comment
     T_FileStream_close(file);
 
     return result;
+#else
+    return NULL;
+#endif
 }
 
 static struct SResource *
@@ -1520,7 +1524,9 @@ static struct {
     {"include", k_type_include, parseInclude},
     {"process(uca_rules)", k_type_plugin_uca_rules, parseUCARules},
     {"process(collation)", k_type_plugin_collation, NULL},
+#if !UCONFIG_NO_TRANSLITERATION
     {"process(transliterator)", k_type_plugin_transliterator, parseTransliterator},
+#endif
     {"reserved", NULL, NULL}
 };
 

icu4c/source/tools/icuswap/swapimpl.cpp

@@ -38,6 +38,7 @@
 #include "ucase.h"
 #include "ubidi_props.h"
 #include "unormimp.h"
+#include "utrie.h"
 
 /* Unicode properties data swapping ----------------------------------------- */
 

icu4c/source/tools/toolutil/xmlparser.cpp

@@ -21,6 +21,8 @@
 #include "filestrm.h"
 #include "xmlparser.h"
 
+#if !UCONFIG_NO_REGULAR_EXPRESSIONS
+
 // character constants
 enum {
     x_QUOT=0x22,
@@ -813,3 +815,6 @@ UXMLElement::getChildElement(const UnicodeString &name) const {
 }
 
 U_NAMESPACE_END
+
+#endif /* !UCONFIG_NO_REGULAR_EXPRESSIONS */
+

icu4c/source/tools/toolutil/xmlparser.h

@@ -28,6 +28,8 @@
 #include "uvector.h"
 #include "hash.h"
 
+#if !UCONFIG_NO_REGULAR_EXPRESSIONS
+
 enum UXMLNodeType {
     /** Node type string (text contents), stored as a UnicodeString. */
     UXML_NODE_TYPE_STRING,
@@ -238,5 +240,6 @@ private:
 };
 
 U_NAMESPACE_END
+#endif /* !UCONFIG_NO_REGULAR_EXPRESSIONS */
 
 #endif