From d2f648798cb9c4931c62c117974b580dadbeb354 Mon Sep 17 00:00:00 2001
From: Andy Heninger <andy.heninger@gmail.com>
Date: Fri, 17 Aug 2001 01:56:49 +0000
Subject: [PATCH] ICU-1075 Windows stubdata / data dependency problem

X-SVN-Rev: 5502
---
 icu4c/source/data/build/makedata.mak |  2 +-
 icu4c/source/data/makedata.mak       |  2 +-
 icu4c/source/stubdata/stubdata.dsp   | 20 +++++++++++++++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/icu4c/source/data/build/makedata.mak b/icu4c/source/data/build/makedata.mak
index 66d42943df8..bdfcfa3e08a 100644
--- a/icu4c/source/data/build/makedata.mak
+++ b/icu4c/source/data/build/makedata.mak
@@ -148,7 +148,7 @@ BRK_FILES = "$(ICUDBLD)\sent.brk" "$(ICUDBLD)\char.brk" "$(ICUDBLD)\line.brk" "$
 #  pkgdata will drop all output files (.dat, .dll, .lib) into the target (ICUDBLD) directory.
 #  move the .dll and .lib files to their final destination afterwards.
 #
-"$(ICUDBLD)\$(U_ICUDATA_NAME).dll" :  $(CNV_FILES) $(BRK_FILES) uprops.dat unames.dat unorm.dat cnvalias.dat tz.dat ucadata.dat invuca.dat $(ALL_RES) icudata.res
+"$(ICUDBLD)\$(U_ICUDATA_NAME).dll" :  $(CNV_FILES) $(BRK_FILES) uprops.dat unames.dat unorm.dat cnvalias.dat tz.dat ucadata.dat invuca.dat $(ALL_RES) 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 . <<pkgdatain.txt
diff --git a/icu4c/source/data/makedata.mak b/icu4c/source/data/makedata.mak
index 66d42943df8..bdfcfa3e08a 100644
--- a/icu4c/source/data/makedata.mak
+++ b/icu4c/source/data/makedata.mak
@@ -148,7 +148,7 @@ BRK_FILES = "$(ICUDBLD)\sent.brk" "$(ICUDBLD)\char.brk" "$(ICUDBLD)\line.brk" "$
 #  pkgdata will drop all output files (.dat, .dll, .lib) into the target (ICUDBLD) directory.
 #  move the .dll and .lib files to their final destination afterwards.
 #
-"$(ICUDBLD)\$(U_ICUDATA_NAME).dll" :  $(CNV_FILES) $(BRK_FILES) uprops.dat unames.dat unorm.dat cnvalias.dat tz.dat ucadata.dat invuca.dat $(ALL_RES) icudata.res
+"$(ICUDBLD)\$(U_ICUDATA_NAME).dll" :  $(CNV_FILES) $(BRK_FILES) uprops.dat unames.dat unorm.dat cnvalias.dat tz.dat ucadata.dat invuca.dat $(ALL_RES) 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 . <<pkgdatain.txt
diff --git a/icu4c/source/stubdata/stubdata.dsp b/icu4c/source/stubdata/stubdata.dsp
index 96185b5c84f..7443ac4682f 100644
--- a/icu4c/source/stubdata/stubdata.dsp
+++ b/icu4c/source/stubdata/stubdata.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "STUBDATA_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /G6 /MD /Ze /W3 /GX /O2 /I "..\common" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "STUBDATA_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /G6 /MD /W3 /GX /O2 /I "..\common" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "STUBDATA_EXPORTS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -55,6 +55,15 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
 # ADD LINK32 kernel32.lib user32.lib /nologo /dll /machine:I386 /out:"..\..\bin\icudt19.dll" /implib:"..\..\lib\icudata.lib"
 # SUBTRACT LINK32 /pdb:none
+# Begin Custom Build
+ProjDir=.
+InputPath=\icu\bin\icudt19.dll
+SOURCE="$(InputPath)"
+
+"$(ProjDir)/stubdatabuilt.txt" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." > $(ProjDir)/stubdatabuilt.txt
+
+# End Custom Build
 
 !ELSEIF  "$(CFG)" == "stubdata - Win32 Debug"
 
@@ -82,6 +91,15 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 kernel32.lib user32.lib /nologo /dll /machine:I386 /out:"..\..\bin\icudt19.dll" /implib:"..\..\lib\icudata.lib" /pdbtype:sept
 # SUBTRACT LINK32 /pdb:none
+# Begin Custom Build
+ProjDir=.
+InputPath=\icu\bin\icudt19.dll
+SOURCE="$(InputPath)"
+
+"$(ProjDir)/stubdatabuilt.txt" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." > $(ProjDir)/stubdatabuilt.txt
+
+# End Custom Build
 
 !ENDIF