ICU-57166.0.1.tar.gz

[apple/icu.git] / icuSources / extra / uconv / makedata.mak

diff --git a/icuSources/extra/uconv/makedata.mak b/icuSources/extra/uconv/makedata.mak
index 159553c6a50b1ef20e8ca3a50ac715e102cc5fcd..09bd13e14cc2850165013e8ab0e6fe7e763a91ae 100644 (file)
--- a/icuSources/extra/uconv/makedata.mak
+++ b/icuSources/extra/uconv/makedata.mak
@@ -1,5 +1,5 @@
 #**********************************************************************
 #**********************************************************************

-#* Copyright (C) 1999-2000, 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
 #* and others.  All Rights Reserved.
 #**********************************************************************
 # nmake file for creating data files on win32


@@ -15,7 +15,7 @@ CFG=Debug
 !ENDIF
 
 #Here we test if a valid configuration is given
 !ENDIF
 
 #Here we test if a valid configuration is given

-!IF "$(CFG)" != "Release" && "$(CFG)" != "release" && "$(CFG)" != "Debug" && "$(CFG)" != "debug"
+!IF "$(CFG)" != "Release" && "$(CFG)" != "release" && "$(CFG)" != "Debug" && "$(CFG)" != "debug" && "$(CFG)" != "x86\Release" && "$(CFG)" != "x86\Debug" && "$(CFG)" != "x64\Release" && "$(CFG)" != "x64\Debug"

 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:


@@ -37,7 +37,7 @@ CFG=Debug
 !ENDIF
 !MESSAGE ICU path is $(ICUP)
 RESNAME=uconvmsg
 !ENDIF
 !MESSAGE ICU path is $(ICUP)
 RESNAME=uconvmsg

-RESDIR=.  #$(ICUP)\..\icuapps\uconv\$(RESNAME)
+RESDIR=resources

 RESFILES=resfiles.mk
 ICUDATA=$(ICUP)\data
 
 RESFILES=resfiles.mk
 ICUDATA=$(ICUP)\data
 


@@ -45,39 +45,31 @@ DLL_OUTPUT=.\$(CFG)
 # set the following to 'static' or 'dll' depending
 PKGMODE=static
 
 # set the following to 'static' or 'dll' depending
 PKGMODE=static
 

-

 ICD=$(ICUDATA)^\
 DATA_PATH=$(ICUP)\data^\
 ICD=$(ICUDATA)^\
 DATA_PATH=$(ICUP)\data^\

-ICUTOOLS=$(ICUP)\bin
-
-# We have to prepare params for pkgdata - to help it find the tools
-!IF "$(CFG)" == "Debug" || "$(CFG)" == "debug"
-PKGOPT=D:$(ICUP)
-!ELSE
-PKGOPT=R:$(ICUP)
-!ENDIF

 
 

-# This appears in original Microsofts makefiles
-!IF "$(OS)" == "Windows_NT"
-NULL=
+!IF "$(CFG)" == "x64\Release" || "$(CFG)" == "x64\Debug"
+ICUTOOLS=$(ICUP)\bin64
+PATH = $(ICUP)\bin64;$(PATH)

 !ELSE
 !ELSE

-NULL=nul
+ICUTOOLS=$(ICUP)\bin
+PATH = $(ICUP)\bin;$(PATH)

 !ENDIF
 
 !ENDIF
 

-PATH = $(PATH);$(ICUP)\bin
-

 # Suffixes for data files
 .SUFFIXES : .ucm .cnv .dll .dat .res .txt .c
 
 # We're including a list of resource files.
 # Suffixes for data files
 .SUFFIXES : .ucm .cnv .dll .dat .res .txt .c
 
 # We're including a list of resource files.

-FILESEPCHAR=\\
+FILESEPCHAR=

 
 !IF EXISTS("$(RESFILES)")
 !INCLUDE "$(RESFILES)"
 !ELSE
 !ERROR ERROR: cannot find "$(RESFILES)"
 !ENDIF
 
 !IF EXISTS("$(RESFILES)")
 !INCLUDE "$(RESFILES)"
 !ELSE
 !ERROR ERROR: cannot find "$(RESFILES)"
 !ENDIF

