summaryrefslogtreecommitdiffstats
path: root/native_client_sdk
diff options
context:
space:
mode:
authorbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-28 21:10:05 +0000
committerbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-28 21:10:05 +0000
commit3846c269bb3a721d65eb7f734ac99e4049483b82 (patch)
tree5c8ddbc74c6757b0c578fa4646ac8a0969f64fb6 /native_client_sdk
parent7a8edafc2e81f88a1f8e699f1bb17662b23cb6af (diff)
downloadchromium_src-3846c269bb3a721d65eb7f734ac99e4049483b82.zip
chromium_src-3846c269bb3a721d65eb7f734ac99e4049483b82.tar.gz
chromium_src-3846c269bb3a721d65eb7f734ac99e4049483b82.tar.bz2
Make archiving source independent of which buildbot_run.py is run from.
BUG=None TEST=None R=noelallen@google.com Review URL: http://codereview.chromium.org/8727005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
-rwxr-xr-xnative_client_sdk/src/build_tools/buildbot_run.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/native_client_sdk/src/build_tools/buildbot_run.py b/native_client_sdk/src/build_tools/buildbot_run.py
index 21db208..a1fb494 100755
--- a/native_client_sdk/src/build_tools/buildbot_run.py
+++ b/native_client_sdk/src/build_tools/buildbot_run.py
@@ -12,7 +12,8 @@ import sys
# Add scons to the python path (as nacl_utils.py requires it).
SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
SDK_SRC_DIR = os.path.dirname(SCRIPT_DIR)
-SRC_DIR = os.path.dirname(os.path.dirname(SDK_SRC_DIR))
+SDK_DIR = os.path.dirname(SDK_SRC_DIR)
+SRC_DIR = os.path.dirname(SDK_DIR)
sys.path.append(os.path.join(SRC_DIR, 'third_party/scons-2.0.1/engine'))
import build_utils
@@ -36,10 +37,11 @@ def Archive(revision, chrome_milestone):
dst = 'naclsdk_linux.tgz'
bucket_path = 'nativeclient-mirror/nacl/nacl_sdk/pepper_%s_%s/%s' % (
chrome_milestone, revision, dst)
+ full_src = os.path.join(SDK_DIR, src)
full_dst = 'gs://%s' % bucket_path
subprocess.check_call(
'/b/build/scripts/slave/gsutil cp -a public-read %s %s' % (
- src, full_dst), shell=True)
+ full_src, full_dst), shell=True)
url = 'https://commondatastorage.googleapis.com/%s' % bucket_path
print '@@@STEP_LINK@download@%s@@@' % url
sys.stdout.flush()