epics/ci-scripts
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

appveyor: use VV to set logging level and silence dependency builds

Browse Source
This commit is contained in:
Ralph Lange
2020-04-02 12:01:26 +02:00
parent e5af5c2bfe
commit ddf6b961b1
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@@ -61,6 +61,7 @@ environment:
SETUP_PATH: .:.ci SETUP_PATH: .:.ci
SET: test01 SET: test01
BASE: 3.15 BASE: 3.15
VV: 1
matrix: matrix:
- CC: vs2019 - CC: vs2019
@@ -68,6 +69,7 @@ environment:
SET: test00 SET: test00
- CC: mingw - CC: mingw
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
VV: 0
- CC: vs2019 - CC: vs2019
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
- CC: vs2017 - CC: vs2017

9
appveyor/do.py
View File

@@ -12,7 +12,6 @@ import subprocess as sp
import distutils.util import distutils.util
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
logging.basicConfig(level=logging.DEBUG)
# Setup ANSI Colors # Setup ANSI Colors
ANSI_RED = "\033[31;1m" ANSI_RED = "\033[31;1m"
@@ -53,6 +52,7 @@ def modlist():
zip7 = r'C:\Program Files\7-Zip\7z' zip7 = r'C:\Program Files\7-Zip\7z'
make = '' make = ''
isbase314 = False isbase314 = False
silent_dep_builds = True
def host_info(): def host_info():
print('{0}Python setup{1}'.format(ANSI_CYAN, ANSI_RESET)) print('{0}Python setup{1}'.format(ANSI_CYAN, ANSI_RESET))
@@ -474,7 +474,7 @@ def prepare(args):
for mod in modlist(): for mod in modlist():
place = places[setup[mod+"_VARNAME"]] place = places[setup[mod+"_VARNAME"]]
print('{0}Building dependency {1} in {2}{3}'.format(ANSI_YELLOW, mod, place, ANSI_RESET)) print('{0}Building dependency {1} in {2}{3}'.format(ANSI_YELLOW, mod, place, ANSI_RESET))
call_make(cwd=place) #TBD: default should be silent call_make(cwd=place, silent=silent_dep_builds)
print('{0}Dependency module information{1}'.format(ANSI_CYAN, ANSI_RESET)) print('{0}Dependency module information{1}'.format(ANSI_CYAN, ANSI_RESET))
print('Module Tag Binaries Commit') print('Module Tag Binaries Commit')
@@ -580,7 +580,12 @@ def getargs():
return P return P
def main(raw): def main(raw):
global silent_dep_builds
args = getargs().parse_args(raw) args = getargs().parse_args(raw)
if 'VV' in os.environ and os.environ['VV'] == '1':
logging.basicConfig(level=logging.DEBUG)
silent_dep_builds = False
if args.vcvars and os.environ['CC'].startswith('vs'): if args.vcvars and os.environ['CC'].startswith('vs'):
# re-exec with MSVC in PATH # re-exec with MSVC in PATH
with_vcvars(' '.join(['--no-vcvars']+raw)) with_vcvars(' '.join(['--no-vcvars']+raw))