fixup: tools/build

Author: illwieckz

PRESUBMIT.py

@@ -59,7 +59,7 @@ def _CommonChecks(input_api, output_api):
   old_sys_path = list(sys.path)
   try:
     sys.path.append(os.path.join(NACL_TOP_DIR, 'tools'))
-    sys.path.append(os.path.join(NACL_TOP_DIR, 'build'))
+    sys.path.append(os.path.join(NACL_TOP_DIR, 'tools', 'build'))
     import code_hygiene
   finally:
     sys.path = old_sys_path

buildbot/buildbot_pnacl_toolchain.py

@@ -26,7 +26,7 @@
 
 TEMP_PACKAGES_FILE = os.path.join(TOOLCHAIN_BUILD_OUT_DIR, 'packages.txt')
 
-BUILD_DIR = os.path.join(NACL_DIR, 'build')
+BUILD_DIR = os.path.join(NACL_DIR, 'tools', 'build')
 PACKAGE_VERSION_DIR = os.path.join(BUILD_DIR, 'package_version')
 PACKAGE_VERSION_SCRIPT = os.path.join(PACKAGE_VERSION_DIR, 'package_version.py')
 

buildbot/buildbot_toolchain_build.py

@@ -22,7 +22,7 @@
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 NACL_DIR = os.path.dirname(SCRIPT_DIR)
-BUILD_DIR = os.path.join(NACL_DIR, 'build')
+BUILD_DIR = os.path.join(NACL_DIR, 'tools', 'build')
 TOOLCHAIN_BUILD_DIR = os.path.join(NACL_DIR, 'toolchain_build')
 TOOLCHAIN_BUILD_OUT_DIR = os.path.join(TOOLCHAIN_BUILD_DIR, 'out')
 TOOLCHAIN_BUILD_PACKAGES = os.path.join(TOOLCHAIN_BUILD_OUT_DIR, 'packages')

buildbot/packages.py

@@ -15,7 +15,7 @@
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 NACL_DIR = os.path.dirname(SCRIPT_DIR)
-BUILD_DIR = os.path.join(NACL_DIR, 'build')
+BUILD_DIR = os.path.join(NACL_DIR, 'tools', 'build')
 
 PACKAGE_VERSION_DIR = os.path.join(BUILD_DIR, 'package_version')
 PACKAGE_VERSION_SCRIPT = os.path.join(PACKAGE_VERSION_DIR, 'package_version.py')

pynacl/directory_storage.py

@@ -22,7 +22,7 @@
 
 PYNACL_DIR = os.path.dirname(os.path.abspath(__file__))
 NACL_DIR = os.path.dirname(PYNACL_DIR)
-BUILD_DIR = os.path.join(NACL_DIR, 'build')
+BUILD_DIR = os.path.join(NACL_DIR, 'tools', 'build')
 CYGTAR_PATH = os.path.join(BUILD_DIR, 'cygtar.py')
 
 

toolchain_build/toolchain_main.py

@@ -23,7 +23,7 @@
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 NACL_DIR = os.path.dirname(SCRIPT_DIR)
 ROOT_DIR = os.path.dirname(NACL_DIR)
-BUILD_DIR = os.path.join(NACL_DIR, 'build')
+BUILD_DIR = os.path.join(NACL_DIR, 'tools', 'build')
 PKG_VER_DIR = os.path.join(BUILD_DIR, 'package_version')
 sys.path.append(PKG_VER_DIR)
 import archive_info