mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-09 15:27:38 +00:00
ICU-653 Bump ICU version to 1.7, change file naming
X-SVN-Rev: 2991
This commit is contained in:
parent
1016ea2a8c
commit
321d0ecf6a
3 changed files with 10 additions and 8 deletions
|
@ -68,7 +68,7 @@ main(int argc, char* argv[]) {
|
|||
|
||||
#ifndef U_HAVE_BIND_INTERNAL_REFERENCES
|
||||
|
||||
if( (options[4].doesOccur) && uprv_strcmp(options[4].value, "icudata")) /* be consistent with gencmn! */
|
||||
if( (options[4].doesOccur) && uprv_strcmp(options[4].value, U_ICUDATA_NAME)) /* be consistent with gencmn! */
|
||||
{
|
||||
uprv_strcpy(symPrefix, options[4].value);
|
||||
uprv_strcat(symPrefix, "_");
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#define STRING_STORE_SIZE 100000
|
||||
#define MAX_FILE_COUNT 2000
|
||||
|
||||
#define COMMON_DATA_NAME "icudata"
|
||||
#define COMMON_DATA_NAME U_ICUDATA_NAME
|
||||
#define DATA_TYPE "dat"
|
||||
|
||||
/* UDataInfo cf. udata.h */
|
||||
|
|
|
@ -8,6 +8,8 @@
|
|||
#
|
||||
# 12/10/1999 weiv Created
|
||||
|
||||
U_ICUDATA_NAME=icudt17l
|
||||
|
||||
#If no config, we default to debug
|
||||
!IF "$(CFG)" == ""
|
||||
CFG=Debug
|
||||
|
@ -44,7 +46,7 @@ TESTDATA=$(ICUP)\source\test\testdata
|
|||
DLL_OUTPUT=$(ICUP)\bin
|
||||
TESTDATAOUT=$(TESTDATA)
|
||||
#TESTDATAOUT=$(DLL_OUTPUT)
|
||||
!MESSAGE ICU_DATA is not set! icudata.dll will go to $(DLL_OUTPUT)
|
||||
!MESSAGE ICU_DATA is not set! $(U_ICUDATA_NAME).dll will go to $(DLL_OUTPUT)
|
||||
!ELSE
|
||||
DLL_OUTPUT=$(ICUDATA)
|
||||
TESTDATAOUT=$(TESTDATA)
|
||||
|
@ -70,7 +72,7 @@ NULL=
|
|||
NULL=nul
|
||||
!ENDIF
|
||||
|
||||
# Adjust the path to find DLLs. If icudata.dll really needs to be in $(ICUP)\bin\$(CFG),
|
||||
# Adjust the path to find DLLs. If $(U_ICUDATA_NAME).dll really needs to be in $(ICUP)\bin\$(CFG),
|
||||
# then add $(ICUP)\bin\$(CFG) to this path, as the other DLLs are in $(ICUP)\bin.
|
||||
PATH = $(PATH);$(ICUP)\bin
|
||||
|
||||
|
@ -108,15 +110,15 @@ RB_FILES = $(GENRB_SOURCE:.txt=.res)
|
|||
TRANSLIT_FILES = $(TRANSLIT_SOURCE:.txt=.res)
|
||||
|
||||
# This target should build all the data files
|
||||
ALL : GODATA test.dat "$(DLL_OUTPUT))\testdat1.dll" "$(DLL_OUTPUT))\testdat2.dll" "$(DLL_OUTPUT)\icudata.dll" test1.cnv test3.cnv test4.cnv GOBACK #icudata.dat
|
||||
ALL : GODATA test.dat "$(DLL_OUTPUT))\testdat1.dll" "$(DLL_OUTPUT))\testdat2.dll" "$(DLL_OUTPUT)\$(U_ICUDATA_NAME).dll" test1.cnv test3.cnv test4.cnv GOBACK #$(U_ICUDATA_NAME).dat
|
||||
@echo All targets are up to date
|
||||
|
||||
BRK_FILES = "$(ICUDATA)\sent.brk" "$(ICUDATA)\char.brk" "$(ICUDATA)\line.brk" "$(ICUDATA)\word.brk" "$(ICUDATA)\line_th.brk" "$(ICUDATA)\word_th.brk"
|
||||
|
||||
#invoke pkgdata
|
||||
"$(DLL_OUTPUT)\icudata.dll" : $(CNV_FILES) $(BRK_FILES) uprops.dat unames.dat cnvalias.dat tz.dat $(RB_FILES) $(TRANSLIT_FILES)
|
||||
"$(DLL_OUTPUT)\$(U_ICUDATA_NAME).dll" : $(CNV_FILES) $(BRK_FILES) uprops.dat unames.dat cnvalias.dat tz.dat $(RB_FILES) $(TRANSLIT_FILES)
|
||||
@echo Building icu data
|
||||
@"$(ICUTOOLS)\pkgdata\$(CFG)\pkgdata" -v -m dll -c -p icudata -O "$(PKGOPT)" -d "$(DLL_OUTPUT)" -s "$(ICUDATA)" <<pkgdatain.txt
|
||||
@"$(ICUTOOLS)\pkgdata\$(CFG)\pkgdata" -v -m dll -c -p $(U_ICUDATA_NAME) -O "$(PKGOPT)" -d "$(DLL_OUTPUT)" -s "$(ICUDATA)" <<pkgdatain.txt
|
||||
uprops.dat
|
||||
unames.dat
|
||||
cnvalias.dat
|
||||
|
@ -197,7 +199,7 @@ CLEAN :
|
|||
-@erase "tz*.*"
|
||||
-@erase "ibm*_cnv.c"
|
||||
-@erase "*_brk.c"
|
||||
-@erase "icudata.*"
|
||||
-@erase "icudt*.*"
|
||||
-@erase "*.obj"
|
||||
-@erase "sent.brk"
|
||||
-@erase "char.brk"
|
||||
|
|
Loading…
Add table
Reference in a new issue