From 81310aa37338eaa2fb6a6a8f5797787c6423fad2 Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Fri, 8 Mar 2002 01:57:46 +0000 Subject: [PATCH] ICU-1756 Hopefully fix the case when the directory has a space in the name. X-SVN-Rev: 7910 --- icu4c/source/data/makedata.mak | 175 ++++++++++++++++----------------- 1 file changed, 85 insertions(+), 90 deletions(-) diff --git a/icu4c/source/data/makedata.mak b/icu4c/source/data/makedata.mak index 92b41914e76..885490d6aff 100644 --- a/icu4c/source/data/makedata.mak +++ b/icu4c/source/data/makedata.mak @@ -23,7 +23,7 @@ UNICODE_VERSION=3.1.1 !ENDIF !MESSAGE ICU data make path is $(ICUMAKE) -ICUDBLD=$(ICUMAKE)\out\build +ICUBLD=$(ICUMAKE)\out\build ICUOUT=$(ICUMAKE)\out @@ -39,21 +39,22 @@ ICUP=$(ICUP:\source\data\..\..=) # The data directory in source # ICUSRCDATA=$(ICUP)\source\data +ICUSRCDATA_RELATIVE_PATH=..\..\ # ICUUCM # The directory that contains ucmcore.mk files along with *.ucm files # -ICUUCM=$(ICUP)\source\data\mappings +ICUUCM=mappings # ICULOC # The directory that contains resfiles.mk files along with *.txt locale data files # -ICULOC=$(ICUP)\source\data\locales -!MESSAGE ICULOC is "$(ICULOC)" +ICULOC=locales + # ICUTRANSLIT # The directory that contains trfiles.mk files along with *.txt transliterator files # -ICUTRNS=$(ICUP)\source\data\translit +ICUTRNS=translit # ICUBRK # The directory that contains resfiles.mk files along with *.txt break iterator files @@ -77,7 +78,6 @@ ICUMISC=$(ICUP)\source\data\misc # WARNING: NOT THE SAME AS ICU_DATA environment variable. Confusing. ICUDATA=$(ICUP)\source\data - # # DLL_OUTPUT # Destination directory for the common data DLL file. @@ -138,29 +138,29 @@ PKGOPT=R:$(ICUP) # (They are small.) UCM_SOURCE=ibm-37.ucm ibm-1047-s390.ucm -!IF EXISTS("$(ICUUCM)\ucmcore.mk") -!INCLUDE "$(ICUUCM)\ucmcore.mk" +!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("$(ICUUCM)\ucmfiles.mk") -!INCLUDE "$(ICUUCM)\ucmfiles.mk" +!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("$(ICUUCM)\ucmebcdic.mk") -!INCLUDE "$(ICUUCM)\ucmebcdic.mk" +!IF EXISTS("$(ICUSRCDATA)\$(ICUUCM)\ucmebcdic.mk") +!INCLUDE "$(ICUSRCDATA)\$(ICUUCM)\ucmebcdic.mk" UCM_SOURCE=$(UCM_SOURCE) $(UCM_SOURCE_EBCDIC) !ELSE !MESSAGE Warning: cannot find "ucmebcdic.mk". Not building EBCDIC converter files. !ENDIF -!IF EXISTS("$(ICUUCM)\ucmlocal.mk") -!INCLUDE "$(ICUUCM)\ucmlocal.mk" +!IF EXISTS("$(ICUSRCDATA)\$(ICUUCM)\ucmlocal.mk") +!INCLUDE "$(ICUSRCDATA)\$(ICUUCM)\ucmlocal.mk" UCM_SOURCE=$(UCM_SOURCE) $(UCM_SOURCE_LOCAL) !ELSE !MESSAGE Information: cannot find "ucmlocal.mk". Not building user-additional converter files. @@ -169,10 +169,10 @@ UCM_SOURCE=$(UCM_SOURCE) $(UCM_SOURCE_LOCAL) CNV_FILES=$(UCM_SOURCE:.ucm=.cnv) # Read list of locale resource bundle files -!IF EXISTS("$(ICULOC)\resfiles.mk") -!INCLUDE "$(ICULOC)\resfiles.mk" -!IF EXISTS("$(ICULOC)\reslocal.mk") -!INCLUDE "$(ICULOC)\reslocal.mk" +!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. @@ -184,10 +184,10 @@ GENRB_SOURCE=$(GENRB_SOURCE) $(GENRB_SOURCE_LOCAL) RB_FILES = $(GENRB_SOURCE:.txt=.res) # Read list of transliterator resource bundle files -!IF EXISTS("$(ICUTRNS)\trnsfiles.mk") -!INCLUDE "$(ICUTRNS)\trnsfiles.mk" -!IF EXISTS("$(ICUTRNS)\trnslocal.mk") -!INCLUDE "$(ICUTRNS)\trnslocal.mk" +!IF EXISTS("$(ICUSRCDATA)\$(ICUTRNS)\trnsfiles.mk") +!INCLUDE "$(ICUSRCDATA)\$(ICUTRNS)\trnsfiles.mk" +!IF EXISTS("$(ICUSRCDATA)\$(ICUTRNS)\trnslocal.mk") +!INCLUDE "$(ICUSRCDATA)\$(ICUTRNS)\trnslocal.mk" TRANLIT_SOURCE=$(TRANSLIT_SOURCE) $(TRANSLIT_SOURCE_LOCAL) !ELSE !MESSAGE Information: cannot find "trnslocal.mk". Not building user-additional transliterator files. @@ -204,32 +204,33 @@ ALL_RES = $(RB_FILES) $(TRANSLIT_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 $(ICUDBLD). But specifying +# Note: we really want the common data dll to go to $(DLL_OUTPUT), not $(ICUBLD). But specifying # that here seems to cause confusion with the building of the stub library of the same name. -# Building the common dll in $(ICUDBLD) unconditionally copies it to $(DLL_OUTPUT) too. +# Building the common dll in $(ICUBLD) unconditionally copies it to $(DLL_OUTPUT) too. # ############################################################################# -ALL : GODATA "$(ICUDBLD)\$(U_ICUDATA_NAME).dll" testdata "$(TESTDATAOUT)\test1.cnv" "$(TESTDATAOUT)\test3.cnv" "$(TESTDATAOUT)\test4.cnv" +ALL : GODATA "$(DLL_OUTPUT)\$(U_ICUDATA_NAME).dll" "$(TESTDATAOUT)\testdata.dat" "$(TESTDATAOUT)\test1.cnv" "$(TESTDATAOUT)\test3.cnv" "$(TESTDATAOUT)\test4.cnv" @echo All targets are up to date # # testdata - nmake will invoke pkgdata, which will create testdata.dat # -testdata: ucadata.dat $(TRANSLIT_FILES) $(RB_FILES) {"$(ICUTOOLS)\genrb\$(CFG)"}genrb.exe +"$(TESTDATAOUT)\testdata.dat": ucadata.dat $(TRANSLIT_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)" -BRK_FILES = "$(ICUDBLD)\sent.brk" "$(ICUDBLD)\char.brk" "$(ICUDBLD)\line.brk" "$(ICUDBLD)\word.brk" "$(ICUDBLD)\title.brk" "$(ICUDBLD)\line_th.brk" "$(ICUDBLD)\word_th.brk" +BRK_FILES = "$(ICUBLD)\sent.brk" "$(ICUBLD)\char.brk" "$(ICUBLD)\line.brk" "$(ICUBLD)\word.brk" "$(ICUBLD)\title.brk" "$(ICUBLD)\line_th.brk" "$(ICUBLD)\word_th.brk" #invoke pkgdata for ICU common data -# pkgdata will drop all output files (.dat, .dll, .lib) into the target (ICUDBLD) directory. +# pkgdata will drop all output files (.dat, .dll, .lib) into the target (ICUBLD) directory. # move the .dll and .lib files to their final destination afterwards. +# The $(U_ICUDATA_NAME).lib and $(U_ICUDATA_NAME).exp should already be in the right place due to stubdata. # -"$(ICUDBLD)\$(U_ICUDATA_NAME).dll" : $(CNV_FILES) $(BRK_FILES) "$(ICUDBLD)\uprops.dat" "$(ICUDBLD)\unames.dat" "$(ICUDBLD)\unorm.dat" "$(ICUDBLD)\cnvalias.dat" "$(ICUDBLD)\tz.dat" "$(ICUDBLD)\ucadata.dat" "$(ICUDBLD)\invuca.dat" $(ALL_RES) "$(ICUDBLD)\icudata.res" "$(ICUP)\source\stubdata\stubdatabuilt.txt" +"$(DLL_OUTPUT)\$(U_ICUDATA_NAME).dll" : "$(ICUTOOLS)\pkgdata\$(CFG)\pkgdata.exe" $(CNV_FILES) $(BRK_FILES) "$(ICUBLD)\uprops.dat" "$(ICUBLD)\unames.dat" "$(ICUBLD)\unorm.dat" "$(ICUBLD)\cnvalias.dat" "$(ICUBLD)\tz.dat" "$(ICUBLD)\ucadata.dat" "$(ICUBLD)\invuca.dat" $(ALL_RES) "$(ICUBLD)\icudata.res" "$(ICUP)\source\stubdata\stubdatabuilt.txt" @echo Building icu data - @cd "$(ICUDBLD)" - "$(ICUTOOLS)\pkgdata\$(CFG)\pkgdata" -e $(U_ICUDATA_NAME) -v -m dll -c -p $(U_ICUDATA_NAME) -O "$(PKGOPT)" -d "$(ICUDBLD)" -s . <