-RB_FILES = $(RESSRC:.txt=.res)
+RES_FILES = $(RESSRC:.txt=.res)
+RB_FILES = resources\$(RES_FILES:.res =.res resources\)
+RESOURCESDIR=

 
 # This target should build all the data files
 !IF "$(PKGMODE)" == "dll"
 
 # This target should build all the data files
 !IF "$(PKGMODE)" == "dll"


@@ -86,41 +78,29 @@ OUTPUT = "$(DLL_OUTPUT)\$(RESNAME).dll"
 OUTPUT = "$(DLL_OUTPUT)\$(RESNAME).lib"
 !ENDIF
 
 OUTPUT = "$(DLL_OUTPUT)\$(RESNAME).lib"
 !ENDIF
 

-ALL : GODATA  $(OUTPUT) GOBACK #$(RESNAME).dat
+ALL : $(OUTPUT)

        @echo All targets are up to date (mode $(PKGMODE))
 
 
 # invoke pkgdata - static
        @echo All targets are up to date (mode $(PKGMODE))
 
 
 # invoke pkgdata - static

-"$(DLL_OUTPUT)\$(RESNAME).lib" :  $(RB_FILES) $(RESFILES)
+"$(DLL_OUTPUT)\$(RESNAME).lib" : $(RB_FILES) $(RESFILES)

        @echo Building $(RESNAME).lib
        @echo Building $(RESNAME).lib

-       @"$(ICUTOOLS)\pkgdata" -f -v -m static -c -p $(RESNAME) -O "$(PKGOPT)" -d "$(DLL_OUTPUT)" -s "$(RESDIR)" <<pkgdatain.txt
-$(RB_FILES:.res =.res
+       @"$(ICUTOOLS)\pkgdata" -f -v -m static -c -p $(RESNAME) -d "$(DLL_OUTPUT)" -s "$(RESDIR)" <<pkgdatain.txt
+$(RES_FILES:.res =.res

 )
 <<KEEP
 
 )
 <<KEEP
 

-# utility to send us to the right dir
-GODATA :
-#      cd "$(RESDIR)"
-
-# utility to get us back to the right dir
-GOBACK :
-#      cd "$(RESDIR)\.."
-

 # This is to remove all the data files
 CLEAN :
 # This is to remove all the data files
 CLEAN :

-       @cd "$(RESDIR)"
-       -@erase "*.res"
-       -@erase "uconvmsg*.*"
-       -@erase "*.obj"
-       -@erase "base*.*"
-       @cd "$(ICUTOOLS)"

     -@erase "$(RB_FILES)"
     -@erase "$(RB_FILES)"

-    -@"$(ICUTOOLS)\pkgdata" -f --clean -v -m static -c -p $(RESNAME) -O "$(PKGOPT)" -d "$(DLL_OUTPUT)" -s "$(RESDIR)" pkgdatain.txt
+       -@erase "$(CFG)\*uconvmsg*.*"
+    -@"$(ICUTOOLS)\pkgdata" -f --clean -v -m static -c -p $(RESNAME) -d "$(DLL_OUTPUT)" -s "$(RESDIR)" pkgdatain.txt

 
 # Inference rule for creating resource bundles
 
 # Inference rule for creating resource bundles

-.txt.res:
+{$(RESDIR)}.txt{$(RESDIR)}.res:

        @echo Making Resource Bundle files
        @echo Making Resource Bundle files

-        "$(ICUTOOLS)\genrb" -t -p $(RESNAME) -s $(@D) -d $(@D) $(?F)
+       "$(ICUTOOLS)\genrb" -s $(@D) -d $(@D) $(?F)

 
 
 $(RESSRC) : {"$(ICUTOOLS)"}genrb.exe
 
 
 $(RESSRC) : {"$(ICUTOOLS)"}genrb.exe

+