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

cue: make detect_context() a function and ci a dict

Browse Source 
for better testability
This commit is contained in:
Ralph Lange
2020-06-02 19:36:27 +02:00
parent f456e47904
commit 9ea849eed3
2 changed files with 125 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
cue-test.py
View File

@@ -17,6 +17,20 @@ from argparse import Namespace
builddir = os.getcwd() builddir = os.getcwd()
# Detect basic context (service, os)
if 'TRAVIS' in os.environ:
ci_service = 'travis'
ci_os = os.environ['TRAVIS_OS_NAME']
if 'APPVEYOR' in os.environ:
ci_service = 'appveyor'
if re.match(r'^Visual', os.environ['APPVEYOR_BUILD_WORKER_IMAGE']):
ci_os = 'windows'
elif re.match(r'^Ubuntu', os.environ['APPVEYOR_BUILD_WORKER_IMAGE']):
ci_os = 'linux'
elif re.match(r'^macOS', os.environ['APPVEYOR_BUILD_WORKER_IMAGE']):
ci_os = 'osx'
def find_in_file(regex, filename): def find_in_file(regex, filename):
file = open(filename, "r") file = open(filename, "r")
@@ -232,10 +246,11 @@ class TestAddDependencyOptions(unittest.TestCase):
testfile = os.path.join(location, '.ci', 'LICENSE') testfile = os.path.join(location, '.ci', 'LICENSE')
def setUp(self): def setUp(self):
os.environ['SETUP_PATH'] = '.:appveyor' os.environ['SETUP_PATH'] = '.'
if os.path.exists(cue.cachedir): if os.path.exists(cue.cachedir):
shutil.rmtree(cue.cachedir, onerror=cue.remove_readonly) shutil.rmtree(cue.cachedir, onerror=cue.remove_readonly)
cue.clear_lists() cue.clear_lists()
cue.detect_context()
cue.source_set('defaults') cue.source_set('defaults')
cue.complete_setup('MCoreUtils') cue.complete_setup('MCoreUtils')
cue.setup['MCoreUtils'] = 'master' cue.setup['MCoreUtils'] = 'master'
@@ -318,6 +333,7 @@ class TestSetupForBuild(unittest.TestCase):
def setUp(self): def setUp(self):
os.environ.pop('EPICS_HOST_ARCH', None) os.environ.pop('EPICS_HOST_ARCH', None)
cue.clear_lists() cue.clear_lists()
cue.detect_context()
def tearDown(self): def tearDown(self):
os.environ.pop('EPICS_HOST_ARCH', None) os.environ.pop('EPICS_HOST_ARCH', None)
@@ -331,7 +347,7 @@ class TestSetupForBuild(unittest.TestCase):
self.assertTrue(re.search('/foobar', os.environ['PATH']), 'Plain path not in PATH') self.assertTrue(re.search('/foobar', os.environ['PATH']), 'Plain path not in PATH')
os.environ.pop('FOOBAR', None) os.environ.pop('FOOBAR', None)
@unittest.skipIf(cue.ci_os != 'windows', 'HostArchConfiguration test only applies to windows') @unittest.skipIf(ci_os != 'windows', 'HostArchConfiguration test only applies to windows')
def test_HostArchConfiguration(self): def test_HostArchConfiguration(self):
cue.ci['compiler'] = 'vs2017' cue.ci['compiler'] = 'vs2017'
for cue.ci['debug'] in [True, False]: for cue.ci['debug'] in [True, False]:
@@ -360,7 +376,7 @@ class TestSetupForBuild(unittest.TestCase):
self.assertFalse(re.search('debug', os.environ['EPICS_HOST_ARCH']), self.assertFalse(re.search('debug', os.environ['EPICS_HOST_ARCH']),
'EPICS_HOST_ARCH is -debug for Configuration={0}'.format(config)) 'EPICS_HOST_ARCH is -debug for Configuration={0}'.format(config))
@unittest.skipIf(cue.ci_os != 'windows', 'HostArchPlatform test only applies to windows') @unittest.skipIf(ci_os != 'windows', 'HostArchPlatform test only applies to windows')
def test_HostArchPlatform(self): def test_HostArchPlatform(self):
if ci_service == 'travis': if ci_service == 'travis':
platforms = ['x64'] platforms = ['x64']
@@ -391,7 +407,7 @@ class TestSetupForBuild(unittest.TestCase):
'Binary location for {0} not in PATH (found {1})' 'Binary location for {0} not in PATH (found {1})'
.format(pattern[platform], os.environ['PATH'])) .format(pattern[platform], os.environ['PATH']))
@unittest.skipIf(cue.ci_os != 'windows', 'Strawberry perl test only applies to windows') @unittest.skipIf(ci_os != 'windows', 'Strawberry perl test only applies to windows')
def test_StrawberryInPathVS2019(self): def test_StrawberryInPathVS2019(self):
if 'APPVEYOR' in os.environ: if 'APPVEYOR' in os.environ:
os.environ['CMP'] = 'vs2019' os.environ['CMP'] = 'vs2019'
@@ -448,6 +464,7 @@ if __name__ == "__main__":
logging.basicConfig(level=logging.DEBUG) logging.basicConfig(level=logging.DEBUG)
cue.silent_dep_builds = False cue.silent_dep_builds = False
cue.detect_context()
cue.host_info() cue.host_info()
if sys.argv[1:] == ['env']: if sys.argv[1:] == ['env']:
# testing with_vcvars # testing with_vcvars

