X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/73c04bcfe1096173b00431f0cdc742894b15eef0..e4f10fab0c078f399c9deef476d9c9b73b47dff8:/icuSources/data/makedata.mak diff --git a/icuSources/data/makedata.mak b/icuSources/data/makedata.mak index 32bbc43c..110bfbc5 100644 --- a/icuSources/data/makedata.mak +++ b/icuSources/data/makedata.mak @@ -1,5 +1,5 @@ #********************************************************************** -#* Copyright (C) 1999-2006, International Business Machines Corporation +#* Copyright (C) 1999-2013, International Business Machines Corporation #* and others. All Rights Reserved. #********************************************************************** # nmake file for creating data files on win32 @@ -9,18 +9,18 @@ # 12/10/1999 weiv Created ############################################################################## -# Keep the following in sync with the version - see common/unicode/uversion.h -U_ICUDATA_NAME=icudt36 +# Keep the following in sync with the version - see common/unicode/uvernum.h +U_ICUDATA_NAME=icudt51 ############################################################################## U_ICUDATA_ENDIAN_SUFFIX=l -UNICODE_VERSION=5.0 +UNICODE_VERSION=6.2 ICU_LIB_TARGET=$(DLL_OUTPUT)\$(U_ICUDATA_NAME).dll # ICUMAKE # Must be provided by whoever runs this makefile. # Is the directory containing this file (makedata.mak) # Is the directory into which most data is built (prior to packaging) -# Is icu\source\data\build +# Is icu\source\data\ # !IF "$(ICUMAKE)"=="" !ERROR Can't find ICUMAKE (ICU Data Make dir, should point to icu\source\data\ )! @@ -28,7 +28,7 @@ ICU_LIB_TARGET=$(DLL_OUTPUT)\$(U_ICUDATA_NAME).dll !MESSAGE ICU data make path is $(ICUMAKE) # Suffixes for data files -.SUFFIXES : .ucm .cnv .dll .dat .res .txt .c +.SUFFIXES : .nrm .icu .ucm .cnv .dll .dat .res .txt .c ICUOUT=$(ICUMAKE)\out @@ -100,6 +100,11 @@ ICUUNIDATA=$(ICUP)\source\data\unidata ICUMISC=$(ICUP)\source\data\misc ICUMISC2=misc +# ICUSPREP +# The directory that contains sprepfiles.mk files along with *.txt stringprep files +# +ICUSPREP=sprep + # # ICUDATA # The source directory. Contains the source files for the common data to be built. @@ -112,7 +117,11 @@ ICUDATA=$(ICUP)\source\data # This is the same place that all of the other ICU DLLs go (the code-containing DLLs) # The lib file for the data DLL goes in $(DLL_OUTPUT)/../lib/ # +!IF "$(CFG)" == "x64\Release" || "$(CFG)" == "x64\Debug" +DLL_OUTPUT=$(ICUP)\bin64 +!ELSE DLL_OUTPUT=$(ICUP)\bin +!ENDIF # # TESTDATA @@ -138,7 +147,14 @@ TESTDATABLD=$(ICUP)\source\test\testdata\out\build ICUTOOLS=$(ICUP)\source\tools # The current ICU tools need to be in the path first. +!IF "$(CFG)" == "x64\Release" || "$(CFG)" == "x64\Debug" +PATH = $(ICUP)\bin64;$(PATH) +ICUPBIN=$(ICUP)\bin64 +!ELSE PATH = $(ICUP)\bin;$(PATH) +ICUPBIN=$(ICUP)\bin +!ENDIF + # This variable can be overridden to "-m static" by the project settings, # if you want a static data library. @@ -189,6 +205,12 @@ UCM_SOURCE=$(UCM_SOURCE) $(UCM_SOURCE_FILES) !IF EXISTS("$(ICUSRCDATA)\$(ICUUCM)\ucmebcdic.mk") !INCLUDE "$(ICUSRCDATA)\$(ICUUCM)\ucmebcdic.mk" UCM_SOURCE=$(UCM_SOURCE) $(UCM_SOURCE_EBCDIC) +!IFDEF UCM_SOURCE_EBCDIC_IGNORE_SISO +BUILD_SPECIAL_CNV_FILES=YES +UCM_SOURCE_SPECIAL=$(UCM_SOURCE_EBCDIC_IGNORE_SISO) +!ELSE +!UNDEF BUILD_SPECIAL_CNV_FILES +!ENDIF !ELSE !MESSAGE Warning: cannot find "ucmebcdic.mk". Not building EBCDIC converter files. !ENDIF @@ -196,18 +218,25 @@ UCM_SOURCE=$(UCM_SOURCE) $(UCM_SOURCE_EBCDIC) !IF EXISTS("$(ICUSRCDATA)\$(ICUUCM)\ucmlocal.mk") !INCLUDE "$(ICUSRCDATA)\$(ICUUCM)\ucmlocal.mk" UCM_SOURCE=$(UCM_SOURCE) $(UCM_SOURCE_LOCAL) +!IFDEF UCM_SOURCE_EBCDIC_IGNORE_SISO_LOCAL +UCM_SOURCE_SPECIAL=$(UCM_SOURCE_SPECIAL) $(UCM_SOURCE_EBCDIC_IGNORE_SISO_LOCAL) +BUILD_SPECIAL_CNV_FILES=YES +!ENDIF !ELSE !MESSAGE Information: cannot find "ucmlocal.mk". Not building user-additional converter files. !ENDIF CNV_FILES=$(UCM_SOURCE:.ucm=.cnv) +!IFDEF BUILD_SPECIAL_CNV_FILES +CNV_FILES_SPECIAL=$(UCM_SOURCE_SPECIAL:.ucm=.cnv) +!ENDIF !IF EXISTS("$(ICUSRCDATA)\$(ICUBRK)\brkfiles.mk") !INCLUDE "$(ICUSRCDATA)\$(ICUBRK)\brkfiles.mk" !IF EXISTS("$(ICUSRCDATA)\$(ICUBRK)\brklocal.mk") !INCLUDE "$(ICUSRCDATA)\$(ICUBRK)\brklocal.mk" BRK_SOURCE=$(BRK_SOURCE) $(BRK_SOURCE_LOCAL) -BRK_CTD_SOURCE=$(BRK_CTD_SOURCE) $(BRK_CTD_SOURCE_LOCAL) +BRK_DICT_SOURCE=$(BRK_DICT_SOURCE) $(BRK_DICT_SOURCE_LOCAL) BRK_RES_SOURCE=$(BRK_RES_SOURCE) $(BRK_RES_SOURCE_LOCAL) !ELSE !MESSAGE Information: cannot find "brklocal.mk". Not building user-additional break iterator files. @@ -223,10 +252,10 @@ BRK_FILES=$(ICUBRK)\$(BRK_SOURCE:.txt =.brk brkitr\) BRK_FILES=$(BRK_FILES:.txt=.brk) BRK_FILES=$(BRK_FILES:brkitr\ =brkitr\) -!IFDEF BRK_CTD_SOURCE -BRK_CTD_FILES = $(ICUBRK)\$(BRK_CTD_SOURCE:.txt =.ctd brkitr\) -BRK_CTD_FILES = $(BRK_CTD_FILES:.txt=.ctd) -BRK_CTD_FILES = $(BRK_CTD_FILES:brkitr\ =) +!IFDEF BRK_DICT_SOURCE +BRK_DICT_FILES = $(ICUBRK)\$(BRK_DICT_SOURCE:.txt =.dict brkitr\) +BRK_DICT_FILES = $(BRK_DICT_FILES:.txt=.dict) +BRK_DICT_FILES = $(BRK_DICT_FILES:brkitr\ =brkitr\) !ENDIF !IFDEF BRK_RES_SOURCE @@ -250,12 +279,96 @@ GENRB_SOURCE=$(GENRB_SOURCE) $(GENRB_SOURCE_LOCAL) !ENDIF !IFDEF GENRB_SOURCE -RB_FILES = root.res $(GENRB_ALIAS_SOURCE:.txt=.res) $(GENRB_SOURCE:.txt=.res) +RB_FILES = root.res pool.res $(GENRB_ALIAS_SOURCE:.txt=.res) $(GENRB_ALIAS_SOURCE_LOCAL:.txt=.res) $(GENRB_SOURCE:.txt=.res) ALL_RES = $(ALL_RES) res_index.res !ENDIF -# Read list of locale resource bundle files +# Read the list of currency display name resource bundle files +!IF EXISTS("$(ICUSRCDATA)\curr\resfiles.mk") +!INCLUDE "$(ICUSRCDATA)\curr\resfiles.mk" +!IF EXISTS("$(ICUSRCDATA)\curr\reslocal.mk") +!INCLUDE "$(ICUSRCDATA)\curr\reslocal.mk" +CURR_SOURCE=$(CURR_SOURCE) $(CURR_SOURCE_LOCAL) +!ELSE +!MESSAGE Information: cannot find "curr\reslocal.mk". Not building user-additional resource bundle files. +!ENDIF +!ELSE +!MESSAGE Warning: cannot find "curr\resfiles.mk" +!ENDIF + +!IFDEF CURR_SOURCE +CURR_FILES = curr\root.txt supplementalData.txt $(CURR_ALIAS_SOURCE) $(CURR_SOURCE) +CURR_RES_FILES = $(CURR_FILES:.txt =.res curr\) +CURR_RES_FILES = $(CURR_RES_FILES:.txt=.res) +CURR_RES_FILES = curr\pool.res $(CURR_RES_FILES:curr\ =curr\) +ALL_RES = $(ALL_RES) curr\res_index.res +!ENDIF + +# Read the list of language/script display name resource bundle files +!IF EXISTS("$(ICUSRCDATA)\lang\resfiles.mk") +!INCLUDE "$(ICUSRCDATA)\lang\resfiles.mk" +!IF EXISTS("$(ICUSRCDATA)\lang\reslocal.mk") +!INCLUDE "$(ICUSRCDATA)\lang\reslocal.mk" +LANG_SOURCE=$(LANG_SOURCE) $(LANG_SOURCE_LOCAL) +!ELSE +!MESSAGE Information: cannot find "lang\reslocal.mk". Not building user-additional resource bundle files. +!ENDIF +!ELSE +!MESSAGE Warning: cannot find "lang\resfiles.mk" +!ENDIF + +!IFDEF LANG_SOURCE +LANG_FILES = lang\root.txt $(LANG_ALIAS_SOURCE) $(LANG_SOURCE) +LANG_RES_FILES = $(LANG_FILES:.txt =.res lang\) +LANG_RES_FILES = $(LANG_RES_FILES:.txt=.res) +LANG_RES_FILES = lang\pool.res $(LANG_RES_FILES:lang\ =lang\) +ALL_RES = $(ALL_RES) lang\res_index.res +!ENDIF + +# Read the list of region display name resource bundle files +!IF EXISTS("$(ICUSRCDATA)\region\resfiles.mk") +!INCLUDE "$(ICUSRCDATA)\region\resfiles.mk" +!IF EXISTS("$(ICUSRCDATA)\region\reslocal.mk") +!INCLUDE "$(ICUSRCDATA)\region\reslocal.mk" +REGION_SOURCE=$(REGION_SOURCE) $(REGION_SOURCE_LOCAL) +!ELSE +!MESSAGE Information: cannot find "region\reslocal.mk". Not building user-additional resource bundle files. +!ENDIF +!ELSE +!MESSAGE Warning: cannot find "region\resfiles.mk" +!ENDIF + +!IFDEF REGION_SOURCE +REGION_FILES = region\root.txt $(REGION_ALIAS_SOURCE) $(REGION_SOURCE) +REGION_RES_FILES = $(REGION_FILES:.txt =.res region\) +REGION_RES_FILES = $(REGION_RES_FILES:.txt=.res) +REGION_RES_FILES = region\pool.res $(REGION_RES_FILES:region\ =region\) +ALL_RES = $(ALL_RES) region\res_index.res +!ENDIF + +# Read the list of time zone display name resource bundle files +!IF EXISTS("$(ICUSRCDATA)\zone\resfiles.mk") +!INCLUDE "$(ICUSRCDATA)\zone\resfiles.mk" +!IF EXISTS("$(ICUSRCDATA)\zone\reslocal.mk") +!INCLUDE "$(ICUSRCDATA)\zone\reslocal.mk" +ZONE_SOURCE=$(ZONE_SOURCE) $(ZONE_SOURCE_LOCAL) +!ELSE +!MESSAGE Information: cannot find "zone\reslocal.mk". Not building user-additional resource bundle files. +!ENDIF +!ELSE +!MESSAGE Warning: cannot find "zone\resfiles.mk" +!ENDIF + +!IFDEF ZONE_SOURCE +ZONE_FILES = zone\root.txt $(ZONE_ALIAS_SOURCE) $(ZONE_SOURCE) +ZONE_RES_FILES = $(ZONE_FILES:.txt =.res zone\) +ZONE_RES_FILES = $(ZONE_RES_FILES:.txt=.res) +ZONE_RES_FILES = zone\pool.res $(ZONE_RES_FILES:zone\ =zone\) +ALL_RES = $(ALL_RES) zone\res_index.res +!ENDIF + +# Read the list of collation resource bundle files !IF EXISTS("$(ICUSRCDATA)\$(ICUCOL)\colfiles.mk") !INCLUDE "$(ICUSRCDATA)\$(ICUCOL)\colfiles.mk" !IF EXISTS("$(ICUSRCDATA)\$(ICUCOL)\collocal.mk") @@ -276,7 +389,7 @@ COL_COL_FILES = $(COL_COL_FILES:coll\ =) ALL_RES = $(ALL_RES) $(ICUCOL)\res_index.res !ENDIF -# Read list of RBNF resource bundle files +# Read the list of RBNF resource bundle files !IF EXISTS("$(ICUSRCDATA)\$(ICURBNF)\rbnffiles.mk") !INCLUDE "$(ICUSRCDATA)\$(ICURBNF)\rbnffiles.mk" !IF EXISTS("$(ICUSRCDATA)\$(ICURBNF)\rbnflocal.mk") @@ -297,7 +410,7 @@ RBNF_RES_FILES = $(RBNF_RES_FILES:rbnf\ =rbnf\) ALL_RES = $(ALL_RES) $(ICURBNF)\res_index.res !ENDIF -# Read list of transliterator resource bundle files +# Read the list of transliterator resource bundle files !IF EXISTS("$(ICUSRCDATA)\$(ICUTRNS)\trnsfiles.mk") !INCLUDE "$(ICUSRCDATA)\$(ICUTRNS)\trnsfiles.mk" !IF EXISTS("$(ICUSRCDATA)\$(ICUTRNS)\trnslocal.mk") @@ -318,7 +431,7 @@ TRANSLIT_RES_FILES = $(TRANSLIT_RES_FILES:translit\ =translit\) #ALL_RES = $(ALL_RES) $(ICUTRNS)\res_index.res !ENDIF -# Read list of miscellaneous resource bundle files +# Read the list of miscellaneous resource bundle files !IF EXISTS("$(ICUSRCDATA)\$(ICUMISC2)\miscfiles.mk") !INCLUDE "$(ICUSRCDATA)\$(ICUMISC2)\miscfiles.mk" !IF EXISTS("$(ICUSRCDATA)\$(ICUMISC2)\misclocal.mk") @@ -337,9 +450,24 @@ MISC_FILES = $(MISC_SOURCE:.txt=.res) ALL_RES = $(ALL_RES) $(RB_FILES) $(MISC_FILES) !ENDIF +# Read the list of stringprep profile files +!IF EXISTS("$(ICUSRCDATA)\$(ICUSPREP)\sprepfiles.mk") +!INCLUDE "$(ICUSRCDATA)\$(ICUSPREP)\sprepfiles.mk" +!IF EXISTS("$(ICUSRCDATA)\$(ICUSPREP)\spreplocal.mk") +!INCLUDE "$(ICUSRCDATA)\$(ICUSPREP)\spreplocal.mk" +SPREP_SOURCE=$(SPREP_SOURCE) $(SPREP_SOURCE_LOCAL) +!ELSE +!MESSAGE Information: cannot find "spreplocal.mk". Not building user-additional stringprep files. +!ENDIF +!ELSE +!MESSAGE Warning: cannot find "sprepfiles.mk" +!ENDIF + +SPREP_FILES = $(SPREP_SOURCE:.txt=.spp) + # Common defines for both ways of building ICU's data library. -COMMON_ICUDATA_DEPENDENCIES="$(ICUP)\bin\pkgdata.exe" "$(ICUTMP)\icudata.res" "$(ICUP)\source\stubdata\stubdatabuilt.txt" -COMMON_ICUDATA_ARGUMENTS=-f -e $(U_ICUDATA_NAME) -v $(ICU_PACKAGE_MODE) -M"PKGDATA_LDFLAGS=/base:0x4ad00000" -c -p $(ICUPKG) -T "$(ICUTMP)" -L $(U_ICUDATA_NAME) -d "$(ICUBLD_PKG)" -s . +COMMON_ICUDATA_DEPENDENCIES="$(ICUPBIN)\pkgdata.exe" "$(ICUTMP)\icudata.res" "$(ICUP)\source\stubdata\stubdatabuilt.txt" +COMMON_ICUDATA_ARGUMENTS=-f -e $(U_ICUDATA_NAME) -v $(ICU_PACKAGE_MODE) -c -p $(ICUPKG) -T "$(ICUTMP)" -L $(U_ICUDATA_NAME) -d "$(ICUBLD_PKG)" -s . ############################################################################# # @@ -353,22 +481,107 @@ COMMON_ICUDATA_ARGUMENTS=-f -e $(U_ICUDATA_NAME) -v $(ICU_PACKAGE_MODE) -M"PKGDA ALL : GODATA "$(ICU_LIB_TARGET)" "$(TESTDATAOUT)\testdata.dat" @echo All targets are up to date -# Starting with ICU4C 3.4, the core Unicode properties files (uprops.icu, ucase.icu, ubidi.icu, unorm.icu) +# The core Unicode properties files (uprops.icu, ucase.icu, ubidi.icu) # are hardcoded in the common DLL and therefore not included in the data package any more. # They are not built by default but need to be built for ICU4J data and for getting the .c source files # when updating the Unicode data. # Changed in makedata.mak revision 1.117. See Jitterbug 4497. -uni-core-data: GODATA "$(ICUBLD_PKG)\uprops.icu" "$(ICUBLD_PKG)\ucase.icu" "$(ICUBLD_PKG)\ubidi.icu" "$(ICUBLD_PKG)\unorm.icu" +# 2010-dec Removed pnames.icu. +# Command line: +# C:\svn\icuproj\icu\trunk\source\data>nmake -f makedata.mak ICUMAKE=C:\svn\icuproj\icu\trunk\source\data\ CFG=x86\Debug uni-core-data +uni-core-data: GODATA "$(ICUBLD_PKG)\pnames.icu" "$(ICUBLD_PKG)\uprops.icu" "$(ICUBLD_PKG)\ucase.icu" "$(ICUBLD_PKG)\ubidi.icu" @echo Unicode .icu files built to "$(ICUBLD_PKG)" - @echo Unicode .c source files built to "$(ICUTMP)" + +# Build the ICU4J icudata.jar and testdata.jar. +# see icu4j-readme.txt + +ICU4J_TZDATA="$(ICUOUT)\icu4j\icutzdata.jar" +ICU4J_DATA_DIRNAME=com\ibm\icu\impl\data\$(U_ICUDATA_NAME)b +ICU4J_TZDATA_PATHS=$(ICU4J_DATA_DIRNAME)\zoneinfo64.res $(ICU4J_DATA_DIRNAME)\metaZones.res $(ICU4J_DATA_DIRNAME)\timezoneTypes.res $(ICU4J_DATA_DIRNAME)\windowsZones.res + +generate-data: GODATA "$(ICUOUT)\$(ICUPKG).dat" uni-core-data + if not exist "$(ICUOUT)\icu4j\$(ICU4J_DATA_DIRNAME)" mkdir "$(ICUOUT)\icu4j\$(ICU4J_DATA_DIRNAME)" + if not exist "$(ICUOUT)\icu4j\tzdata\$(ICU4J_DATA_DIRNAME)" mkdir "$(ICUOUT)\icu4j\tzdata\$(ICU4J_DATA_DIRNAME)" + echo pnames.icu ubidi.icu ucase.icu uprops.icu > "$(ICUOUT)\icu4j\add.txt" + "$(ICUPBIN)\icupkg" "$(ICUOUT)\$(ICUPKG).dat" "$(ICUOUT)\icu4j\$(U_ICUDATA_NAME)b.dat" -a "$(ICUOUT)\icu4j\add.txt" -s "$(ICUBLD_PKG)" -x * -tb -d "$(ICUOUT)\icu4j\$(ICU4J_DATA_DIRNAME)" + @for %f in ($(ICU4J_TZDATA_PATHS)) do @move "$(ICUOUT)\icu4j\%f" "$(ICUOUT)\icu4j\tzdata\$(ICU4J_DATA_DIRNAME)" + +"$(ICUOUT)\icu4j\icutzdata.jar": GODATA generate-data + "$(JAR)" cf "$(ICUOUT)\icu4j\icutzdata.jar" -C "$(ICUOUT)\icu4j\tzdata" "$(ICU4J_DATA_DIRNAME)" + +# Build icudata.jar: +# - add the uni-core-data to the ICU package +# - swap the ICU data +# - extract all data items +# - package them into the .jar file +"$(ICUOUT)\icu4j\icudata.jar": GODATA generate-data + "$(JAR)" cf "$(ICUOUT)\icu4j\icudata.jar" -C "$(ICUOUT)\icu4j" "$(ICU4J_DATA_DIRNAME)" + +# Build testdata.jar: +# - swap the test data +# - extract all data items +# - package them into the .jar file +"$(ICUOUT)\icu4j\testdata.jar": GODATA "$(TESTDATAOUT)\testdata.dat" + if not exist "$(ICUOUT)\icu4j\com\ibm\icu\dev\data\testdata" mkdir "$(ICUOUT)\icu4j\com\ibm\icu\dev\data\testdata" + "$(ICUPBIN)\icupkg" "$(TESTDATAOUT)\testdata.dat" -r test.icu -x * -tb -d "$(ICUOUT)\icu4j\com\ibm\icu\dev\data\testdata" + "$(JAR)" cf "$(ICUOUT)\icu4j\testdata.jar" -C "$(ICUOUT)\icu4j" com\ibm\icu\dev\data\testdata + +## Compare to: source\data\Makefile.in and source\test\testdata\Makefile.in + +DEBUGUTILITIESDATA_DIR=main\tests\core\src\com\ibm\icu\dev\test\util +DEBUGUTILITIESDATA_SRC=DebugUtilitiesData.java + +# Build DebugUtilitiesData.java +"$(ICUOUT)\icu4j\src\$(DEBUGUTILITIESDATA_DIR)\$(DEBUGUTILITIESDATA_SRC)" : {"$(ICUTOOLS)\gentest\$(CFG)"}gentest.exe + if not exist "$(ICUOUT)\icu4j\src\$(DEBUGUTILITIESDATA_DIR)" mkdir "$(ICUOUT)\icu4j\src\$(DEBUGUTILITIESDATA_DIR)" + "$(ICUTOOLS)\gentest\$(CFG)\gentest" -j -d"$(ICUOUT)\icu4j\src\$(DEBUGUTILITIESDATA_DIR)" + +ICU4J_DATA="$(ICUOUT)\icu4j\icudata.jar" "$(ICUOUT)\icu4j\testdata.jar" "$(ICUOUT)\icu4j\src\$(DEBUGUTILITIESDATA_DIR)\$(DEBUGUTILITIESDATA_SRC)" + +icu4j-data: GODATA $(ICU4J_DATA) $(ICU4J_TZDATA) + +!IFDEF ICU4J_ROOT + +"$(ICU4J_ROOT)\main\shared\data\icudata.jar": "$(ICUOUT)\icu4j\icudata.jar" + if not exist "$(ICU4J_ROOT)\main\shared\data" mkdir "$(ICU4J_ROOT)\main\shared\data" + copy "$(ICUOUT)\icu4j\icudata.jar" "$(ICU4J_ROOT)\main\shared\data" + +"$(ICU4J_ROOT)\main\shared\data\icutzdata.jar": "$(ICUOUT)\icu4j\icutzdata.jar" + if not exist "$(ICU4J_ROOT)\main\shared\data" mkdir "$(ICU4J_ROOT)\main\shared\data" + copy "$(ICUOUT)\icu4j\icutzdata.jar" "$(ICU4J_ROOT)\main\shared\data" + +"$(ICU4J_ROOT)\main\shared\data\testdata.jar": "$(ICUOUT)\icu4j\testdata.jar" + if not exist "$(ICU4J_ROOT)\main\shared\data" mkdir "$(ICU4J_ROOT)\main\shared\data" + copy "$(ICUOUT)\icu4j\testdata.jar" "$(ICU4J_ROOT)\main\shared\data" + +# "$(DEBUGUTILTIESDATA_OUT)" + +"$(ICU4J_ROOT)\$(DEBUGUTILITIESDATA_DIR)\$(DEBUGUTILITIESDATA_SRC)": "$(ICUOUT)\icu4j\src\$(DEBUGUTILITIESDATA_DIR)\$(DEBUGUTILITIESDATA_SRC)" + if not exist "$(ICU4J_ROOT)\$(DEBUGUTILITIESDATA_DIR)" mkdir "$(ICU4J_ROOT)\$(DEBUGUTILITIESDATA_DIR)" + copy "$(ICUOUT)\icu4j\src\$(DEBUGUTILITIESDATA_DIR)\$(DEBUGUTILITIESDATA_SRC)" "$(ICU4J_ROOT)\$(DEBUGUTILITIESDATA_DIR)\$(DEBUGUTILITIESDATA_SRC)" + +ICU4J_DATA_INSTALLED="$(ICU4J_ROOT)\main\shared\data\icudata.jar" "$(ICU4J_ROOT)\main\shared\data\icutzdata.jar" "$(ICU4J_ROOT)\main\shared\data\testdata.jar" "$(ICU4J_ROOT)\$(DEBUGUTILITIESDATA_DIR)\$(DEBUGUTILITIESDATA_SRC)" + +icu4j-data-install : GODATA $(ICU4J_DATA) $(ICU4J_TZDATA) $(ICU4J_DATA_INSTALLED) + @echo ICU4J data output to "$(ICU4J_ROOT)" + +!ELSE + +icu4j-data-install : + @echo ERROR ICU4J_ROOT not set + @exit 1 + +!ENDIF + + # # testdata - nmake will invoke pkgdata, which will create testdata.dat # -"$(TESTDATAOUT)\testdata.dat": "$(ICUBLD_PKG)\ucadata.icu" $(TRANSLIT_RES_FILES) $(MISC_FILES) $(RB_FILES) {"$(ICUTOOLS)\genrb\$(CFG)"}genrb.exe +"$(TESTDATAOUT)\testdata.dat": "$(TESTDATA)\*" "$(ICUBLD_PKG)\$(ICUCOL)\ucadata.icu" $(TRANSLIT_RES_FILES) $(MISC_FILES) $(RB_FILES) {"$(ICUTOOLS)\genrb\$(CFG)"}genrb.exe @cd "$(TESTDATA)" @echo building testdata... - nmake /nologo /f "$(TESTDATA)\testdata.mak" TESTDATA=. ICUTOOLS="$(ICUTOOLS)" ICUP="$(ICUP)" CFG=$(CFG) TESTDATAOUT="$(TESTDATAOUT)" ICUDATA="$(ICUDATA)" TESTDATABLD="$(TESTDATABLD)" + nmake /nologo /f "$(TESTDATA)\testdata.mak" TESTDATA=. ICUTOOLS="$(ICUTOOLS)" ICUPBIN="$(ICUPBIN)" ICUP="$(ICUP)" CFG=$(CFG) TESTDATAOUT="$(TESTDATAOUT)" TESTDATABLD="$(TESTDATABLD)" #invoke pkgdata for ICU common data # pkgdata will drop all output files (.dat, .dll, .lib) into the target (ICUBLD_PKG) directory. @@ -382,27 +595,40 @@ uni-core-data: GODATA "$(ICUBLD_PKG)\uprops.icu" "$(ICUBLD_PKG)\ucase.icu" "$(IC "$(ICU_LIB_TARGET)" : $(COMMON_ICUDATA_DEPENDENCIES) "$(ICUDATA_SOURCE_ARCHIVE)" @echo Building icu data from $(ICUDATA_SOURCE_ARCHIVE) cd "$(ICUBLD_PKG)" - "$(ICUP)\bin\icupkg" -x * --list "$(ICUDATA_SOURCE_ARCHIVE)" > "$(ICUTMP)\icudata.lst" - "$(ICUP)\bin\pkgdata" $(COMMON_ICUDATA_ARGUMENTS) "$(ICUTMP)\icudata.lst" + "$(ICUPBIN)\icupkg" -x * --list "$(ICUDATA_SOURCE_ARCHIVE)" > "$(ICUTMP)\icudata.lst" + "$(ICUPBIN)\pkgdata" $(COMMON_ICUDATA_ARGUMENTS) "$(ICUTMP)\icudata.lst" copy "$(U_ICUDATA_NAME).dll" "$(DLL_OUTPUT)" -@erase "$(U_ICUDATA_NAME).dll" - copy "$(ICUPKG).dat" "$(ICUOUT)\$(U_ICUDATA_NAME)$(U_ICUDATA_ENDIAN_SUFFIX).dat" - -@erase "$(ICUPKG).dat" + copy "$(ICUTMP)\$(ICUPKG).dat" "$(ICUOUT)\$(U_ICUDATA_NAME)$(U_ICUDATA_ENDIAN_SUFFIX).dat" + -@erase "$(ICUTMP)\$(ICUPKG).dat" !ELSE -"$(ICU_LIB_TARGET)" : $(COMMON_ICUDATA_DEPENDENCIES) $(CNV_FILES) "$(ICUBLD_PKG)\unames.icu" "$(ICUBLD_PKG)\pnames.icu" "$(ICUBLD_PKG)\cnvalias.icu" "$(ICUBLD_PKG)\ucadata.icu" "$(ICUBLD_PKG)\invuca.icu" "$(ICUBLD_PKG)\uidna.spp" $(BRK_FILES) $(BRK_CTD_FILES) $(BRK_RES_FILES) $(COL_COL_FILES) $(RBNF_RES_FILES) $(TRANSLIT_RES_FILES) $(ALL_RES) +"$(ICU_LIB_TARGET)" : $(COMMON_ICUDATA_DEPENDENCIES) $(CNV_FILES) $(CNV_FILES_SPECIAL) "$(ICUBLD_PKG)\unames.icu" "$(ICUBLD_PKG)\cnvalias.icu" "$(ICUBLD_PKG)\nfc.nrm" "$(ICUBLD_PKG)\nfkc.nrm" "$(ICUBLD_PKG)\nfkc_cf.nrm" "$(ICUBLD_PKG)\uts46.nrm" "$(ICUBLD_PKG)\$(ICUCOL)\ucadata.icu" "$(ICUBLD_PKG)\$(ICUCOL)\invuca.icu" $(CURR_RES_FILES) $(LANG_RES_FILES) $(REGION_RES_FILES) $(ZONE_RES_FILES) $(BRK_FILES) $(BRK_DICT_FILES) $(BRK_RES_FILES) $(ALL_RES) $(COL_COL_FILES) $(RBNF_RES_FILES) $(TRANSLIT_RES_FILES) $(SPREP_FILES) "$(ICUBLD_PKG)\confusables.cfu" @echo Building icu data cd "$(ICUBLD_PKG)" - "$(ICUP)\bin\pkgdata" $(COMMON_ICUDATA_ARGUMENTS) <<"$(ICUTMP)\icudata.lst" -pnames.icu + "$(ICUPBIN)\pkgdata" $(COMMON_ICUDATA_ARGUMENTS) <<"$(ICUTMP)\icudata.lst" unames.icu -ucadata.icu -invuca.icu -uidna.spp +confusables.cfu +$(ICUCOL)\ucadata.icu +$(ICUCOL)\invuca.icu cnvalias.icu +nfc.nrm +nfkc.nrm +nfkc_cf.nrm +uts46.nrm $(CNV_FILES:.cnv =.cnv ) +$(CNV_FILES_SPECIAL:.cnv =.cnv +) $(ALL_RES:.res =.res ) +$(CURR_RES_FILES:.res =.res +) +$(LANG_RES_FILES:.res =.res +) +$(REGION_RES_FILES:.res =.res +) +$(ZONE_RES_FILES:.res =.res +) $(COL_COL_FILES:.res =.res ) $(RBNF_RES_FILES:.res =.res @@ -411,16 +637,18 @@ $(TRANSLIT_RES_FILES:.res =.res ) $(BRK_FILES:.brk =.brk ) -$(BRK_CTD_FILES:.ctd =.ctd +$(BRK_DICT_FILES:.dict =.dict ) $(BRK_RES_FILES:.res =.res ) +$(SPREP_FILES:.spp=.spp +) <> Depends on the Unicode data as well as uchar.h and uscript.h << -"$(ICUBLD_PKG)\pnames.icu": "$(ICUUNIDATA)\*.txt" "$(ICUTOOLS)\genpname\$(CFG)\genpname.exe" "$(ICUP)\source\common\unicode\uchar.h" "$(ICUP)\source\common\unicode\uscript.h" - @echo Creating data file for Unicode Property Names - @"$(ICUTOOLS)\genpname\$(CFG)\genpname" -d "$(ICUBLD_PKG)" - -# Targets for uprops.icu -"$(ICUBLD_PKG)\uprops.icu": "$(ICUUNIDATA)\*.txt" "$(ICUTOOLS)\genprops\$(CFG)\genprops.exe" "$(ICUBLD_PKG)\pnames.icu" - @echo Creating data file for Unicode Character Properties - @"$(ICUTOOLS)\genprops\$(CFG)\genprops" -u $(UNICODE_VERSION) -i "$(ICUBLD_PKG)" -s "$(ICUUNIDATA)" -d "$(ICUBLD_PKG)" - @"$(ICUTOOLS)\genprops\$(CFG)\genprops" --csource -u $(UNICODE_VERSION) -i "$(ICUBLD_PKG)" -s "$(ICUUNIDATA)" -d "$(ICUTMP)" - -# Targets for ubidi.icu -"$(ICUBLD_PKG)\ubidi.icu": "$(ICUUNIDATA)\*.txt" "$(ICUTOOLS)\genbidi\$(CFG)\genbidi.exe" - @echo Creating data file for Unicode BiDi/Shaping Properties - @"$(ICUTOOLS)\genbidi\$(CFG)\genbidi" -u $(UNICODE_VERSION) -i "$(ICUBLD_PKG)" -s "$(ICUUNIDATA)" -d "$(ICUBLD_PKG)" - @"$(ICUTOOLS)\genbidi\$(CFG)\genbidi" --csource -u $(UNICODE_VERSION) -i "$(ICUBLD_PKG)" -s "$(ICUUNIDATA)" -d "$(ICUTMP)" - -# Targets for ucase.icu -"$(ICUBLD_PKG)\ucase.icu": "$(ICUUNIDATA)\*.txt" "$(ICUTOOLS)\gencase\$(CFG)\gencase.exe" - @echo Creating data file for Unicode Case Mapping Properties - @"$(ICUTOOLS)\gencase\$(CFG)\gencase" -u $(UNICODE_VERSION) -i "$(ICUBLD_PKG)" -s "$(ICUUNIDATA)" -d "$(ICUBLD_PKG)" - @"$(ICUTOOLS)\gencase\$(CFG)\gencase" --csource -u $(UNICODE_VERSION) -i "$(ICUBLD_PKG)" -s "$(ICUUNIDATA)" -d "$(ICUTMP)" - -# Targets for unorm.icu -"$(ICUBLD_PKG)\unorm.icu": "$(ICUUNIDATA)\*.txt" "$(ICUTOOLS)\gennorm\$(CFG)\gennorm.exe" "$(ICUBLD_PKG)\pnames.icu" "$(ICUBLD_PKG)\uprops.icu" "$(ICUBLD_PKG)\ucase.icu" - @echo Creating data file for Unicode Normalization - @"$(ICUTOOLS)\gennorm\$(CFG)\gennorm" -u $(UNICODE_VERSION) -i "$(ICUBLD_PKG)" -s "$(ICUUNIDATA)" -d "$(ICUBLD_PKG)" - @"$(ICUTOOLS)\gennorm\$(CFG)\gennorm" --csource -u $(UNICODE_VERSION) -i "$(ICUBLD_PKG)" -s "$(ICUUNIDATA)" -d "$(ICUTMP)" - # Targets for converters "$(ICUBLD_PKG)\cnvalias.icu" : {"$(ICUSRCDATA)\$(ICUUCM)"}\convrtrs.txt "$(ICUTOOLS)\gencnval\$(CFG)\gencnval.exe" @echo Creating data file for Converter Aliases @"$(ICUTOOLS)\gencnval\$(CFG)\gencnval" -d "$(ICUBLD_PKG)" "$(ICUSRCDATA)\$(ICUUCM)\convrtrs.txt" -# Targets for ucadata.icu & invuca.icu -# used to depend on "$(ICUBLD_PKG)\uprops.icu" "$(ICUBLD_PKG)\ucase.icu" "$(ICUBLD_PKG)\unorm.icu" -# see Jitterbug 4497 -"$(ICUBLD_PKG)\invuca.icu" "$(ICUBLD_PKG)\ucadata.icu": "$(ICUUNIDATA)\FractionalUCA.txt" "$(ICUTOOLS)\genuca\$(CFG)\genuca.exe" - @echo Creating UCA data files - @"$(ICUTOOLS)\genuca\$(CFG)\genuca" -d "$(ICUBLD_PKG)" -i "$(ICUBLD_PKG)" -s "$(ICUUNIDATA)" +# Targets for prebuilt Unicode data +"$(ICUBLD_PKG)\pnames.icu": $(ICUSRCDATA_RELATIVE_PATH)\in\pnames.icu + "$(ICUPBIN)\icupkg" -tl $? $@ + +"$(ICUBLD_PKG)\ubidi.icu": $(ICUSRCDATA_RELATIVE_PATH)\in\ubidi.icu + "$(ICUPBIN)\icupkg" -tl $? $@ + +"$(ICUBLD_PKG)\ucase.icu": $(ICUSRCDATA_RELATIVE_PATH)\in\ucase.icu + "$(ICUPBIN)\icupkg" -tl $? $@ + +"$(ICUBLD_PKG)\uprops.icu": $(ICUSRCDATA_RELATIVE_PATH)\in\uprops.icu + "$(ICUPBIN)\icupkg" -tl $? $@ + +"$(ICUBLD_PKG)\unames.icu": $(ICUSRCDATA_RELATIVE_PATH)\in\unames.icu + "$(ICUPBIN)\icupkg" -tl $? $@ + +"$(ICUBLD_PKG)\nfc.nrm": $(ICUSRCDATA_RELATIVE_PATH)\in\nfc.nrm + "$(ICUPBIN)\icupkg" -tl $? $@ + +"$(ICUBLD_PKG)\nfkc.nrm": $(ICUSRCDATA_RELATIVE_PATH)\in\nfkc.nrm + "$(ICUPBIN)\icupkg" -tl $? $@ + +"$(ICUBLD_PKG)\nfkc_cf.nrm": $(ICUSRCDATA_RELATIVE_PATH)\in\nfkc_cf.nrm + "$(ICUPBIN)\icupkg" -tl $? $@ + +"$(ICUBLD_PKG)\uts46.nrm": $(ICUSRCDATA_RELATIVE_PATH)\in\uts46.nrm + "$(ICUPBIN)\icupkg" -tl $? $@ -# Targets for uidna.spp -"$(ICUBLD_PKG)\uidna.spp" : "$(ICUUNIDATA)\*.txt" "$(ICUMISC)\NamePrepProfile.txt" - "$(ICUTOOLS)\gensprep\$(CFG)\gensprep" -s "$(ICUMISC)" -d "$(ICUBLD_PKG)\\" -b uidna -n "$(ICUUNIDATA)" -k -u 3.2.0 NamePrepProfile.txt +"$(ICUBLD_PKG)\coll\invuca.icu": $(ICUSRCDATA_RELATIVE_PATH)\in\coll\invuca.icu + "$(ICUPBIN)\icupkg" -tl $? $@ + +"$(ICUBLD_PKG)\coll\ucadata.icu": $(ICUSRCDATA_RELATIVE_PATH)\in\coll\ucadata.icu + "$(ICUPBIN)\icupkg" -tl $? $@ + +# Stringprep .spp file generation. +{$(ICUSRCDATA_RELATIVE_PATH)\$(ICUSPREP)}.txt.spp: + @echo Creating $@ + @"$(ICUTOOLS)\gensprep\$(CFG)\gensprep" -s $(