ICU-400.40.tar.gz

[apple/icu.git] / icuSources / data / makedata.mak

diff --git a/icuSources/data/makedata.mak b/icuSources/data/makedata.mak
index 32bbc43c87c7e6be4ab1b7ca954601ae0b7937f5..4da2edfd5ffcbaa1fd0cfc638d25e3a0a0cbb6b8 100644 (file)
--- 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-2008, International Business Machines Corporation
 #* and others.  All Rights Reserved.
 #**********************************************************************
 # nmake file for creating data files on win32
@@ -10,10 +10,10 @@
 
 ##############################################################################
 # Keep the following in sync with the version - see common/unicode/uversion.h
-U_ICUDATA_NAME=icudt36
+U_ICUDATA_NAME=icudt40
 ##############################################################################
 U_ICUDATA_ENDIAN_SUFFIX=l
-UNICODE_VERSION=5.0
+UNICODE_VERSION=5.1
 ICU_LIB_TARGET=$(DLL_OUTPUT)\$(U_ICUDATA_NAME).dll
 
 #  ICUMAKE
@@ -250,7 +250,7 @@ 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 $(GENRB_ALIAS_SOURCE:.txt=.res) $(GENRB_ALIAS_SOURCE_LOCAL:.txt=.res) $(GENRB_SOURCE:.txt=.res)
 ALL_RES = $(ALL_RES) res_index.res
 !ENDIF
 
@@ -358,6 +358,8 @@ ALL : GODATA "$(ICU_LIB_TARGET)" "$(TESTDATAOUT)\testdata.dat"
 # 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.
+# Command line:
+#   C:\svn\icuproj\icu\trunk\source\data>nmake -f makedata.mak ICUMAKE=C:\svn\icuproj\icu\trunk\source\data\ CFG=Debug uni-core-data
 uni-core-data: GODATA "$(ICUBLD_PKG)\uprops.icu" "$(ICUBLD_PKG)\ucase.icu" "$(ICUBLD_PKG)\ubidi.icu" "$(ICUBLD_PKG)\unorm.icu"
        @echo Unicode .icu files built to "$(ICUBLD_PKG)"
        @echo Unicode .c source files built to "$(ICUTMP)"
@@ -365,10 +367,10 @@ uni-core-data: GODATA "$(ICUBLD_PKG)\uprops.icu" "$(ICUBLD_PKG)\ucase.icu" "$(IC
 #
 # 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)\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)" 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.
@@ -386,8 +388,8 @@ uni-core-data: GODATA "$(ICUBLD_PKG)\uprops.icu" "$(ICUBLD_PKG)\ucase.icu" "$(IC
        "$(ICUP)\bin\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)
        @echo Building icu data
@@ -419,8 +421,8 @@ $(BRK_RES_FILES:.res =.res
        -@erase "$(ICU_LIB_TARGET)"
        copy "$(U_ICUDATA_NAME).dll" "$(ICU_LIB_TARGET)"
        -@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"
 !ENDIF
 
 # utility target to create missing directories
@@ -454,6 +456,7 @@ CLEAN : GODATA
        -@erase "*.txt"
        @cd "$(ICUBLD_PKG)\$(ICUBRK)"
        -@erase "*.brk"
+       -@erase "*.ctd"
        -@erase "*.res"
        -@erase "*.txt"
        @cd "$(ICUBLD_PKG)\$(ICUCOL)"
@@ -467,7 +470,7 @@ CLEAN : GODATA
        @cd "$(ICUOUT)"
        -@erase "*.dat"
        @cd "$(ICUTMP)"
-       -@erase "*.txt"
+       -@erase "*.html"
        -@erase "*.lst"
        -@erase "*.mak"
        -@erase "*.obj"
@@ -498,7 +501,7 @@ CLEAN : GODATA
 
 # Batch inference rule for creating converters
 {$(ICUSRCDATA_RELATIVE_PATH)\$(ICUUCM)}.ucm.cnv::
-       @echo Generating converters
+       @echo Making Charset Conversion tables
        @"$(ICUTOOLS)\makeconv\$(CFG)\makeconv" -c -d"$(ICUBLD_PKG)" $<
 
 # Batch inference rule for creating miscellaneous resource files