ICU-13188 Merge patch for building reduced data file.

X-SVN-Rev: 40597

diff --git a/icu4c/source/data/makedata.mak b/icu4c/source/data/makedata.mak
index 13dd687ffd857ed66a29f899bdc2d341d7defe3c..6e3bde5ce8ddbca0f311d326dd5fb316fbdd251d 100644 (file)
--- a/icu4c/source/data/makedata.mak
+++ b/icu4c/source/data/makedata.mak
@@ -241,7 +241,9 @@ UCM_SOURCE_SPECIAL=$(UCM_SOURCE_EBCDIC_IGNORE_SISO)
 
 !IF EXISTS("$(ICUSRCDATA)\$(ICUUCM)\ucmlocal.mk")
 !INCLUDE "$(ICUSRCDATA)\$(ICUUCM)\ucmlocal.mk"
+!IFDEF UCM_SOURCE_LOCAL
 UCM_SOURCE=$(UCM_SOURCE) $(UCM_SOURCE_LOCAL)
+!ENDIF
 !IFDEF UCM_SOURCE_EBCDIC_IGNORE_SISO_LOCAL
 UCM_SOURCE_SPECIAL=$(UCM_SOURCE_SPECIAL) $(UCM_SOURCE_EBCDIC_IGNORE_SISO_LOCAL)
 BUILD_SPECIAL_CNV_FILES=YES
@@ -259,9 +261,15 @@ CNV_FILES_SPECIAL=$(UCM_SOURCE_SPECIAL:.ucm=.cnv)
 !INCLUDE "$(ICUSRCDATA)\$(ICUBRK)\brkfiles.mk"
 !IF EXISTS("$(ICUSRCDATA)\$(ICUBRK)\brklocal.mk")
 !INCLUDE "$(ICUSRCDATA)\$(ICUBRK)\brklocal.mk"
+!IFDEF BRK_SOURCE_LOCAL
 BRK_SOURCE=$(BRK_SOURCE) $(BRK_SOURCE_LOCAL)
+!ENDIF
+!IFDEF BRK_DICT_SOURCE_LOCAL
 BRK_DICT_SOURCE=$(BRK_DICT_SOURCE) $(BRK_DICT_SOURCE_LOCAL)
+!ENDIF
+!IFDEF BRK_RES_SOURCE_LOCAL
 BRK_RES_SOURCE=$(BRK_RES_SOURCE) $(BRK_RES_SOURCE_LOCAL)
+!ENDIF
 !ELSE
 !MESSAGE Information: cannot find "brklocal.mk". Not building user-additional break iterator files.
 !ENDIF
@@ -294,7 +302,9 @@ ALL_RES = $(ALL_RES) $(ICUBRK)\res_index.res
 !INCLUDE "$(ICUSRCDATA)\$(ICULOC)\resfiles.mk"
 !IF EXISTS("$(ICUSRCDATA)\$(ICULOC)\reslocal.mk")
 !INCLUDE "$(ICUSRCDATA)\$(ICULOC)\reslocal.mk"
+!IFDEF GENRB_SOURCE_LOCAL
 GENRB_SOURCE=$(GENRB_SOURCE) $(GENRB_SOURCE_LOCAL)
+!ENDIF
 !ELSE
 !MESSAGE Information: cannot find "reslocal.mk". Not building user-additional resource bundle files.
 !ENDIF
@@ -313,7 +323,9 @@ ALL_RES = $(ALL_RES) res_index.res
 !INCLUDE "$(ICUSRCDATA)\curr\resfiles.mk"
 !IF EXISTS("$(ICUSRCDATA)\curr\reslocal.mk")
 !INCLUDE "$(ICUSRCDATA)\curr\reslocal.mk"
+!IFDEF CURR_SOURCE_LOCAL
 CURR_SOURCE=$(CURR_SOURCE) $(CURR_SOURCE_LOCAL)
+!ENDIF
 !ELSE
 !MESSAGE Information: cannot find "curr\reslocal.mk". Not building user-additional resource bundle files.
 !ENDIF
@@ -334,7 +346,9 @@ ALL_RES = $(ALL_RES) curr\res_index.res
 !INCLUDE "$(ICUSRCDATA)\lang\resfiles.mk"
 !IF EXISTS("$(ICUSRCDATA)\lang\reslocal.mk")
 !INCLUDE "$(ICUSRCDATA)\lang\reslocal.mk"
+!IFDEF LANG_SOURCE_LOCAL
 LANG_SOURCE=$(LANG_SOURCE) $(LANG_SOURCE_LOCAL)
+!ENDIF
 !ELSE
 !MESSAGE Information: cannot find "lang\reslocal.mk". Not building user-additional resource bundle files.
 !ENDIF
@@ -355,7 +369,9 @@ ALL_RES = $(ALL_RES) lang\res_index.res
 !INCLUDE "$(ICUSRCDATA)\region\resfiles.mk"
 !IF EXISTS("$(ICUSRCDATA)\region\reslocal.mk")
 !INCLUDE "$(ICUSRCDATA)\region\reslocal.mk"
+!IFDEF REGION_SOURCE_LOCAL
 REGION_SOURCE=$(REGION_SOURCE) $(REGION_SOURCE_LOCAL)
+!ENDIF
 !ELSE
 !MESSAGE Information: cannot find "region\reslocal.mk". Not building user-additional resource bundle files.
 !ENDIF
