X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/b331163bffd790ced0e88b73f44f86d49ccc48a5..HEAD:/icuSources/data/makedata.mak diff --git a/icuSources/data/makedata.mak b/icuSources/data/makedata.mak index 8010b835..2a535287 100644 --- a/icuSources/data/makedata.mak +++ b/icuSources/data/makedata.mak @@ -1,5 +1,7 @@ +# Copyright (C) 2016 and later: Unicode, Inc. and others. +# License & terms of use: http://www.unicode.org/copyright.html #********************************************************************** -#* Copyright (C) 1999-2014, International Business Machines Corporation +#* Copyright (C) 1999-2016, International Business Machines Corporation #* and others. All Rights Reserved. #********************************************************************** # nmake file for creating data files on win32 @@ -10,10 +12,14 @@ ############################################################################## # Keep the following in sync with the version - see common/unicode/uvernum.h -U_ICUDATA_NAME=icudt55 +U_ICUDATA_NAME=icudt66 ############################################################################## +!IF "$(UWP)" == "UWP" +# Optionally change the name of the data file for the UWP version. +U_ICUDATA_NAME=icudt66 +!ENDIF U_ICUDATA_ENDIAN_SUFFIX=l -UNICODE_VERSION=7.0 +UNICODE_VERSION=13.0 ICU_LIB_TARGET=$(DLL_OUTPUT)\$(U_ICUDATA_NAME).dll # ICUMAKE @@ -27,12 +33,16 @@ ICU_LIB_TARGET=$(DLL_OUTPUT)\$(U_ICUDATA_NAME).dll !ENDIF !MESSAGE ICU data make path is $(ICUMAKE) +!IF [py -3 -c "exit(0)"]!=0 +!MESSAGE Information: Unable to find Python 3. Data will fail to build from source. +!ENDIF + # Suffixes for data files .SUFFIXES : .nrm .icu .ucm .cnv .dll .dat .res .txt .c ICUOUT=$(ICUMAKE)\out -# the prefix "icudt21_" for use in filenames +# the prefix "icudt62_" for use in filenames ICUPKG=$(U_ICUDATA_NAME)$(U_ICUDATA_ENDIAN_SUFFIX) # need to nuke \\ for .NET... @@ -58,15 +68,10 @@ ICUP=$(ICUP:\source\data\\..\..=) ICUSRCDATA=$(ICUP)\source\data ICUSRCDATA_RELATIVE_PATH=..\..\.. -# ICUUCM -# The directory that contains ucmcore.mk files along with *.ucm files -# -ICUUCM=mappings - -# ICULOC -# The directory that contains resfiles.mk files along with *.txt locale data files -# -ICULOC=locales +# Timestamp files to keep track of current build state +TOOLS_TS=$(ICUTMP)\tools.timestamp +COREDATA_TS=$(ICUTMP)\coredata.timestamp +ARM_CROSSBUILD_TS= # ICUCOL # The directory that contains colfiles.mk files along with *.txt collation data files @@ -88,23 +93,6 @@ ICUTRNS=translit # ICUBRK=brkitr -# ICUUNIDATA -# The directory that contains Unicode data files -# -ICUUNIDATA=$(ICUP)\source\data\unidata - - -# ICUMISC -# The directory that contains miscfiles.mk along with files that are miscelleneous data -# -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. @@ -117,11 +105,18 @@ 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 +!IF "$(CFG)" == "ARM\Release" || "$(CFG)" == "ARM\Debug" +DLL_OUTPUT=$(ICUP)\binARM$(UWP) +!ELSE IF "$(CFG)" == "ARM64\Release" || "$(CFG)" == "ARM64\Debug" +DLL_OUTPUT=$(ICUP)\binARM64$(UWP) +!ELSE IF "$(CFG)" == "x64\Release" || "$(CFG)" == "x64\Debug" +DLL_OUTPUT=$(ICUP)\bin64$(UWP) +!ELSE IF "$(UWP)" == "UWP" +DLL_OUTPUT=$(ICUP)\bin32$(UWP) !ELSE -DLL_OUTPUT=$(ICUP)\bin +DLL_OUTPUT=$(ICUP)\bin$(UWP) !ENDIF +!MESSAGE ICU data DLL_OUTPUT path is $(DLL_OUTPUT) # # TESTDATA @@ -135,7 +130,7 @@ TESTDATAOUT=$(ICUP)\source\test\testdata\out # # TESTDATABLD -# The build directory for test data intermidiate files +# The build directory for test data intermediate files # (Tests are NOT run from this makefile, # only the data is put in place.) TESTDATABLD=$(ICUP)\source\test\testdata\out\build @@ -145,14 +140,47 @@ TESTDATABLD=$(ICUP)\source\test\testdata\out\build # Directory under which all of the ICU data building tools live. # ICUTOOLS=$(ICUP)\source\tools +!MESSAGE ICU tools path is $(ICUTOOLS) -# 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 +# ARM_CROSS_BUILD +# In order to support cross-compiling for ARM/ARM64 using the x64 tools +# we need to know if we're building the ARM/ARM64 data DLL, otherwise +# the existence of the x64 bits will cause us to think we are already done. +# Note: This is only for the "regular" builds, the UWP builds have a separate project file entirely. +ARM_CROSS_BUILD= +!IF "$(UWP)" == "" +!IF "$(CFG)" == "ARM\Release" || "$(CFG)" == "ARM\Debug" +ARM_CROSS_BUILD=ARM +ARM_CROSSBUILD_TS=$(ICUTMP)\$(ARM_CROSS_BUILD).timestamp +!ELSE IF "$(CFG)" == "ARM64\Release" || "$(CFG)" == "ARM64\Debug" +ARM_CROSS_BUILD=ARM64 +ARM_CROSSBUILD_TS=$(ICUTMP)\$(ARM_CROSS_BUILD).timestamp +!ENDIF +!ENDIF + +# +# TOOLS CFG PATH +# Generally the tools want to run on the same architecture as is being built. +# Thus ARM and ARM64 need to use another build of the other tools, so make sure to get an usable cfg path. +# Since tools, particularly pkggen, have architecture built-in, we made x64 on +# Windows be machine-independent and use those tools. +# +!IF "$(ARM_CROSS_BUILD)" == "" +CFGTOOLS=$(CFG) !ELSE +CFGTOOLS=x64\Release +!ENDIF +!MESSAGE ICU tools CFG subpath is $(CFGTOOLS) + + +# The current ICU tools need to be in the path first. +# x86 uses x86; x64, arm, and arm64 use x64 +!IF "$(CFG)" == "x86\Release" || "$(CFG)" == "x86\Debug" PATH = $(ICUP)\bin;$(PATH) ICUPBIN=$(ICUP)\bin +!ELSE +PATH = $(ICUP)\bin64;$(PATH) +ICUPBIN=$(ICUP)\bin64 !ENDIF @@ -178,331 +206,78 @@ ICUDATA_SOURCE_ARCHIVE=$(ICUTMP)\$(ICUPKG).dat !IFDEF ICUDATA_SOURCE_ARCHIVE !MESSAGE ICU data source archive is $(ICUDATA_SOURCE_ARCHIVE) -!ELSE -# We're including a list of .ucm files. -# There are several lists, they are all optional. - -# Always build the mapping files for the EBCDIC fallback codepages -# They are necessary on EBCDIC machines, and -# the following logic is much easier if UCM_SOURCE is never empty. -# (They are small.) -UCM_SOURCE=ibm-37_P100-1995.ucm ibm-1047_P100-1995.ucm - -!IF EXISTS("$(ICUSRCDATA)\$(ICUUCM)\ucmcore.mk") -!INCLUDE "$(ICUSRCDATA)\$(ICUUCM)\ucmcore.mk" -UCM_SOURCE=$(UCM_SOURCE) $(UCM_SOURCE_CORE) -!ELSE -!MESSAGE Warning: cannot find "ucmcore.mk". Not building core MIME/Unix/Windows converter files. -!ENDIF - -!IF EXISTS("$(ICUSRCDATA)\$(ICUUCM)\ucmfiles.mk") -!INCLUDE "$(ICUSRCDATA)\$(ICUUCM)\ucmfiles.mk" -UCM_SOURCE=$(UCM_SOURCE) $(UCM_SOURCE_FILES) -!ELSE -!MESSAGE Warning: cannot find "ucmfiles.mk". Not building many converter files. -!ENDIF - -!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 -!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 +# Common defines for both ways of building ICU's data library. +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 . +!IF "$(UWP)" == "UWP" +COMMON_ICUDATA_ARGUMENTS=$(COMMON_ICUDATA_ARGUMENTS) -u !ENDIF -!ELSE -!MESSAGE Information: cannot find "ucmlocal.mk". Not building user-additional converter files. +!IF "$(CFG)" == "ARM\Release" || "$(CFG)" == "ARM\Debug" +COMMON_ICUDATA_ARGUMENTS=$(COMMON_ICUDATA_ARGUMENTS) -a ARM !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_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. -!ENDIF -!ELSE -!MESSAGE Warning: cannot find "brkfiles.mk" +!IF "$(CFG)" == "ARM64\Release" || "$(CFG)" == "ARM64\Debug" +COMMON_ICUDATA_ARGUMENTS=$(COMMON_ICUDATA_ARGUMENTS) -a ARM64 !ENDIF +############################################################################# # -# Break iterator data files. +# ALL +# This target builds all the data files. The world starts here. +# Note: we really want the common data dll to go to $(DLL_OUTPUT), not $(ICUBLD_PKG). But specifying +# that here seems to cause confusion with the building of the stub library of the same name. +# Building the common dll in $(ICUBLD_PKG) unconditionally copies it to $(DLL_OUTPUT) too. # -BRK_FILES=$(ICUBRK)\$(BRK_SOURCE:.txt =.brk brkitr\) -BRK_FILES=$(BRK_FILES:.txt=.brk) -BRK_FILES=$(BRK_FILES:brkitr\ =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 -BRK_RES_FILES = $(BRK_RES_SOURCE:.txt =.res brkitr\) -BRK_RES_FILES = $(BRK_RES_FILES:.txt=.res) -BRK_RES_FILES = $(ICUBRK)\root.res $(ICUBRK)\$(BRK_RES_FILES:brkitr\ =) -ALL_RES = $(ALL_RES) $(ICUBRK)\res_index.res -!ENDIF - -# Read list of locale resource bundle files -!IF EXISTS("$(ICUSRCDATA)\$(ICULOC)\resfiles.mk") -!INCLUDE "$(ICUSRCDATA)\$(ICULOC)\resfiles.mk" -!IF EXISTS("$(ICUSRCDATA)\$(ICULOC)\reslocal.mk") -!INCLUDE "$(ICUSRCDATA)\$(ICULOC)\reslocal.mk" -GENRB_SOURCE=$(GENRB_SOURCE) $(GENRB_SOURCE_LOCAL) -!ELSE -!MESSAGE Information: cannot find "reslocal.mk". Not building user-additional resource bundle files. -!ENDIF -!ELSE -!MESSAGE Warning: cannot find "resfiles.mk" -!ENDIF - -!IFDEF GENRB_SOURCE -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 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 -ZONE_SOURCE=$(ZONE_SOURCE) tzdbNames.txt -!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 units display name resource bundle files -!IF EXISTS("$(ICUSRCDATA)\unit\resfiles.mk") -!INCLUDE "$(ICUSRCDATA)\unit\resfiles.mk" -!IF EXISTS("$(ICUSRCDATA)\unit\reslocal.mk") -!INCLUDE "$(ICUSRCDATA)\unit\reslocal.mk" -UNIT_SOURCE=$(UNIT_SOURCE) $(UNIT_SOURCE_LOCAL) -!ELSE -!MESSAGE Information: cannot find "unit\reslocal.mk". Not building user-additional resource bundle files. -!ENDIF -!ELSE -!MESSAGE Warning: cannot find "unit\resfiles.mk" -!ENDIF - -!IFDEF UNIT_SOURCE -UNIT_FILES = unit\root.txt $(UNIT_ALIAS_SOURCE) $(UNIT_SOURCE) -UNIT_RES_FILES = $(UNIT_FILES:.txt =.res unit\) -UNIT_RES_FILES = $(UNIT_RES_FILES:.txt=.res) -UNIT_RES_FILES = unit\pool.res $(UNIT_RES_FILES:unit\ =unit\) -ALL_RES = $(ALL_RES) unit\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") -!INCLUDE "$(ICUSRCDATA)\$(ICUCOL)\collocal.mk" -COLLATION_SOURCE=$(COLLATION_SOURCE) $(COLLATION_SOURCE_LOCAL) -!ELSE -!MESSAGE Information: cannot find "collocal.mk". Not building user-additional resource bundle files. -!ENDIF -!ELSE -!MESSAGE Warning: cannot find "colfiles.mk" -!ENDIF - -!IFDEF COLLATION_SOURCE -COL_FILES = $(ICUCOL)\root.txt $(COLLATION_ALIAS_SOURCE) $(COLLATION_SOURCE) -COL_COL_FILES = $(COL_FILES:.txt =.res coll\) -COL_COL_FILES = $(COL_COL_FILES:.txt=.res) -COL_COL_FILES = $(COL_COL_FILES:coll\ =) -ALL_RES = $(ALL_RES) $(ICUCOL)\res_index.res -!ENDIF - -# 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") -!INCLUDE "$(ICUSRCDATA)\$(ICURBNF)\rbnflocal.mk" -RBNF_SOURCE=$(RBNF_SOURCE) $(RBNF_SOURCE_LOCAL) -!ELSE -!MESSAGE Information: cannot find "rbnflocal.mk". Not building user-additional resource bundle files. -!ENDIF -!ELSE -!MESSAGE Warning: cannot find "rbnffiles.mk" -!ENDIF - -!IFDEF RBNF_SOURCE -RBNF_FILES = $(ICURBNF)\root.txt $(RBNF_ALIAS_SOURCE) $(RBNF_SOURCE) -RBNF_RES_FILES = $(RBNF_FILES:.txt =.res rbnf\) -RBNF_RES_FILES = $(RBNF_RES_FILES:.txt=.res) -RBNF_RES_FILES = $(RBNF_RES_FILES:rbnf\ =rbnf\) -ALL_RES = $(ALL_RES) $(ICURBNF)\res_index.res -!ENDIF - -# 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") -!INCLUDE "$(ICUSRCDATA)\$(ICUTRNS)\trnslocal.mk" -TRANSLIT_SOURCE=$(TRANSLIT_SOURCE) $(TRANSLIT_SOURCE_LOCAL) -!ELSE -!MESSAGE Information: cannot find "trnslocal.mk". Not building user-additional transliterator files. -!ENDIF -!ELSE -!MESSAGE Warning: cannot find "trnsfiles.mk" -!ENDIF +############################################################################# +!IF "$(ARM_CROSS_BUILD)" == "" +ALL : GODATA "$(ICU_LIB_TARGET)" "$(TESTDATAOUT)\testdata.dat" + @echo All targets are up to date -!IFDEF TRANSLIT_SOURCE -TRANSLIT_FILES = $(ICUTRNS)\$(TRANSLIT_ALIAS_SOURCE) $(TRANSLIT_SOURCE) -TRANSLIT_RES_FILES = $(TRANSLIT_FILES:.txt =.res translit\) -TRANSLIT_RES_FILES = $(TRANSLIT_RES_FILES:.txt=.res) -TRANSLIT_RES_FILES = $(TRANSLIT_RES_FILES:translit\ =translit\) -#ALL_RES = $(ALL_RES) $(ICUTRNS)\res_index.res +!IF "$(UWP)" == "UWP" + @if not exist "$(ICUMAKE)\..\..\commondata\" mkdir "$(ICUMAKE)\..\..\commondata\" + copy "$(ICUOUT)\$(U_ICUDATA_NAME)$(U_ICUDATA_ENDIAN_SUFFIX).dat" "$(ICUMAKE)\..\..\commondata\" !ENDIF -# 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") -!INCLUDE "$(ICUSRCDATA)\$(ICUMISC2)\misclocal.mk" -MISC_SOURCE=$(MISC_SOURCE) $(MISC_SOURCE_LOCAL) -!ELSE -!MESSAGE Information: cannot find "misclocal.mk". Not building user-additional miscellaenous files. -!ENDIF !ELSE -!MESSAGE Warning: cannot find "miscfiles.mk" -!ENDIF - -MISC_FILES = $(MISC_SOURCE:.txt=.res) +ALL : GODATA "$(ICU_LIB_TARGET)" "$(TESTDATAOUT)\testdata.dat" $(ARM_CROSSBUILD_TS) + @echo All targets are up to date -# don't include COL_FILES -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 +# Three main targets: tools, core data, and test data. +# Keep track of whether they are built via timestamp files. -SPREP_FILES = $(SPREP_SOURCE:.txt=.spp) +$(TOOLS_TS): "$(ICUTOOLS)\genrb\$(CFGTOOLS)\genrb.exe" "$(ICUTOOLS)\gencnval\$(CFGTOOLS)\gencnval.exe" "$(ICUTOOLS)\gencfu\$(CFGTOOLS)\gencfu.exe" "$(ICUTOOLS)\icupkg\$(CFGTOOLS)\icupkg.exe" "$(ICUTOOLS)\makeconv\$(CFGTOOLS)\makeconv.exe" "$(ICUPBIN)\pkgdata.exe" + @echo "timestamp" > $(TOOLS_TS) -# Common defines for both ways of building ICU's data library. -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 . - -############################################################################# +# On Unix, Python generates at configure time a list of Makefile rules. +# On Windows, however, we run the Python data build script at build time instead. +# The alternative would be to use a preprocessor macro to generate rules for nmake. +# However, this approach was abandoned for reasons including: # -# ALL -# This target builds all the data files. The world starts here. -# Note: we really want the common data dll to go to $(DLL_OUTPUT), not $(ICUBLD_PKG). But specifying -# that here seems to cause confusion with the building of the stub library of the same name. -# Building the common dll in $(ICUBLD_PKG) unconditionally copies it to $(DLL_OUTPUT) too. +# - nmake imposes more stringent restrictions on command line length. +# - The lack of gnumake features makes nmake file construction more complex. +# - Windows builds are single-threaded, giving less advantage to a Makefile approach. # -############################################################################# -ALL : GODATA "$(ICU_LIB_TARGET)" "$(TESTDATAOUT)\testdata.dat" - @echo All targets are up to date +# Currently, the entire script needs to run even for small changes to data. Maybe consider +# checking file-changed timestamps in Python to build only the required subset of data. + +$(COREDATA_TS): + @cd "$(ICUSRCDATA)" + set PYTHONPATH=$(ICUP)\source\python;%PYTHONPATH% + py -3 -B -m icutools.databuilder \ + --mode windows-exec \ + --src_dir "$(ICUSRCDATA)" \ + --tool_dir "$(ICUTOOLS)" \ + --tool_cfg "$(CFGTOOLS)" \ + --out_dir "$(ICUBLD_PKG)" \ + --tmp_dir "$(ICUTMP)" \ + --filter_file "$(ICU_DATA_FILTER_FILE)" \ + $(ICU_DATA_BUILDTOOL_OPTS) + @echo "timestamp" > $(COREDATA_TS) + # 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 @@ -554,9 +329,9 @@ 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 +"$(ICUOUT)\icu4j\src\$(DEBUGUTILITIESDATA_DIR)\$(DEBUGUTILITIESDATA_SRC)" : {"$(ICUTOOLS)\gentest\$(CFGTOOLS)"}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)" + "$(ICUTOOLS)\gentest\$(CFGTOOLS)\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)" @@ -600,10 +375,10 @@ icu4j-data-install : # # testdata - nmake will invoke pkgdata, which will create testdata.dat # -"$(TESTDATAOUT)\testdata.dat": "$(TESTDATA)\*" "$(ICUBLD_PKG)\$(ICUCOL)\ucadata.icu" $(TRANSLIT_RES_FILES) $(MISC_FILES) $(RB_FILES) {"$(ICUTOOLS)\genrb\$(CFG)"}genrb.exe +"$(TESTDATAOUT)\testdata.dat": "$(TESTDATA)\*" $(TOOLS_TS) $(COREDATA_TS) @cd "$(TESTDATA)" @echo building testdata... - nmake /nologo /f "$(TESTDATA)\testdata.mak" TESTDATA=. ICUTOOLS="$(ICUTOOLS)" ICUPBIN="$(ICUPBIN)" ICUP="$(ICUP)" CFG=$(CFG) TESTDATAOUT="$(TESTDATAOUT)" TESTDATABLD="$(TESTDATABLD)" + nmake /nologo /f "$(TESTDATA)\testdata.mak" TESTDATA=. ICUTOOLS="$(ICUTOOLS)" ICUPBIN="$(ICUPBIN)" ICUP="$(ICUP)" CFG=$(CFGTOOLS) TESTDATAOUT="$(TESTDATAOUT)" TESTDATABLD="$(TESTDATABLD)" ICUSRCDATA="$(ICUSRCDATA)" DLL_OUTPUT="$(DLL_OUTPUT)" #invoke pkgdata for ICU common data # pkgdata will drop all output files (.dat, .dll, .lib) into the target (ICUBLD_PKG) directory. @@ -624,72 +399,39 @@ icu4j-data-install : 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) $(CNV_FILES_SPECIAL) "$(ICUBLD_PKG)\unames.icu" "$(ICUBLD_PKG)\cnvalias.icu" "$(ICUBLD_PKG)\nfkc.nrm" "$(ICUBLD_PKG)\nfkc_cf.nrm" "$(ICUBLD_PKG)\uts46.nrm" "$(ICUBLD_PKG)\$(ICUCOL)\ucadata.icu" $(CURR_RES_FILES) $(LANG_RES_FILES) $(REGION_RES_FILES) $(ZONE_RES_FILES) $(UNIT_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 +"$(ICU_LIB_TARGET)" : $(COMMON_ICUDATA_DEPENDENCIES) $(COREDATA_TS) + @echo Building ICU data from scratch cd "$(ICUBLD_PKG)" - "$(ICUPBIN)\pkgdata" $(COMMON_ICUDATA_ARGUMENTS) <<"$(ICUTMP)\icudata.lst" -unames.icu -confusables.cfu -$(ICUCOL)\ucadata.icu -cnvalias.icu -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 -) -$(UNIT_RES_FILES:.res =.res -) -$(COL_COL_FILES:.res =.res -) -$(RBNF_RES_FILES:.res =.res -) -$(TRANSLIT_RES_FILES:.res =.res -) -$(BRK_FILES:.brk =.brk -) -$(BRK_DICT_FILES:.dict =.dict -) -$(BRK_RES_FILES:.res =.res -) -$(SPREP_FILES:.spp=.spp -) -< $(ARM_CROSSBUILD_TS) + # utility target to create missing directories +# Most directories are made by Python, but still create ICUTMP +# so it works in the source archive CREATE_DIRS : @if not exist "$(ICUOUT)\$(NULL)" mkdir "$(ICUOUT)" @if not exist "$(ICUTMP)\$(NULL)" mkdir "$(ICUTMP)" @if not exist "$(ICUOUT)\build\$(NULL)" mkdir "$(ICUOUT)\build" @if not exist "$(ICUBLD_PKG)\$(NULL)" mkdir "$(ICUBLD_PKG)" - @if not exist "$(ICUBLD_PKG)\curr\$(NULL)" mkdir "$(ICUBLD_PKG)\curr" - @if not exist "$(ICUBLD_PKG)\lang\$(NULL)" mkdir "$(ICUBLD_PKG)\lang" - @if not exist "$(ICUBLD_PKG)\region\$(NULL)" mkdir "$(ICUBLD_PKG)\region" - @if not exist "$(ICUBLD_PKG)\zone\$(NULL)" mkdir "$(ICUBLD_PKG)\zone" - @if not exist "$(ICUBLD_PKG)\$(ICUBRK)\$(NULL)" mkdir "$(ICUBLD_PKG)\$(ICUBRK)" - @if not exist "$(ICUBLD_PKG)\$(ICUCOL)\$(NULL)" mkdir "$(ICUBLD_PKG)\$(ICUCOL)" - @if not exist "$(ICUBLD_PKG)\$(ICURBNF)\$(NULL)" mkdir "$(ICUBLD_PKG)\$(ICURBNF)" - @if not exist "$(ICUBLD_PKG)\$(ICUTRNS)\$(NULL)" mkdir "$(ICUBLD_PKG)\$(ICUTRNS)" - @if not exist "$(TESTDATAOUT)\$(NULL)" mkdir "$(TESTDATAOUT)" - @if not exist "$(TESTDATABLD)\$(NULL)" mkdir "$(TESTDATABLD)" - @if not exist "$(TESTDATAOUT)\testdata\$(NULL)" mkdir "$(TESTDATAOUT)\testdata" + @if not exist "$(TESTDATAOUT)" mkdir "$(TESTDATAOUT)" # utility target to send us to the right dir GODATA : CREATE_DIRS @@ -698,306 +440,20 @@ GODATA : CREATE_DIRS # This is to remove all the data files CLEAN : GODATA @echo Cleaning up the data files. - @cd "$(ICUBLD_PKG)" - -@erase "*.cnv" - -@erase "*.exp" - -@erase "*.icu" - -@erase "*.lib" - -@erase "*.nrm" - -@erase "*.res" - -@erase "*.spp" - -@erase "*.txt" - -@erase "*.cfu" - -@erase "curr\*.res" - -@erase "curr\*.txt" - -@erase "lang\*.res" - -@erase "lang\*.txt" - -@erase "region\*.res" - -@erase "region\*.txt" - -@erase "zone\*.res" - -@erase "zone\*.txt" - @cd "$(ICUBLD_PKG)\$(ICUBRK)" - -@erase "*.brk" - -@erase "*.res" - -@erase "*.txt" - -@erase "*.dict" - @cd "$(ICUBLD_PKG)\$(ICUCOL)" - -@erase "*.res" - -@erase "*.txt" - @cd "$(ICUBLD_PKG)\$(ICURBNF)" - -@erase "*.res" - -@erase "*.txt" - @cd "$(ICUBLD_PKG)\$(ICUTRNS)" - -@erase "*.res" @cd "$(ICUOUT)" - -@erase "*.dat" - @cd "$(ICUTMP)" - -@erase "*.html" - -@erase "*.lst" - -@erase "*.mak" - -@erase "*.obj" - -@erase "*.res" - @cd "$(TESTDATABLD)" - -@erase "*.cnv" - -@erase "*.icu" - -@erase "*.mak" - -@erase "*.nrm" - -@erase "*.res" - -@erase "*.spp" - -@erase "*.txt" - @cd "$(TESTDATAOUT)" - -@erase "*.dat" - @cd "$(TESTDATAOUT)\testdata" - -@erase "*.typ" - @cd "$(ICUBLD_PKG)" - - -# RBBI .brk file generation. -{$(ICUSRCDATA_RELATIVE_PATH)\$(ICUBRK)}.txt.brk: - @echo Creating $@ - @"$(ICUTOOLS)\genbrk\$(CFG)\genbrk" -c -r $< -o $@ -d"$(ICUBLD_PKG)" -i "$(ICUBLD_PKG)" - -#RBBI .dict file generation. -{$(ICUSRCDATA_RELATIVE_PATH)\$(ICUBRK)}.txt.dict: - @echo Creating $@ - @"$(ICUTOOLS)\gendict\$(CFG)\gendict" -c --uchars $< "$(ICUBLD_PKG)\$@" - -$(ICUBRK)\thaidict.dict: - @echo Creating $(ICUBRK)\thaidict.dict - @"$(ICUTOOLS)\gendict\$(CFG)\gendict" -c --bytes --transform offset-0x0e00 $(ICUSRCDATA_RELATIVE_PATH)\$(ICUBRK)\thaidict.txt "$(ICUBLD_PKG)\$(ICUBRK)\thaidict.dict" - -$(ICUBRK)\laodict.dict: - @echo Creating $(ICUBRK)\laodict.dict - @"$(ICUTOOLS)\gendict\$(CFG)\gendict" -c --bytes --transform offset-0x0e80 $(ICUSRCDATA_RELATIVE_PATH)\$(ICUBRK)\laodict.txt "$(ICUBLD_PKG)\$(ICUBRK)\laodict.dict" - -$(ICUBRK)\burmesedict.dict: - @echo Creating $(ICUBRK)\burmesedict.dict - @"$(ICUTOOLS)\gendict\$(CFG)\gendict" -c --bytes --transform offset-0x1000 $(ICUSRCDATA_RELATIVE_PATH)\$(ICUBRK)\burmesedict.txt "$(ICUBLD_PKG)\$(ICUBRK)\burmesedict.dict" - -$(ICUBRK)\khmerdict.dict: - @echo Creating $(ICUBRK)\khmerdict.dict - @"$(ICUTOOLS)\gendict\$(CFG)\gendict" -c --bytes --transform offset-0x1780 $(ICUSRCDATA_RELATIVE_PATH)\$(ICUBRK)\khmerdict.txt "$(ICUBLD_PKG)\$(ICUBRK)\khmerdict.dict" - -!IFNDEF ICUDATA_SOURCE_ARCHIVE -# Rule for creating converters -$(CNV_FILES): $(UCM_SOURCE) - @echo Building Charset Conversion table $(@B) - @"$(ICUTOOLS)\makeconv\$(CFG)\makeconv" -c -d"$(ICUBLD_PKG)" $(ICUSRCDATA_RELATIVE_PATH)\$(ICUUCM)\$(@B).ucm -!ENDIF - -!IFDEF BUILD_SPECIAL_CNV_FILES -$(CNV_FILES_SPECIAL): $(UCM_SOURCE_SPECIAL) - @echo Building Special Charset Conversion table $(@B) - @"$(ICUTOOLS)\makeconv\$(CFG)\makeconv" -c --ignore-siso-check -d"$(ICUBLD_PKG)" $(ICUSRCDATA_RELATIVE_PATH)\$(ICUUCM)\$(@B).ucm -!ENDIF - -# Batch inference rule for creating miscellaneous resource files -# TODO: -q option is specified to squelch the 120+ warnings about -# empty intvectors and binary elements. Unfortunately, this may -# squelch other legitimate warnings. When there is a better -# way, remove the -q. -{$(ICUSRCDATA_RELATIVE_PATH)\$(ICUMISC2)}.txt.res:: - @echo Making Miscellaneous Resource Bundle files - @"$(ICUTOOLS)\genrb\$(CFG)\genrb" -k -q -d"$(ICUBLD_PKG)" $< - -# Inference rule for creating resource bundle files -{$(ICUSRCDATA_RELATIVE_PATH)\$(ICULOC)}.txt.res:: - @echo Making Locale Resource Bundle files - @"$(ICUTOOLS)\genrb\$(CFG)\genrb" --usePoolBundle $(ICUSRCDATA_RELATIVE_PATH)\$(ICULOC) -k -d"$(ICUBLD_PKG)" $< - -# copy the locales/pool.res file from the source folder to the build output folder -# and swap it to native endianness -pool.res: $(ICUSRCDATA_RELATIVE_PATH)\$(ICULOC)\pool.res - "$(ICUPBIN)\icupkg" -tl "$(ICUSRCDATA_RELATIVE_PATH)\$(ICULOC)\pool.res" pool.res - -res_index.res: - @echo Generating <