Browse Source

Checkout boto in our repo

Cheng Zhao 9 years ago
parent
commit
70987a9029
4 changed files with 21 additions and 6 deletions
  1. 3 0
      .gitmodules
  2. 5 4
      script/bootstrap.py
  3. 12 2
      script/lib/util.py
  4. 1 0
      vendor/boto

+ 3 - 0
.gitmodules

@@ -19,3 +19,6 @@
 [submodule "vendor/requests"]
 	path = vendor/requests
 	url = https://github.com/kennethreitz/requests
+[submodule "vendor/boto"]
+	path = vendor/boto
+	url = https://github.com/boto/boto.git

+ 5 - 4
script/bootstrap.py

@@ -37,7 +37,7 @@ def main():
     update_clang()
 
   update_submodules()
-  setup_requests()
+  setup_python_libs()
   update_node_modules('.')
   bootstrap_brightray(args.dev, args.url, args.target_arch)
 
@@ -85,9 +85,10 @@ def update_submodules():
   execute_stdout(['git', 'submodule', 'update', '--init', '--recursive'])
 
 
-def setup_requests():
-  with scoped_cwd(os.path.join(VENDOR_DIR, 'requests')):
-    execute_stdout([sys.executable, 'setup.py', 'build'])
+def setup_python_libs():
+  for lib in ('requests', 'boto'):
+    with scoped_cwd(os.path.join(VENDOR_DIR, lib)):
+      execute_stdout([sys.executable, 'setup.py', 'build'])
 
 
 def bootstrap_brightray(is_dev, url, target_arch):

+ 12 - 2
script/lib/util.py

@@ -209,8 +209,18 @@ def parse_version(version):
 
 
 def s3put(bucket, access_key, secret_key, prefix, key_prefix, files):
+  env = os.environ.copy()
+  BOTO_DIR = os.path.abspath(os.path.join(__file__, '..', '..', '..', 'vendor',
+                                          'boto'))
+  env['PYTHONPATH'] = os.path.pathsep.join([
+    env.get('PYTHONPATH', ''),
+    os.path.join(BOTO_DIR, 'build', 'lib'),
+    os.path.join(BOTO_DIR, 'build', 'lib.linux-x86_64-2.7')])
+
+  boto = os.path.join(BOTO_DIR, 'bin', 's3put')
   args = [
-    's3put',
+    sys.executable,
+    boto,
     '--bucket', bucket,
     '--access_key', access_key,
     '--secret_key', secret_key,
@@ -219,4 +229,4 @@ def s3put(bucket, access_key, secret_key, prefix, key_prefix, files):
     '--grant', 'public-read'
   ] + files
 
-  execute(args)
+  execute(args, env)

+ 1 - 0
vendor/boto

@@ -0,0 +1 @@
+Subproject commit f7574aa6cc2c819430c1f05e9a1a1a666ef8169b