200
cue.py
View File

@@ -13,77 +13,95 @@ import distutils.util
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
# Detect the service and set up environment accordingly
ci_service = '<none>' # Detect the service and set up context hash accordingly
ci_os = '<unknown>' def detect_context():
ci_platform = '<unknown>' if 'TRAVIS' in os.environ:
ci_compiler = '<unknown>' ci['service'] = 'travis'
ci_static = False ci['os'] = os.environ['TRAVIS_OS_NAME']
ci_debug = False ci['platform'] = 'x64'
ci_choco = ['make'] ci['compiler'] = os.environ['TRAVIS_COMPILER']
if ci['os'] == 'windows':
ci['choco'].append('strawberryperl')
if re.match(r'^vs', ci['compiler']):
# Only Visual Studio 2017 available
ci['compiler'] = 'vs2017'
if 'BCFG' in os.environ:
if re.search('static', os.environ['BCFG']):
ci['static'] = True
if re.search('debug', os.environ['BCFG']):
ci['debug'] = True
if 'TRAVIS' in os.environ: if 'APPVEYOR' in os.environ:
ci_service = 'travis' ci['service'] = 'appveyor'
ci_os = os.environ['TRAVIS_OS_NAME'] if re.match(r'^Visual', os.environ['APPVEYOR_BUILD_WORKER_IMAGE']):
ci_platform = 'x64' ci['os'] = 'windows'
ci_compiler = os.environ['TRAVIS_COMPILER'] elif re.match(r'^Ubuntu', os.environ['APPVEYOR_BUILD_WORKER_IMAGE']):
if ci_os == 'windows': ci['os'] = 'linux'
ci_choco.append('strawberryperl') elif re.match(r'^macOS', os.environ['APPVEYOR_BUILD_WORKER_IMAGE']):
if re.match(r'^vs', ci_compiler): ci['os'] = 'osx'
# Only Visual Studio 2017 available ci['platform'] = os.environ['PLATFORM'].lower()
ci_compiler = 'vs2017' if 'CMP' in os.environ:
if 'BCFG' in os.environ: ci['compiler'] = os.environ['CMP']
if re.search('static', os.environ['BCFG']): if re.search('static', os.environ['CONFIGURATION']):
ci_static = True ci['static'] = True
if re.search('debug', os.environ['BCFG']): if re.search('debug', os.environ['CONFIGURATION']):
ci_debug = True ci['debug'] = True
if 'APPVEYOR' in os.environ: if ci['static']:
ci_service = 'appveyor' ci['configuration'] = 'static'
if re.match(r'^Visual', os.environ['APPVEYOR_BUILD_WORKER_IMAGE']): else:
ci_os = 'windows' ci['configuration'] = 'shared'
elif re.match(r'^Ubuntu', os.environ['APPVEYOR_BUILD_WORKER_IMAGE']): if ci['debug']:
ci_os = 'linux' ci['configuration'] += '-debug'
elif re.match(r'^macOS', os.environ['APPVEYOR_BUILD_WORKER_IMAGE']): else:
ci_os = 'osx' ci['configuration'] += '-optimized'
ci_platform = os.environ['PLATFORM'].lower()
if 'CMP' in os.environ:
ci_compiler = os.environ['CMP']
if re.search('static', os.environ['CONFIGURATION']):
ci_static = True
if re.search('debug', os.environ['CONFIGURATION']):
ci_debug = True
if ci_static: ci['scriptsdir'] = os.path.abspath(os.path.dirname(sys.argv[0]))
ci_configuration = 'static'
else: if 'CHOCO' in os.environ:
ci_configuration = 'shared' ci['choco'].extend(os.environ['CHOCO'].split())
if ci_debug:
ci_configuration += '-debug' logger.debug('Detected a build hosted on %s, using %s on %s (%s) configured as %s',
else: ci['service'], ci['compiler'], ci['os'], ci['platform'], ci['configuration'])
ci_configuration += '-optimized'
logger.debug('Detected a build hosted on %s, using %s on %s (%s) configured as %s',
ci_service, ci_compiler, ci_os, ci_platform, ci_configuration)
curdir = os.getcwd() curdir = os.getcwd()
ci_scriptsdir = os.path.abspath(os.path.dirname(sys.argv[0]))
ci = {}
seen_setups = [] seen_setups = []
modules_to_compile = [] modules_to_compile = []
setup = {} setup = {}
places = {} places = {}
def clear_lists():
global isbase314, has_test_results, ci
del seen_setups[:]
del modules_to_compile[:]
setup.clear()
places.clear()
isbase314 = False
has_test_results = False
ci['service'] = '<none>'
ci['os'] = '<unknown>'
ci['platform'] = '<unknown>'
ci['compiler'] = '<unknown>'
ci['static'] = False
ci['debug'] = False
ci['configuration'] = '<unknown>'
ci['scriptsdir'] = ''
ci['choco'] = ['make']
clear_lists()
if 'BASE' in os.environ and os.environ['BASE'] == 'SELF': if 'BASE' in os.environ and os.environ['BASE'] == 'SELF':
building_base = True building_base = True
places['EPICS_BASE'] = curdir places['EPICS_BASE'] = curdir
else: else:
building_base = False building_base = False
if 'CHOCO' in os.environ:
ci_choco.extend(os.environ['CHOCO'].split())
# Setup ANSI Colors # Setup ANSI Colors
ANSI_RED = "\033[31;1m" ANSI_RED = "\033[31;1m"
ANSI_GREEN = "\033[32;1m" ANSI_GREEN = "\033[32;1m"
@@ -99,7 +117,7 @@ ANSI_CLEAR = "\033[0K"
# from https://github.com/travis-ci/travis-rubies/blob/build/build.sh # from https://github.com/travis-ci/travis-rubies/blob/build/build.sh
def fold_start(tag, title): def fold_start(tag, title):
if ci_service == 'travis': if ci['service'] == 'travis':
print('travis_fold:start:{0}{1}{2}{3}' print('travis_fold:start:{0}{1}{2}{3}'
.format(tag, ANSI_YELLOW, title, ANSI_RESET)) .format(tag, ANSI_YELLOW, title, ANSI_RESET))
elif ci['service'] == 'appveyor': elif ci['service'] == 'appveyor':
@@ -109,10 +127,10 @@ def fold_start(tag, title):
def fold_end(tag, title): def fold_end(tag, title):
if ci_service == 'travis': if ci['service'] == 'travis':
print('\ntravis_fold:end:{0}\r' print('\ntravis_fold:end:{0}\r'
.format(tag), end='') .format(tag), end='')
elif ci_service == 'appveyor': elif ci['service'] == 'appveyor':
print('{0}----- /\\ /\\ /\\ ----- END: {1} -----{2}' print('{0}----- /\\ /\\ /\\ ----- END: {1} -----{2}'
.format(ANSI_YELLOW, title, ANSI_RESET)) .format(ANSI_YELLOW, title, ANSI_RESET))
sys.stdout.flush() sys.stdout.flush()
@@ -170,7 +188,7 @@ silent_dep_builds = True
def host_info(): def host_info():
print('{0}Build using {1} compiler on {2} ({3}) hosted by {4}{5}' print('{0}Build using {1} compiler on {2} ({3}) hosted by {4}{5}'
.format(ANSI_CYAN, ci_compiler, ci_os, ci_platform, ci_service, ANSI_RESET)) .format(ANSI_CYAN, ci['compiler'], ci['os'], ci['platform'], ci['service'], ANSI_RESET))
print('{0}Python setup{1}'.format(ANSI_CYAN, ANSI_RESET)) print('{0}Python setup{1}'.format(ANSI_CYAN, ANSI_RESET))
print(sys.version) print(sys.version)
@@ -179,7 +197,7 @@ def host_info():
print(' ', dname) print(' ', dname)
print('platform =', distutils.util.get_platform()) print('platform =', distutils.util.get_platform())
if ci_os == 'windows': if ci['os'] == 'windows':
print('{0}Available Visual Studio versions{1}'.format(ANSI_CYAN, ANSI_RESET)) print('{0}Available Visual Studio versions{1}'.format(ANSI_CYAN, ANSI_RESET))
for comp in vcvars_found: for comp in vcvars_found:
print(comp, 'in', vcvars_found[comp]) print(comp, 'in', vcvars_found[comp])
@@ -187,17 +205,6 @@ def host_info():
sys.stdout.flush() sys.stdout.flush()
# Used from unittests
def clear_lists():
global isbase314, has_test_results
del seen_setups[:]
del modules_to_compile[:]
setup.clear()
places.clear()
isbase314 = False
has_test_results = False
# Error-handler to make shutil.rmtree delete read-only files on Windows # Error-handler to make shutil.rmtree delete read-only files on Windows
def remove_readonly(func, path, excinfo): def remove_readonly(func, path, excinfo):
os.chmod(path, stat.S_IWRITE) os.chmod(path, stat.S_IWRITE)
@@ -433,7 +440,7 @@ def add_dependency(dep):
if 'BASE_3_14=YES' in f.read(): if 'BASE_3_14=YES' in f.read():
print('Adding MSI 1.7 to {0}'.format(place)) print('Adding MSI 1.7 to {0}'.format(place))
sys.stdout.flush() sys.stdout.flush()
sp.check_call(['patch', '-p1', '-i', os.path.join(ci_scriptsdir, 'add-msi-to-314.patch')], sp.check_call(['patch', '-p1', '-i', os.path.join(ci['scriptsdir'], 'add-msi-to-314.patch')],
cwd=place) cwd=place)
else: else:
# force including RELEASE.local for non-base modules by overwriting their configure/RELEASE # force including RELEASE.local for non-base modules by overwriting their configure/RELEASE
@@ -464,51 +471,51 @@ def setup_for_build(args):
global isbase314, has_test_results global isbase314, has_test_results
dllpaths = [] dllpaths = []
if ci_os == 'windows': if ci['os'] == 'windows':
if re.match(r'^vs', ci_compiler): if re.match(r'^vs', ci['compiler']):
# there is no combined static and debug EPICS_HOST_ARCH target, # there is no combined static and debug EPICS_HOST_ARCH target,
# so a combined debug and static target will appear to be just static # so a combined debug and static target will appear to be just static
# but debug will have been specified in CONFIG_SITE by prepare() # but debug will have been specified in CONFIG_SITE by prepare()
hostarchsuffix = '' hostarchsuffix = ''
if ci_debug: if ci['debug']:
hostarchsuffix = '-debug' hostarchsuffix = '-debug'
if ci_static: if ci['static']:
hostarchsuffix = '-static' hostarchsuffix = '-static'
if ci_platform == 'x86': if ci['platform'] == 'x86':
os.environ['EPICS_HOST_ARCH'] = 'win32-x86' + hostarchsuffix os.environ['EPICS_HOST_ARCH'] = 'win32-x86' + hostarchsuffix
elif ci_platform == 'x64': elif ci['platform'] == 'x64':
os.environ['EPICS_HOST_ARCH'] = 'windows-x64' + hostarchsuffix os.environ['EPICS_HOST_ARCH'] = 'windows-x64' + hostarchsuffix
if ci_service == 'appveyor': if ci['service'] == 'appveyor':
if ci_compiler == 'vs2019': if ci['compiler'] == 'vs2019':
# put strawberry perl in the PATH # put strawberry perl in the PATH
os.environ['PATH'] = os.pathsep.join([os.path.join(r'C:\Strawberry\perl\site\bin'), os.environ['PATH'] = os.pathsep.join([os.path.join(r'C:\Strawberry\perl\site\bin'),
os.path.join(r'C:\Strawberry\perl\bin'), os.path.join(r'C:\Strawberry\perl\bin'),
os.environ['PATH']]) os.environ['PATH']])
if ci_compiler == 'gcc': if ci['compiler'] == 'gcc':
if 'INCLUDE' not in os.environ: if 'INCLUDE' not in os.environ:
os.environ['INCLUDE'] = '' os.environ['INCLUDE'] = ''
if ci_platform == 'x86': if ci['platform'] == 'x86':
os.environ['INCLUDE'] = os.pathsep.join( os.environ['INCLUDE'] = os.pathsep.join(
[r'C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\include', [r'C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\include',
os.environ['INCLUDE']]) os.environ['INCLUDE']])
os.environ['PATH'] = os.pathsep.join([r'C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin', os.environ['PATH'] = os.pathsep.join([r'C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin',
os.environ['PATH']]) os.environ['PATH']])
elif ci_platform == 'x64': elif ci['platform'] == 'x64':
os.environ['INCLUDE'] = os.pathsep.join( os.environ['INCLUDE'] = os.pathsep.join(
[r'C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\include', [r'C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\include',
os.environ['INCLUDE']]) os.environ['INCLUDE']])
os.environ['PATH'] = os.pathsep.join([r'C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin', os.environ['PATH'] = os.pathsep.join([r'C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin',
os.environ['PATH']]) os.environ['PATH']])
if ci_service == 'travis': if ci['service'] == 'travis':
os.environ['PATH'] = os.pathsep.join([r'C:\Strawberry\perl\site\bin', r'C:\Strawberry\perl\bin', os.environ['PATH'] = os.pathsep.join([r'C:\Strawberry\perl\site\bin', r'C:\Strawberry\perl\bin',
os.environ['PATH']]) os.environ['PATH']])
if ci_compiler == 'gcc': if ci['compiler'] == 'gcc':
if ci_platform == 'x86': if ci['platform'] == 'x86':
os.environ['EPICS_HOST_ARCH'] = 'win32-x86-mingw' os.environ['EPICS_HOST_ARCH'] = 'win32-x86-mingw'
elif ci_platform == 'x64': elif ci['platform'] == 'x64':
os.environ['EPICS_HOST_ARCH'] = 'windows-x64-mingw' os.environ['EPICS_HOST_ARCH'] = 'windows-x64-mingw'
# Find BASE location # Find BASE location
@@ -536,7 +543,7 @@ def setup_for_build(args):
eha, os.environ['EPICS_HOST_ARCH']) eha, os.environ['EPICS_HOST_ARCH'])
break break
if ci_os == 'windows': if ci['os'] == 'windows':
if not building_base: if not building_base:
with open(os.path.join(cachedir, 'RELEASE.local'), 'r') as f: with open(os.path.join(cachedir, 'RELEASE.local'), 'r') as f:
lines = f.readlines() lines = f.readlines()
@@ -620,19 +627,19 @@ def prepare(args):
fold_start('set.up.epics_build', 'Configuring EPICS build system') fold_start('set.up.epics_build', 'Configuring EPICS build system')
with open(os.path.join(places['EPICS_BASE'], 'configure', 'CONFIG_SITE'), 'a') as config_site: with open(os.path.join(places['EPICS_BASE'], 'configure', 'CONFIG_SITE'), 'a') as config_site:
if ci_static: if ci['static']:
config_site.write('SHARED_LIBRARIES=NO\n') config_site.write('SHARED_LIBRARIES=NO\n')
config_site.write('STATIC_BUILD=YES\n') config_site.write('STATIC_BUILD=YES\n')
linktype = 'static' linktype = 'static'
else: else:
linktype = 'dynamic (DLL)' linktype = 'dynamic (DLL)'
if ci_debug: if ci['debug']:
config_site.write('HOST_OPT=NO\n') config_site.write('HOST_OPT=NO\n')
optitype = 'debug' optitype = 'debug'
else: else:
optitype = 'optimized' optitype = 'optimized'
if ci_os == 'windows' and re.match(r'^vs', ci_compiler): if ci['os'] == 'windows' and re.match(r'^vs', ci['compiler']):
# Enable/fix parallel build for VisualStudio compiler on older Base versions # Enable/fix parallel build for VisualStudio compiler on older Base versions
add_vs_fix = True add_vs_fix = True
config_win = os.path.join(places['EPICS_BASE'], 'configure', 'os', 'CONFIG.win32-x86.win32-x86') config_win = os.path.join(places['EPICS_BASE'], 'configure', 'os', 'CONFIG.win32-x86.win32-x86')
@@ -666,9 +673,9 @@ endif'''
if not os.path.isdir(toolsdir): if not os.path.isdir(toolsdir):
os.makedirs(toolsdir) os.makedirs(toolsdir)
if ci_os == 'windows' and ci_choco: if ci['os'] == 'windows' and ci['choco']:
fold_start('install.choco', 'Installing CHOCO packages') fold_start('install.choco', 'Installing CHOCO packages')
sp.check_call(['choco', 'install'] + ci_choco) sp.check_call(['choco', 'install'] + ci['choco'])
fold_end('install.choco', 'Installing CHOCO packages') fold_end('install.choco', 'Installing CHOCO packages')
setup_for_build(args) setup_for_build(args)
@@ -681,7 +688,7 @@ endif'''
sys.stdout.flush() sys.stdout.flush()
sp.check_call(['perl', '--version']) sp.check_call(['perl', '--version'])
if ci_compiler == 'gcc': if ci['compiler'] == 'gcc':
print('{0}$ gcc --version{1}'.format(ANSI_CYAN, ANSI_RESET)) print('{0}$ gcc --version{1}'.format(ANSI_CYAN, ANSI_RESET))
sys.stdout.flush() sys.stdout.flush()
sp.check_call(['gcc', '--version']) sp.check_call(['gcc', '--version'])
@@ -741,7 +748,7 @@ def doExec(args):
def with_vcvars(cmd): def with_vcvars(cmd):
'''re-exec main script with a (hopefully different) command '''re-exec main script with a (hopefully different) command
''' '''
CC = ci_compiler CC = ci['compiler']
# cf. https://docs.microsoft.com/en-us/cpp/build/building-on-the-command-line # cf. https://docs.microsoft.com/en-us/cpp/build/building-on-the-command-line
@@ -754,7 +761,7 @@ def with_vcvars(cmd):
info['arch'] = { info['arch'] = {
'x86': 'x86', # 'amd64_x86' ?? 'x86': 'x86', # 'amd64_x86' ??
'x64': 'amd64', 'x64': 'amd64',
}[ci_platform] # 'x86' or 'x64' }[ci['platform']] # 'x86' or 'x64'
info['vcvars'] = vcvars_found[CC] info['vcvars'] = vcvars_found[CC]
@@ -765,7 +772,7 @@ call "{vcvars}" {arch}
'''.format(**info) '''.format(**info)
print('{0}Calling vcvars-trampoline.bat to set environment for {1} on {2}{3}' print('{0}Calling vcvars-trampoline.bat to set environment for {1} on {2}{3}'
.format(ANSI_YELLOW, CC, ci_platform, ANSI_RESET)) .format(ANSI_YELLOW, CC, ci['platform'], ANSI_RESET))
sys.stdout.flush() sys.stdout.flush()
logger.debug('----- Creating vcvars-trampoline.bat -----') logger.debug('----- Creating vcvars-trampoline.bat -----')
@@ -814,10 +821,11 @@ def main(raw):
logging.basicConfig(level=logging.DEBUG) logging.basicConfig(level=logging.DEBUG)
silent_dep_builds = False silent_dep_builds = False
if args.vcvars and ci_compiler.startswith('vs'): detect_context()
if args.vcvars and ci['compiler'].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))
else: else:
args.func(args) args.func(args)