Skip to content
Snippets Groups Projects
Commit a2d964c2 authored by Jan Tattermusch's avatar Jan Tattermusch
Browse files

rename _WINDOWS_CONFIG

parent c96caf87
No related branches found
No related tags found
No related merge requests found
...@@ -149,7 +149,7 @@ class CLanguage(object): ...@@ -149,7 +149,7 @@ class CLanguage(object):
if self.platform == 'windows': if self.platform == 'windows':
binary = 'vsprojects/%s%s/%s.exe' % ( binary = 'vsprojects/%s%s/%s.exe' % (
'x64/' if self.args.arch == 'x64' else '', 'x64/' if self.args.arch == 'x64' else '',
_WINDOWS_CONFIG[self.config.build_config], _MSBUILD_CONFIG[self.config.build_config],
target['name']) target['name'])
else: else:
binary = 'bins/%s/%s' % (self.config.build_config, target['name']) binary = 'bins/%s/%s' % (self.config.build_config, target['name'])
...@@ -402,7 +402,7 @@ class CSharpLanguage(object): ...@@ -402,7 +402,7 @@ class CSharpLanguage(object):
assemblies = tests_json['assemblies'] assemblies = tests_json['assemblies']
tests = tests_json['tests'] tests = tests_json['tests']
msbuild_config = _WINDOWS_CONFIG[self.config.build_config] msbuild_config = _MSBUILD_CONFIG[self.config.build_config]
assembly_files = ['%s/bin/%s/%s.dll' % (a, msbuild_config, a) assembly_files = ['%s/bin/%s/%s.dll' % (a, msbuild_config, a)
for a in assemblies] for a in assemblies]
...@@ -568,7 +568,7 @@ _LANGUAGES = { ...@@ -568,7 +568,7 @@ _LANGUAGES = {
} }
_WINDOWS_CONFIG = { _MSBUILD_CONFIG = {
'dbg': 'Debug', 'dbg': 'Debug',
'opt': 'Release', 'opt': 'Release',
'gcov': 'Debug', 'gcov': 'Debug',
...@@ -843,7 +843,7 @@ def make_jobspec(cfg, targets, makefile='Makefile'): ...@@ -843,7 +843,7 @@ def make_jobspec(cfg, targets, makefile='Makefile'):
return [ return [
jobset.JobSpec([_windows_build_bat(args.compiler), jobset.JobSpec([_windows_build_bat(args.compiler),
'vsprojects\\%s.sln' % target, 'vsprojects\\%s.sln' % target,
'/p:Configuration=%s' % _WINDOWS_CONFIG[cfg]] + '/p:Configuration=%s' % _MSBUILD_CONFIG[cfg]] +
extra_args + extra_args +
language_make_options, language_make_options,
shell=True, timeout_seconds=None) shell=True, timeout_seconds=None)
...@@ -870,7 +870,7 @@ for l in languages: ...@@ -870,7 +870,7 @@ for l in languages:
def build_step_environ(cfg): def build_step_environ(cfg):
environ = {'CONFIG': cfg} environ = {'CONFIG': cfg}
msbuild_cfg = _WINDOWS_CONFIG.get(cfg) msbuild_cfg = _MSBUILD_CONFIG.get(cfg)
if msbuild_cfg: if msbuild_cfg:
environ['MSBUILD_CONFIG'] = msbuild_cfg environ['MSBUILD_CONFIG'] = msbuild_cfg
return environ return environ
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment