From 8b2688a865311d6c82ea243cce619cfdcffbc02b Mon Sep 17 00:00:00 2001 From: Vladimir Weinstein Date: Wed, 15 Dec 1999 21:48:10 +0000 Subject: [PATCH] ICU-164 makedata is now integrated into MSVC and depends on the tools X-SVN-Rev: 422 --- icu4c/source/allinone/allinone.dsw | 39 +++++++++++ icu4c/source/tools/makedata.dsp | 100 +++++++++++++++++++++++++++++ icu4c/source/tools/makedata.dsw | 29 +++++++++ icu4c/source/tools/makedata.mak | 29 +++++++-- 4 files changed, 191 insertions(+), 6 deletions(-) create mode 100644 icu4c/source/tools/makedata.dsp create mode 100644 icu4c/source/tools/makedata.dsw diff --git a/icu4c/source/allinone/allinone.dsw b/icu4c/source/allinone/allinone.dsw index de0f44bdbc..eb070e9ad9 100644 --- a/icu4c/source/allinone/allinone.dsw +++ b/icu4c/source/allinone/allinone.dsw @@ -59,6 +59,9 @@ Package=<4> Begin Project Dependency Project_Dep_Name genprops End Project Dependency + Begin Project Dependency + Project_Dep_Name makedata + End Project Dependency }}} ############################################################################### @@ -351,6 +354,42 @@ Package=<4> ############################################################################### +Project: "makedata"=..\tools\makedata.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name genccode + End Project Dependency + Begin Project Dependency + Project_Dep_Name gencmn + End Project Dependency + Begin Project Dependency + Project_Dep_Name gencnval + End Project Dependency + Begin Project Dependency + Project_Dep_Name gencol + End Project Dependency + Begin Project Dependency + Project_Dep_Name gennames + End Project Dependency + Begin Project Dependency + Project_Dep_Name genrb + End Project Dependency + Begin Project Dependency + Project_Dep_Name gentz + End Project Dependency + Begin Project Dependency + Project_Dep_Name makeconv + End Project Dependency +}}} + +############################################################################### + Project: "mkhelper"=..\tools\mkhelper\mkhelper.dsp - Package Owner=<4> Package=<5> diff --git a/icu4c/source/tools/makedata.dsp b/icu4c/source/tools/makedata.dsp new file mode 100644 index 0000000000..cf2d3acbf9 --- /dev/null +++ b/icu4c/source/tools/makedata.dsp @@ -0,0 +1,100 @@ +# Microsoft Developer Studio Project File - Name="makedata" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) External Target" 0x0106 + +CFG=makedata - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "makedata.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "makedata.mak" CFG="makedata - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "makedata - Win32 Release" (based on "Win32 (x86) External Target") +!MESSAGE "makedata - Win32 Debug" (based on "Win32 (x86) External Target") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" + +!IF "$(CFG)" == "makedata - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Cmd_Line "NMAKE /f makedata.mak" +# PROP BASE Rebuild_Opt "/a" +# PROP BASE Target_File "makedata.exe" +# PROP BASE Bsc_Name "makedata.bsc" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Cmd_Line "NMAKE /f makedata.mak icup=$(MAKEDIR)\..\..\.. cfg=debug" +# PROP Rebuild_Opt "" +# PROP Target_File "makedata.exe" +# PROP Bsc_Name "" +# PROP Target_Dir "" + +!ELSEIF "$(CFG)" == "makedata - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Cmd_Line "NMAKE /f makedata.mak" +# PROP BASE Rebuild_Opt "/a" +# PROP BASE Target_File "makedata.exe" +# PROP BASE Bsc_Name "makedata.bsc" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Cmd_Line "NMAKE /f makedata.mak icup=$(MAKEDIR)\..\..\.. cfg=debug" +# PROP Rebuild_Opt "" +# PROP Bsc_Name "" +# PROP Target_Dir "" + +!ENDIF + +# Begin Target + +# Name "makedata - Win32 Release" +# Name "makedata - Win32 Debug" + +!IF "$(CFG)" == "makedata - Win32 Release" + +!ELSEIF "$(CFG)" == "makedata - Win32 Debug" + +!ENDIF + +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# Begin Source File + +SOURCE=.\makedata.mak +# End Source File +# End Group +# End Target +# End Project diff --git a/icu4c/source/tools/makedata.dsw b/icu4c/source/tools/makedata.dsw new file mode 100644 index 0000000000..5205a3c8cc --- /dev/null +++ b/icu4c/source/tools/makedata.dsw @@ -0,0 +1,29 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "makedata"=.\makedata.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/icu4c/source/tools/makedata.mak b/icu4c/source/tools/makedata.mak index d6525a0680..9fef53a54c 100644 --- a/icu4c/source/tools/makedata.mak +++ b/icu4c/source/tools/makedata.mak @@ -15,6 +15,7 @@ CFG=Debug #Let's see if user has given us a path to ICU #This could be found according to the path to makefile, but for now it is this way +!MESSAGE ICUP=$(ICUP) !IF "$(ICUP)"=="" !ERROR Can't find path! !ELSE @@ -52,6 +53,8 @@ NULL= NULL=nul !ENDIF +PATH = $(PATH);$(ICUP)\icu\bin\$(CFG) + # Suffixes for data files .SUFFIXES : .ucm .cnv .dll .dat .col .res .txt .c @@ -131,7 +134,8 @@ $(CNV_FILES:.cnv =.cnv # nothing works without this target, but we're making # these files while creating converters -$(C_CNV_FILES) : +$(C_CNV_FILES) : $(CNV_FILES) + @$(ICUTOOLS)\genccode\$(CFG)\genccode $(CNV_FILES) # utility to send us to the right dir GODATA : @@ -169,12 +173,12 @@ CLEAN : @echo Generating converters and c source files @cd $(ICUDATA) @$(ICUTOOLS)\makeconv\$(CFG)\makeconv $< - @$(ICUTOOLS)\genccode\$(CFG)\genccode $(CNV_FILES) +# @$(ICUTOOLS)\genccode\$(CFG)\genccode $(CNV_FILES) # Inference rule for creating collation files - # this should be integrated in genrb .txt.col:: - @echo making Collation files + @echo Making Collation files @cd $(ICUDATA) $(ICUTOOLS)\genrb\$(CFG)\genrb $< @@ -187,16 +191,16 @@ $(CPP_FLAGS) $< # Targets for unames.dat unames.dat : UnicodeData-3.0.0.txt - $(ICUTOOLS)\gennames\$(CFG)\gennames -v- -c- $? + $(ICUTOOLS)\gennames\$(CFG)\gennames -v- -c- UnicodeData-3.0.0.txt -unames_dat.c : unames.dat +unames_dat.c : unames.dat $(ICUTOOLS)\genccode\$(CFG)\genccode $(ICUDATA)\$? # Targets for converters cnvalias.dat : convrtrs.txt $(ICUTOOLS)\gencnval\$(CFG)\gencnval -c- -cnvalias_dat.c : cnvalias.dat +cnvalias_dat.c : cnvalias.dat $(ICUTOOLS)\genccode\$(CFG)\genccode $(ICUDATA)\$? # Targets for tz @@ -205,3 +209,16 @@ tz.dat : {$(ICUTOOLS)\gentz}tz.txt tz_dat.c : tz.dat $(ICUTOOLS)\genccode\$(CFG)\genccode $(ICUDATA)\$? + +# Dependencies on the tools +UnicodeData-3.0.0.txt : {$(ICUTOOLS)\gennames\$(CFG)}gennames.exe + +convrtrs.txt : {$(ICUTOOLS)\gencnval\$(CFG)}gencnval.exe + +tz.txt : {$(ICUTOOLS)\gentz\$(CFG)}gentz.exe + +unames.dat cnvalias.dat tz.dat : {$(ICUTOOLS)\genccode\$(CFG)}genccode.exe + +$(GENRB_SOURCE) $(GENCOL_SOURCE) : {$(ICUTOOLS)\genrb\$(CFG)}genrb.exe + +$(UCM_SOURCE) : {$(ICUTOOLS)\makeconv\$(CFG)}makeconv.exe {$(ICUTOOLS)\genccode\$(CFG)}genccode.exe