From 2fe083d36a1e5502ec8b99e367433fe5664eee09 Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Tue, 10 Nov 2009 12:58:22 -0500 Subject: Minor develop.py tweaks to make mac logs more readable in parabuild output. Supressing all the setenv spam. --- indra/develop.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/develop.py') diff --git a/indra/develop.py b/indra/develop.py index 7836c97473..79baa613ad 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -239,6 +239,7 @@ class UnixSetup(PlatformSetup): def run(self, command, name=None): '''Run a program. If the program fails, raise an exception.''' + sys.stdout.flush() ret = os.system(command) if ret: if name is None: @@ -456,7 +457,7 @@ class DarwinSetup(UnixSetup): targets = ' '.join(['-target ' + repr(t) for t in targets]) else: targets = '' - cmd = ('xcodebuild -configuration %s %s %s' % + cmd = ('xcodebuild -configuration %s %s %s | grep -v "^[[:space:]]*setenv" ; exit ${PIPESTATUS[0]}' % (self.build_type, ' '.join(opts), targets)) for d in self.build_dirs(): try: -- cgit v1.2.3 From da4f76c17a19addb6a96b4c032fce5a873bee6e1 Mon Sep 17 00:00:00 2001 From: CG Linden Date: Sun, 15 Nov 2009 09:22:00 -0800 Subject: Set PATH to devenv.com to avoid problem with develop.py's use of os.system() --- indra/develop.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'indra/develop.py') diff --git a/indra/develop.py b/indra/develop.py index 79baa613ad..7941600b68 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -576,8 +576,10 @@ class WindowsSetup(PlatformSetup): return "buildconsole %s.sln /build %s" % (self.project_name, config) # devenv.com is CLI friendly, devenv.exe... not so much. - return ('"%sdevenv.com" %s.sln /build %s' % - (self.find_visual_studio(), self.project_name, self.build_type)) + #return ('"%sdevenv.com" %s.sln /build %s' % + # (self.find_visual_studio(), self.project_name, self.build_type)) + 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.''' -- cgit v1.2.3 From 853faf531672a230c3bf7b4ed3069e0b6c2f6349 Mon Sep 17 00:00:00 2001 From: CG Linden Date: Sun, 15 Nov 2009 09:41:07 -0800 Subject: Invoke native python for develop.py, not CYGWIN python, revert develop.py's original usage --- indra/develop.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/develop.py') diff --git a/indra/develop.py b/indra/develop.py index 7941600b68..3040b312ba 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -576,10 +576,10 @@ class WindowsSetup(PlatformSetup): return "buildconsole %s.sln /build %s" % (self.project_name, config) # devenv.com is CLI friendly, devenv.exe... not so much. - #return ('"%sdevenv.com" %s.sln /build %s' % - # (self.find_visual_studio(), self.project_name, self.build_type)) - return ('devenv.com %s.sln /build %s' % - (self.project_name, self.build_type)) + return ('"%sdevenv.com" %s.sln /build %s' % + (self.find_visual_studio(), self.project_name, self.build_type)) + #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.''' -- cgit v1.2.3 From 6b47e36b159a0e036beb442b82b1356aa756f152 Mon Sep 17 00:00:00 2001 From: CG Linden Date: Sun, 15 Nov 2009 11:39:00 -0800 Subject: Add some debug output to develop.py --- indra/develop.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/develop.py') diff --git a/indra/develop.py b/indra/develop.py index 3040b312ba..05ad12f20e 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -585,7 +585,9 @@ class WindowsSetup(PlatformSetup): '''Run a program. If the program fails, raise an exception.''' while retries: retries = retries - 1 + print "develop.py tries to run:", command ret = os.system(command) + print "got ret", ret, "from", command if ret: if name is None: name = command.split(None, 1)[0] -- cgit v1.2.3