Update deploy and deploy_sdk for the new package: world.

sky/tools/deploy_sdk.py

 #!/usr/bin/env python
 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import argparse
 from datetime import datetime
 import logging
 import os
 import shutil
@@ skipping 67 matching lines @@
             shutil.copy(from_path, to_path)
 
         dirs[:] = filter(wrapped_filter, dirs)
 
 
 def link(from_root, to_root, filter_func=None):
     ensure_dir_exists(os.path.dirname(to_root))
     os.symlink(from_root, to_root)
 
 
+def make_relative_symlink(source, link_name):
+    rel_source = os.path.relpath(source, os.path.dirname(link_name))
+    os.symlink(rel_source, link_name)
+
+
 def confirm(prompt):
     response = raw_input('%s [N]|y: ' % prompt)
     return response and response.lower() == 'y'
 
 
 def delete_all_non_hidden_files_in_directory(root, non_interactive=False):
     to_delete = [os.path.join(root, p)
         for p in os.listdir(root) if not p.startswith('.')]
     if not to_delete:
         return
@@ skipping 12 matching lines @@
 
 
 def main():
     logging.basicConfig(level=logging.WARN)
     parser = argparse.ArgumentParser(description='Deploy a new sky_sdk.')
     parser.add_argument('sdk_root', type=str)
     parser.add_argument('--build-dir', action='store', type=str,
         default=os.path.join(SRC_ROOT, DEFAULT_REL_BUILD_DIR))
     parser.add_argument('--non-interactive', action='store_true')
     parser.add_argument('--dev-environment', action='store_true')
+    parser.add_argument('--commit', action='store_true')
     parser.add_argument('--fake-pub-get-into', action='store', type=str)
     args = parser.parse_args()
 
     build_dir = os.path.abspath(args.build_dir)
     sdk_root = os.path.abspath(args.sdk_root)
 
     print 'Building SDK from %s into %s' % (build_dir, sdk_root)
     start_time = datetime.now()
 
     # These are separate ideas but don't need a separate flag yet.
     use_links = args.dev_environment
     skip_apks = args.dev_environment
-    should_commit = not args.dev_environment
+    should_commit = args.commit
     generate_licenses = not args.dev_environment
 
     # We save a bunch of time in --dev-environment mode by symlinking whole
     # directories when possible.  Any names which conflict with generated
     # directories can't be symlinked and must be copied.
     copy_or_link = link if use_links else copy
 
     def sdk_path(rel_path):
         return os.path.join(sdk_root, rel_path)
 
@@ skipping 51 matching lines @@
                 stdout=license_file)
 
         copy_or_link(src_path('AUTHORS'), sdk_path('packages/mojo/AUTHORS'))
         copy_or_link(src_path('LICENSE'), sdk_path('packages/mojo/LICENSE'))
         copy_or_link(src_path('AUTHORS'), sdk_path('packages/sky/AUTHORS'))
         copy_or_link(src_path('LICENSE'), sdk_path('packages/sky/LICENSE'))
 
     if args.fake_pub_get_into:
         packages_dir = os.path.abspath(args.fake_pub_get_into)
         ensure_dir_exists(packages_dir)
-        os.symlink(sdk_path('packages/mojo/lib'),
+        make_relative_symlink(sdk_path('packages/mojo/lib'),
             os.path.join(packages_dir, 'mojo'))
-        os.symlink(sdk_path('packages/sky/lib'),
+        make_relative_symlink(sdk_path('packages/sky/lib'),
             os.path.join(packages_dir, 'sky'))
 
     if should_commit:
         # Kinda a hack to make a prettier build dir for the commit:
         rel_build_dir = os.path.join(os.path.split(build_dir)[-2:])
         subprocess.check_call(['git', 'add', '.'], cwd=sdk_root)
         subprocess.check_call([
             'git', 'commit',
             '-m', '%s from %s' % (rel_build_dir, git_revision())
             ], cwd=sdk_root)
 
     time_delta = datetime.now() - start_time
     print 'SDK built at %s in %ss' % (sdk_root, time_delta.total_seconds())
 
 
 if __name__ == '__main__':
     main()