From: Jeff Genovy <29107334+jefgen@users.noreply.github.com>
Date: Mon, 11 May 2020 20:49:27 +0000 (-0700)
Subject: ICU-21119 Enable verbose output from ICU data build when building DEBUG on Windows
X-Git-Tag: cldr/2020-09-22~190
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=723037953b3e3f61c8b72db97aa7765a9d3f6eee;p=icu

ICU-21119 Enable verbose output from ICU data build when building DEBUG on Windows
---

diff --git a/icu4c/source/data/makedata.mak b/icu4c/source/data/makedata.mak
index 0c8c52635e2..dbe21bd6a1c 100644
--- a/icu4c/source/data/makedata.mak
+++ b/icu4c/source/data/makedata.mak
@@ -248,6 +248,13 @@ ALL : GODATA "$(ICU_LIB_TARGET)" "$(TESTDATAOUT)\testdata.dat" $(ARM_CROSSBUILD_
 
 !ENDIF
 
+# Verbose output when building the data for Debug builds.
+!IF "$(DEBUG)" == "true"
+ICU_DATA_BUILD_VERBOSE=--verbose
+!ELSE
+ICU_DATA_BUILD_VERBOSE=
+!ENDIF
+
 # Three main targets: tools, core data, and test data.
 # Keep track of whether they are built via timestamp files.
 
@@ -277,6 +284,7 @@ $(COREDATA_TS):
 		--out_dir "$(ICUBLD_PKG)" \
 		--tmp_dir "$(ICUTMP)" \
 		--filter_file "$(ICU_DATA_FILTER_FILE)" \
+		$(ICU_DATA_BUILD_VERBOSE) \
 		$(ICU_DATA_BUILDTOOL_OPTS)
 	@echo "timestamp" > $(COREDATA_TS)
 
diff --git a/icu4c/source/data/makedata.vcxproj b/icu4c/source/data/makedata.vcxproj
index 71ccafbc280..f92c2f9e561 100644
--- a/icu4c/source/data/makedata.vcxproj
+++ b/icu4c/source/data/makedata.vcxproj
@@ -22,11 +22,12 @@
     <OutDir>.\data\tmp\$(Platform)\</OutDir>
     <IntDir>.\data\build\</IntDir>
     <MakeCFG>$(Platform)\$(Configuration)</MakeCFG>
+    <DebugBuild Condition="'$(Configuration)'=='Debug'">true</DebugBuild>
     <!-- The ICU projects use "Win32" to mean "x86", so we need to special case it. -->
     <OutDir Condition="'$(Platform)'=='Win32'">.\data\tmp\x86\</OutDir>
     <MakeCFG Condition="'$(Platform)'=='Win32'">x86\$(Configuration)</MakeCFG>
     <!-- NMake -->
-    <NMakeBuildCommandLine>NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=$(MakeCFG)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=$(MakeCFG) DEBUG=$(DebugBuild)</NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=$(MakeCFG) clean all</NMakeReBuildCommandLine>
     <NMakeCleanCommandLine>NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=$(MakeCFG) clean</NMakeCleanCommandLine>
     <NMakeOutput/>
diff --git a/icu4c/source/python/icutools/databuilder/renderers/common_exec.py b/icu4c/source/python/icutools/databuilder/renderers/common_exec.py
index 3623441555d..91c12fdcf62 100644
--- a/icu4c/source/python/icutools/databuilder/renderers/common_exec.py
+++ b/icu4c/source/python/icutools/databuilder/renderers/common_exec.py
@@ -1,6 +1,10 @@
 # Copyright (C) 2018 and later: Unicode, Inc. and others.
 # License & terms of use: http://www.unicode.org/copyright.html
 
+# Python 2/3 Compatibility (ICU-20299)
+# TODO(ICU-20301): Remove this.
+from __future__ import print_function
+
 from . import *
 from .. import *
 from .. import utils
@@ -146,4 +150,6 @@ def run_shell_command(command_line, platform, verbose):
             )
     if changed_windows_comspec:
         os.environ["COMSPEC"] = previous_comspec
+    if returncode != 0:
+        print("Command failed: %s" % command_line, file=sys.stderr)
     return returncode