Index: native_client_sdk/src/build_tools/buildbot_common.py |
diff --git a/native_client_sdk/src/build_tools/buildbot_common.py b/native_client_sdk/src/build_tools/buildbot_common.py |
index dd10870dcb0d7201fd00a6a960b854b59f1f7cbb..10951693c4044f06e2b018f84e8a16d87b7c0b8b 100644 |
--- a/native_client_sdk/src/build_tools/buildbot_common.py |
+++ b/native_client_sdk/src/build_tools/buildbot_common.py |
@@ -16,6 +16,10 @@ sys.path.append(os.path.join(SDK_SRC_DIR, 'tools')) |
import oshelpers |
import getos |
+ |
+verbose = True |
+ |
+ |
def IsSDKBuilder(): |
"""Returns True if this script is running on an SDK builder. |
@@ -48,6 +52,11 @@ def ErrorExit(msg): |
sys.exit(1) |
+def Trace(msg): |
+ if verbose: |
+ sys.stderr.write(str(msg) + '\n') |
+ |
+ |
def GetWindowsEnvironment(): |
sys.path.append(os.path.join(NACL_DIR, 'buildbot')) |
import buildbot_standard |
@@ -93,8 +102,7 @@ def GetWindowsEnvironment(): |
def BuildStep(name): |
"""Annotate a buildbot build step.""" |
sys.stdout.flush() |
- print '\n@@@BUILD_STEP %s@@@' % name |
- sys.stdout.flush() |
+ sys.stderr.write('\n@@@BUILD_STEP %s@@@\n' % name) |
def Run(args, cwd=None, env=None, shell=False): |
@@ -109,7 +117,7 @@ def Run(args, cwd=None, env=None, shell=False): |
if not env and getos.GetPlatform() == 'win': |
env = GetWindowsEnvironment() |
- print 'Running: ' + ' '.join(args) |
+ Trace('Running: ' + ' '.join(args)) |
sys.stdout.flush() |
sys.stderr.flush() |
try: |
@@ -128,14 +136,14 @@ def CopyDir(src, dst, excludes=('.svn', '*/.svn')): |
args = ['-r', src, dst] |
for exc in excludes: |
args.append('--exclude=' + exc) |
- print 'cp -r %s %s' % (src, dst) |
+ Trace('cp -r %s %s' % (src, dst)) |
if os.path.abspath(src) == os.path.abspath(dst): |
ErrorExit('ERROR: Copying directory onto itself: ' + src) |
oshelpers.Copy(args) |
def CopyFile(src, dst): |
- print 'cp %s %s' % (src, dst) |
+ Trace('cp %s %s' % (src, dst)) |
if os.path.abspath(src) == os.path.abspath(dst): |
ErrorExit('ERROR: Copying file onto itself: ' + src) |
args = [src, dst] |
@@ -144,25 +152,25 @@ def CopyFile(src, dst): |
def RemoveDir(dst): |
"""Remove the provided path.""" |
- print 'rm -fr ' + dst |
+ Trace('rm -fr ' + dst) |
oshelpers.Remove(['-fr', dst]) |
def MakeDir(dst): |
"""Create the path including all parent directories as needed.""" |
- print 'mkdir -p ' + dst |
+ Trace('mkdir -p ' + dst) |
oshelpers.Mkdir(['-p', dst]) |
def Move(src, dst): |
"""Move the path src to dst.""" |
- print 'mv -f %s %s' % (src, dst) |
+ Trace('mv -f %s %s' % (src, dst)) |
oshelpers.Move(['-f', src, dst]) |
def RemoveFile(dst): |
"""Remove the provided file.""" |
- print 'rm ' + dst |
+ Trace('rm ' + dst) |
oshelpers.Remove(['-f', dst]) |
@@ -197,5 +205,5 @@ def Archive(filename, bucket_path, cwd=None, step_link=True): |
Run(cmd, shell=shell, cwd=cwd) |
url = 'https://storage.googleapis.com/%s/%s' % (bucket_path, filename) |
if step_link: |
- print '@@@STEP_LINK@download@%s@@@' % url |
sys.stdout.flush() |
+ sys.stderr.write('@@@STEP_LINK@download@%s@@@\n' % url) |