@@ -376,7 +392,9 @@ ALL_RES = $(ALL_RES) region\res_index.res
 !INCLUDE "$(ICUSRCDATA)\zone\resfiles.mk"
 !IF EXISTS("$(ICUSRCDATA)\zone\reslocal.mk")
 !INCLUDE "$(ICUSRCDATA)\zone\reslocal.mk"
+!IFDEF ZONE_SOURCE_LOCAL
 ZONE_SOURCE=$(ZONE_SOURCE) $(ZONE_SOURCE_LOCAL)
+!ENDIF
 !ELSE
 !MESSAGE Information: cannot find "zone\reslocal.mk". Not building user-additional resource bundle files.
 !ENDIF
@@ -398,7 +416,9 @@ ALL_RES = $(ALL_RES) zone\res_index.res
 !INCLUDE "$(ICUSRCDATA)\unit\resfiles.mk"
 !IF EXISTS("$(ICUSRCDATA)\unit\reslocal.mk")
 !INCLUDE "$(ICUSRCDATA)\unit\reslocal.mk"
+!IFDEF UNIT_SOURCE_LOCAL
 UNIT_SOURCE=$(UNIT_SOURCE) $(UNIT_SOURCE_LOCAL)
+!ENDIF
 !ELSE
 !MESSAGE Information: cannot find "unit\reslocal.mk". Not building user-additional resource bundle files.
 !ENDIF
@@ -419,7 +439,9 @@ ALL_RES = $(ALL_RES) unit\res_index.res
 !INCLUDE "$(ICUSRCDATA)\$(ICUCOL)\colfiles.mk"
 !IF EXISTS("$(ICUSRCDATA)\$(ICUCOL)\collocal.mk")
 !INCLUDE "$(ICUSRCDATA)\$(ICUCOL)\collocal.mk"
+!IFDEF COLLATION_SOURCE_LOCAL
 COLLATION_SOURCE=$(COLLATION_SOURCE) $(COLLATION_SOURCE_LOCAL)
+!ENDIF
 !ELSE
 !MESSAGE Information: cannot find "collocal.mk". Not building user-additional resource bundle files.
 !ENDIF
@@ -440,7 +462,9 @@ ALL_RES = $(ALL_RES) $(ICUCOL)\res_index.res
 !INCLUDE "$(ICUSRCDATA)\$(ICURBNF)\rbnffiles.mk"
 !IF EXISTS("$(ICUSRCDATA)\$(ICURBNF)\rbnflocal.mk")
 !INCLUDE "$(ICUSRCDATA)\$(ICURBNF)\rbnflocal.mk"
+!IFDEF RBNF_SOURCE_LOCAL
 RBNF_SOURCE=$(RBNF_SOURCE) $(RBNF_SOURCE_LOCAL)
+!ENDIF
 !ELSE
 !MESSAGE Information: cannot find "rbnflocal.mk". Not building user-additional resource bundle files.
 !ENDIF
@@ -461,7 +485,9 @@ ALL_RES = $(ALL_RES) $(ICURBNF)\res_index.res
 !INCLUDE "$(ICUSRCDATA)\$(ICUTRNS)\trnsfiles.mk"
 !IF EXISTS("$(ICUSRCDATA)\$(ICUTRNS)\trnslocal.mk")
 !INCLUDE "$(ICUSRCDATA)\$(ICUTRNS)\trnslocal.mk"
+!IFDEF TRANSLIT_SOURCE_LOCAL
 TRANSLIT_SOURCE=$(TRANSLIT_SOURCE) $(TRANSLIT_SOURCE_LOCAL)
+!ENDIF
 !ELSE
 !MESSAGE Information: cannot find "trnslocal.mk". Not building user-additional transliterator files.
 !ENDIF
@@ -482,7 +508,9 @@ TRANSLIT_RES_FILES = $(TRANSLIT_RES_FILES:translit\ =translit\)
 !INCLUDE "$(ICUSRCDATA)\$(ICUMISC2)\miscfiles.mk"
 !IF EXISTS("$(ICUSRCDATA)\$(ICUMISC2)\misclocal.mk")
 !INCLUDE "$(ICUSRCDATA)\$(ICUMISC2)\misclocal.mk"
+!IFDEF MISC_SOURCE_LOCAL
 MISC_SOURCE=$(MISC_SOURCE) $(MISC_SOURCE_LOCAL)
+!ENDIF
 !ELSE
 !MESSAGE Information: cannot find "misclocal.mk". Not building user-additional miscellaenous files.
 !ENDIF
@@ -501,7 +529,9 @@ ALL_RES = $(ALL_RES) $(RB_FILES) $(MISC_FILES)
 !INCLUDE "$(ICUSRCDATA)\$(ICUSPREP)\sprepfiles.mk"
 !IF EXISTS("$(ICUSRCDATA)\$(ICUSPREP)\spreplocal.mk")
 !INCLUDE "$(ICUSRCDATA)\$(ICUSPREP)\spreplocal.mk"
+!IFDEF SPREP_SOURCE_LOCAL
 SPREP_SOURCE=$(SPREP_SOURCE) $(SPREP_SOURCE_LOCAL)
+!ENDIF
 !ELSE
 !MESSAGE Information: cannot find "spreplocal.mk". Not building user-additional stringprep files.
 !ENDIF