From ac5520d8a6cf85439fd925283c1387faf5d5827d Mon Sep 17 00:00:00 2001 From: "elijahtaylor@chromium.org" Date: Tue, 23 Apr 2013 23:51:10 +0000 Subject: [NaCl SDK] Fix module imports for mono bots These were recently changed in the NaCl SDK but were not accounted for in the mono scripts. TEST=None BUG=None Review URL: https://chromiumcodereview.appspot.com/14054006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195941 0039d316-1c4b-4281-b951-d872f2087c98 --- native_client_sdk/src/build_tools/nacl-mono-buildbot.py | 3 ++- native_client_sdk/src/build_tools/nacl-mono-builder.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'native_client_sdk') diff --git a/native_client_sdk/src/build_tools/nacl-mono-buildbot.py b/native_client_sdk/src/build_tools/nacl-mono-buildbot.py index 5bfba9f..5d7d28c 100755 --- a/native_client_sdk/src/build_tools/nacl-mono-buildbot.py +++ b/native_client_sdk/src/build_tools/nacl-mono-buildbot.py @@ -10,6 +10,7 @@ import sys import buildbot_common import build_utils +from build_paths import SCRIPT_DIR GS_MANIFEST_PATH = 'gs://nativeclient-mirror/nacl/nacl_sdk/' SDK_MANIFEST = 'naclsdk_manifest2.json' @@ -163,7 +164,7 @@ def main(args): buildbot_revision = os.environ.get('BUILDBOT_REVISION', '') buildername = os.environ.get('BUILDBOT_BUILDERNAME', '') - os.chdir(buildbot_common.SCRIPT_DIR) + os.chdir(SCRIPT_DIR) if buildername == 'linux-sdk-mono32': assert buildbot_revision diff --git a/native_client_sdk/src/build_tools/nacl-mono-builder.py b/native_client_sdk/src/build_tools/nacl-mono-builder.py index 0726111..e6fece3 100755 --- a/native_client_sdk/src/build_tools/nacl-mono-builder.py +++ b/native_client_sdk/src/build_tools/nacl-mono-builder.py @@ -9,8 +9,9 @@ import sys import tarfile import buildbot_common +from build_paths import SCRIPT_DIR -SDK_BUILD_DIR = buildbot_common.SCRIPT_DIR +SDK_BUILD_DIR = SCRIPT_DIR MONO_BUILD_DIR = os.path.join(SDK_BUILD_DIR, 'mono_build') MONO_DIR = os.path.join(MONO_BUILD_DIR, 'nacl-mono') -- cgit v1.1