diff options
author | Nathan Wilcox <inoshiro@lindenlab.com> | 2010-01-11 10:38:13 -0800 |
---|---|---|
committer | Nathan Wilcox <inoshiro@lindenlab.com> | 2010-01-11 10:38:13 -0800 |
commit | f37f806660f66b064490b9c14d724273dc67fcbb (patch) | |
tree | 1fda7ea3cdaf2d50143dae7765b3c040e632b7b6 | |
parent | 8246b382b732a9b49c49a012274cd17ce1af4e94 (diff) |
DEV-44838 - Fix a bug introduced by inconsistently changing the get_build_cmd() interface.
-rwxr-xr-x | indra/develop.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/develop.py b/indra/develop.py index 17ac1b3801..a20badcfba 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -574,15 +574,15 @@ class WindowsSetup(PlatformSetup): if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0' ]: config = '\"%s|Win32\"' % config - return "buildconsole %(prj)s.sln /build /cfg=%(cfg)s" % {'prj': self.project_name, 'cfg': config} + executable = self.find_in_path('buildconsole') + cmd = "%(bin)s %(prj)s.sln /build /cfg=%(cfg)s" % {'prj': self.project_name, 'cfg': config, 'bin': executable} + return (executable, cmd) # devenv.com is CLI friendly, devenv.exe... not so much. executable = '%sdevenv.com' % (self.find_visual_studio(),) cmd = ('"%s" %s.sln /build %s' % (executable, self.project_name, self.build_type)) return (executable, cmd) - #return ('devenv.com %s.sln /build %s' % - # (self.project_name, self.build_type)) def run(self, command, name=None, retry_on=None, retries=1): '''Run a program. If the program fails, raise an exception.''' |