mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-08 06:53:45 +00:00
ICU-2966 update makefiles to build data/misc/zoneinfo.txt
X-SVN-Rev: 12834
This commit is contained in:
Alan Liu
parent
7d1545d7c5
commit
b3a09666fc
4 changed files with 82 additions and 7 deletions
|
|
@ -35,6 +35,7 @@ BUILDDIR=$(OUTDIR)/build
|
|||
UNICODEDATADIR=$(SRCDATADIR)/unidata
|
||||
LOCSRCDIR=$(SRCDATADIR)/locales
|
||||
TRNSSRCDIR=$(SRCDATADIR)/translit
|
||||
MISCSRCDIR=$(SRCDATADIR)/misc
|
||||
BRKSRCDIR=$(SRCDATADIR)/brkitr
|
||||
MISCSRCDIR=$(SRCDATADIR)/misc
|
||||
UCMSRCDIR=$(SRCDATADIR)/mappings
|
||||
|
|
@ -168,7 +169,13 @@ GENRBOPTS=-k -q
|
|||
TRNS_SOURCE= $(TRANSLIT_SOURCE) $(TRANSLIT_SOURCE_LOCAL)
|
||||
TRNS_SRC_FILES=$(TRNS_SOURCE:%=$(TRNSSRCDIR)/%)
|
||||
|
||||
ALL_RES_SOURCE= $(RES_SOURCE) $(TRNS_SOURCE)
|
||||
## MISC files
|
||||
-include $(MISCSRCDIR)/miscfiles.mk
|
||||
-include $(MISCSRCDIR)/misclocal.mk
|
||||
MSC_SOURCE= $(MISC_SOURCE) $(MISC_SOURCE_LOCAL)
|
||||
MSC_SRC_FILES=$(MSC_SOURCE:%=$(MISCSRCDIR)/%)
|
||||
|
||||
ALL_RES_SOURCE= $(RES_SOURCE) $(TRNS_SOURCE) $(MSC_SOURCE)
|
||||
RES_FILES = $(ALL_RES_SOURCE:%.txt=$(BUILDDIR)/$(ICUDT)%.res)
|
||||
|
||||
INDEX_FILES=$(BUILDDIR)/res_index.txt
|
||||
|
|
@ -260,6 +267,9 @@ $(BUILDDIR)/$(ICUDT)%.res: $(LOCSRCDIR)/%.txt $(TOOLDIR)/genrb/genrb$(EXEEXT) $(
|
|||
$(BUILDDIR)/$(ICUDT)%.res: $(TRNSSRCDIR)/%.txt $(TOOLDIR)/genrb/genrb$(EXEEXT) $(DAT_FILES)
|
||||
ICU_DATA=$(BUILDDIR) $(INVOKE) $(TOOLDIR)/genrb/genrb $(GENRBOPTS) -p $(ICUDATA_PLATFORM_NAME) -s $(TRNSSRCDIR) -d $(BUILDDIR) $(<F)
|
||||
|
||||
$(BUILDDIR)/$(ICUDT)%.res: $(MISCSRCDIR)/%.txt $(TOOLDIR)/genrb/genrb$(EXEEXT)
|
||||
ICU_DATA=$(BUILDDIR) $(INVOKE) $(TOOLDIR)/genrb/genrb $(GENRBOPTS) -p $(ICUDATA_PLATFORM_NAME) -s $(MISCSRCDIR) -d $(BUILDDIR) $(<F)
|
||||
|
||||
$(BUILDDIR)/res_index.txt: $(SRCLISTDEPS)
|
||||
@echo "generating $@ (list of installed locales)"; \
|
||||
$(RMV) $@; \
|
||||
|
|
|
|||
|
|
@ -118,6 +118,17 @@ CFG=makedata - Win32 Debug
|
|||
# Name "makedata - Win32 Debug"
|
||||
# Name "makedata - Win64 Release"
|
||||
# Name "makedata - Win64 Debug"
|
||||
|
||||
!IF "$(CFG)" == "makedata - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "makedata - Win32 Debug"
|
||||
|
||||
!ELSEIF "$(CFG)" == "makedata - Win64 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "makedata - Win64 Debug"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# Begin Group "Source Files"
|
||||
|
||||
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
|
||||
|
|
@ -136,6 +147,10 @@ SOURCE=.\makedata.mak
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\misc\miscfiles.mk
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\locales\resfiles.mk
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
|
|
|||
|
|
@ -81,9 +81,10 @@ ICUUNIDATA=$(ICUP)\source\data\unidata
|
|||
|
||||
|
||||
# ICUMISC
|
||||
# The directory that contains files that are miscelleneous data
|
||||
# The directory that contains miscfiles.mk along with files that are miscelleneous data
|
||||
#
|
||||
ICUMISC=$(ICUP)\source\data\misc
|
||||
ICUMISC2=misc
|
||||
|
||||
#
|
||||
# ICUDATA
|
||||
|
|
@ -211,9 +212,24 @@ TRANLIT_SOURCE=$(TRANSLIT_SOURCE) $(TRANSLIT_SOURCE_LOCAL)
|
|||
|
||||
TRANSLIT_FILES = $(TRANSLIT_SOURCE:.txt=.res)
|
||||
|
||||
# Read 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)
|
||||
|
||||
INDEX_RES_FILES = res_index.res
|
||||
|
||||
ALL_RES = $(INDEX_RES_FILES) $(RB_FILES) $(TRANSLIT_FILES)
|
||||
ALL_RES = $(INDEX_RES_FILES) $(RB_FILES) $(TRANSLIT_FILES) $(MISC_FILES)
|
||||
|
||||
#############################################################################
|
||||
#
|
||||
|
|
@ -230,7 +246,7 @@ ALL : GODATA "$(DLL_OUTPUT)\$(U_ICUDATA_NAME).dll" "$(TESTDATAOUT)\testdata.dat"
|
|||
#
|
||||
# testdata - nmake will invoke pkgdata, which will create testdata.dat
|
||||
#
|
||||
"$(TESTDATAOUT)\testdata.dat": $(ICUDT)ucadata.icu $(TRANSLIT_FILES) $(RB_FILES) {"$(ICUTOOLS)\genrb\$(CFG)"}genrb.exe
|
||||
"$(TESTDATAOUT)\testdata.dat": $(ICUDT)ucadata.icu $(TRANSLIT_FILES) $(MISC_FILES) $(RB_FILES) {"$(ICUTOOLS)\genrb\$(CFG)"}genrb.exe
|
||||
@cd "$(TESTDATA)"
|
||||
@echo building testdata...
|
||||
nmake /nologo /f "$(TESTDATA)\testdata.mk" TESTDATA=. ICUTOOLS="$(ICUTOOLS)" PKGOPT="$(PKGOPT)" CFG=$(CFG) TESTDATAOUT="$(TESTDATAOUT)" ICUDATA="$(ICUDATA)" TESTDATABLD="$(TESTDATABLD)"
|
||||
|
|
@ -339,11 +355,20 @@ CLEAN : GODATA
|
|||
@echo Generating converters
|
||||
@"$(ICUTOOLS)\makeconv\$(CFG)\makeconv" -t -p"$(ICUPKG)" -d"$(ICUBLD)" $<
|
||||
|
||||
# Batch infrence rule for creating transliterator resource files
|
||||
# Batch inference rule for creating transliterator resource files
|
||||
{$(ICUSRCDATA_RELATIVE_PATH)\$(ICUTRNS)}.txt.res::
|
||||
@echo Making Transliterator Resource Bundle files
|
||||
@"$(ICUTOOLS)\genrb\$(CFG)\genrb" -k -t -p"$(ICUPKG)" -d"$(ICUBLD)" $<
|
||||
|
||||
# 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 -t -q -p"$(ICUPKG)" -d"$(ICUBLD)" $<
|
||||
|
||||
$(INDEX_RES_FILES):
|
||||
@echo Generating <<res_index.txt
|
||||
// Warning this file is automatically generated
|
||||
|
|
@ -417,5 +442,4 @@ res_index {
|
|||
|
||||
$(UCM_SOURCE) : {"$(ICUTOOLS)\makeconv\$(CFG)"}makeconv.exe
|
||||
|
||||
$(TRANSLIT_SOURCE) $(GENRB_SOURCE) "$(ICUBLD)\$(ICUDT)root.res" : {"$(ICUTOOLS)\genrb\$(CFG)"}genrb.exe "$(ICUBLD)\$(ICUDT)ucadata.icu" "$(ICUBLD)\$(ICUDT)uprops.icu" "$(ICUBLD)\$(ICUDT)unorm.icu"
|
||||
|
||||
$(TRANSLIT_SOURCE) $(MISC_SOURCE) $(GENRB_SOURCE) "$(ICUBLD)\$(ICUDT)root.res" : {"$(ICUTOOLS)\genrb\$(CFG)"}genrb.exe "$(ICUBLD)\$(ICUDT)ucadata.icu" "$(ICUBLD)\$(ICUDT)uprops.icu" "$(ICUBLD)\$(ICUDT)unorm.icu"
|
||||
26
icu4c/source/data/misc/miscfiles.mk
Normal file
26
icu4c/source/data/misc/miscfiles.mk
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
# * Copyright (C) 2003, International Business Machines
|
||||
# * Corporation and others. All Rights Reserved.
|
||||
# A list of txt's to build
|
||||
# Note:
|
||||
#
|
||||
# If you are thinking of modifying this file, READ THIS.
|
||||
#
|
||||
# Instead of changing this file [unless you want to check it back in],
|
||||
# you should consider creating a 'misclocal.mk' file in this same directory.
|
||||
# Then, you can have your local changes remain even if you upgrade or re-
|
||||
# configure ICU.
|
||||
#
|
||||
# Example 'misclocal.mk' files:
|
||||
#
|
||||
# * To add an additional file to the list:
|
||||
# _____________________________________________________
|
||||
# | MISC_SOURCE_LOCAL = myFile.txt ...
|
||||
#
|
||||
# * To REPLACE the default list and only build a subset of files:
|
||||
# _____________________________________________________
|
||||
# | MISC_SOURCE = zoneinfo.txt
|
||||
#
|
||||
#
|
||||
|
||||
MISC_SOURCE = \
|
||||
zoneinfo.txt
|
||||
Loading…
Add table
Reference in a new issue