AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jeff Genovy 2020-05-11 13:49:27 -07:00
parent 3ff6627ce6
commit 723037953b
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
icu4c/source/data/makedata.mak
View File

@ -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)

3
icu4c/source/data/makedata.vcxproj
View File

@ -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/>

6
icu4c/source/python/icutools/databuilder/renderers/common_exec.py
View File

@ -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