From da15efacf05c02c04132b4324173d88fc4d80cf4 Mon Sep 17 00:00:00 2001
From: Jeff Genovy <29107334+jefgen@users.noreply.github.com>
Date: Thu, 24 May 2018 05:54:49 +0000
Subject: [PATCH] ICU-13785 Adding dependency information to uconv project to
 prevent "NMAKE : fatal error U1077" on Win/VS builds.

X-SVN-Rev: 41452
---
 icu4c/source/allinone/allinone.sln    |  2 +-
 icu4c/source/extra/uconv/makedata.mak | 27 ++++++++++++++++++---------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/icu4c/source/allinone/allinone.sln b/icu4c/source/allinone/allinone.sln
index 62458727b5e..b2b133053b3 100644
--- a/icu4c/source/allinone/allinone.sln
+++ b/icu4c/source/allinone/allinone.sln
@@ -116,9 +116,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toolutil", "..\tools\toolut
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uconv", "..\extra\uconv\uconv.vcxproj", "{DBA4088D-F6F9-4F8F-8820-082A4765C16C}"
 	ProjectSection(ProjectDependencies) = postProject
+		{97521D06-EC47-45D4-8BD0-9E16B3F93B2A} = {97521D06-EC47-45D4-8BD0-9E16B3F93B2A}
 		{0178B127-6269-407D-B112-93877BB62776} = {0178B127-6269-407D-B112-93877BB62776}
 		{73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D} = {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}
-		{D3065ADB-8820-4CC7-9B6C-9510833961A3} = {D3065ADB-8820-4CC7-9B6C-9510833961A3}
 		{4C8454FE-81D3-4CA3-9927-29BA96F03DAC} = {4C8454FE-81D3-4CA3-9927-29BA96F03DAC}
 	EndProjectSection
 EndProject
diff --git a/icu4c/source/extra/uconv/makedata.mak b/icu4c/source/extra/uconv/makedata.mak
index 52d7c493068..2cc07d61096 100644
--- a/icu4c/source/extra/uconv/makedata.mak
+++ b/icu4c/source/extra/uconv/makedata.mak
@@ -8,7 +8,7 @@
 # invoke with
 # nmake /f makedata.mak icup=<path_to_icu_instalation> [Debug|Release]
 #
-#	12/10/1999	weiv	Created
+#   12/10/1999  weiv    Created
 
 #If no config, we default to debug
 !IF "$(CFG)" == ""
@@ -38,6 +38,7 @@ CFG=Debug
 !ERROR Can't find path!
 !ENDIF
 !MESSAGE ICU path is $(ICUP)
+
 RESNAME=uconvmsg
 RESDIR=resources
 RESFILES=resfiles.mk
@@ -58,6 +59,16 @@ ICUTOOLS=$(ICUP)\bin
 PATH = $(ICUP)\bin;$(PATH)
 !ENDIF
 
+# Make sure the necessary tools exist before continuing. (This is to prevent cryptic errors from NMAKE).
+!IF !EXISTS($(ICUTOOLS)\pkgdata.exe)
+!MESSAGE Unable to find "$(ICUTOOLS)\pkgdata.exe"
+!ERROR The tool 'pkgdata.exe' does not exist! (Have you built all of ICU yet?).
+!ENDIF
+!IF !EXISTS($(ICUTOOLS)\genrb.exe)
+!MESSAGE Unable to find "$(ICUTOOLS)\genrb.exe"
+!ERROR The tool 'genrb.exe' does not exist! (Have you built all of ICU yet?).
+!ENDIF
+
 # Suffixes for data files
 .SUFFIXES : .ucm .cnv .dll .dat .res .txt .c
 
@@ -81,13 +92,13 @@ OUTPUT = "$(DLL_OUTPUT)\$(RESNAME).lib"
 !ENDIF
 
 ALL : $(OUTPUT)
-	@echo All targets are up to date (mode $(PKGMODE))
+    @echo All targets are up to date (mode $(PKGMODE))
 
 
 # invoke pkgdata - static
 "$(DLL_OUTPUT)\$(RESNAME).lib" : $(RB_FILES) $(RESFILES)
-	@echo Building $(RESNAME).lib
-	@"$(ICUTOOLS)\pkgdata" -f -v -m static -c -p $(RESNAME) -d "$(DLL_OUTPUT)" -s "$(RESDIR)" <<pkgdatain.txt
+    @echo Building $(RESNAME).lib
+    @"$(ICUTOOLS)\pkgdata" -f -v -m static -c -p $(RESNAME) -d "$(DLL_OUTPUT)" -s "$(RESDIR)" <<pkgdatain.txt
 $(RES_FILES:.res =.res
 )
 <<KEEP
@@ -95,14 +106,12 @@ $(RES_FILES:.res =.res
 # This is to remove all the data files
 CLEAN :
     -@erase "$(RB_FILES)"
-	-@erase "$(CFG)\*uconvmsg*.*"
+    -@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
 {$(RESDIR)}.txt{$(RESDIR)}.res:
-	@echo Making Resource Bundle files
-	"$(ICUTOOLS)\genrb" -s $(@D) -d $(@D) $(?F)
-
+    @echo Making Resource Bundle files
+    "$(ICUTOOLS)\genrb" -s $(@D) -d $(@D) $(?F)
 
 $(RESSRC) : {"$(ICUTOOLS)"}genrb.exe
-