Changed upload_sdk.py to handle local builds

editor/build/build.py

Index: editor/build/build.py
===================================================================
--- editor/build/build.py	(revision 2354)
+++ editor/build/build.py	(working copy)
@@ -239,12 +239,17 @@
                 ' tried environment variables'
                 ' USER and USERNAME')
     return 1
+  sdk_environment = os.environ
   if username.startswith('chrome'):
     to_bucket = 'gs://dart-editor-archive-continuous'
+    from_bucket = 'gs://dart-dump-render-tree'
   else:
     to_bucket = 'gs://dart-editor-archive-testing'
+    from_bucket = 'gs://dart-editor-archive-testing'

[danrubel, 2011/12/12 20:34:53]

In this case, lets skip the copy completely

[Mark R Russell, 2011/12/12 22:01:52]

Done.

+    sdk_environment['DART_LOCAL_BUILD'] = 'dart-editor-archive-testing'
 
   print '@@@BUILD_STEP dart-ide dart clients: %s@@@' % options.name
+  print 'JAVA_HOME = {0}'.format(str(sdk_environment['JAVA_HOME']))
   builder_name = str(options.name)
 
   if builder_name != 'dart-editor-win' and builder_name != 'dart-editor':
@@ -256,7 +261,7 @@
     try:
       os.chdir(dartpath)
       print ' '.join(cmds)
-      status = subprocess.call(cmds)
+      status = subprocess.call(cmds, env=sdk_environment)
       print 'sdk build returned ' + str(status)
       if status:
         _PrintError('the build of the SDK failed')
@@ -264,7 +269,7 @@
     finally:
       os.chdir(cwd)
 
-    _CopySdk(buildos, revision, to_bucket, gsu)
+    _CopySdk(buildos, revision, to_bucket, from_bucket, gsu)
 
   if builder_name == 'dart-editor':
     buildos = None
@@ -472,26 +477,27 @@
         gsu.SetAcl(element, acl)
 
 
-def _CopySdk(buildos, revision, bucket, gsu):
+def _CopySdk(buildos, revision, bucket_to, bucket_from, gsu):
   """copy the deployed SDK to the editor buckets.
 
   Args:
     buildos: the OS the build is running under
     revision: the svn revision
-    bucket: the bucket to upload to
+    bucket_to: the bucket to upload to
+    bucket_from: the bucket to copy from
     gsu: the gsutil object
   """
   print '_CopySdk({0}, {1}, gsu)'.format(buildos, revision)
   gszip = 'dart-{0}-{1}.zip'.format(buildos, revision)
   gssdkzip = 'gs://dart-dump-render-tree/sdk/{0}'.format(gszip)
-  gseditorzip = '{0}/{1}/{2}'.format(bucket, revision, gszip)
-  gseditorlatestzip = '{0}/{1}/{2}'.format(bucket, 'latest', gszip)
+  gseditorzip = '{0}/{1}/{2}'.format(bucket_to, revision, gszip)
+  gseditorlatestzip = '{0}/{1}/{2}'.format(bucket_to, 'latest', gszip)
 
   print 'copying {0} to {1}'.format(gssdkzip, gseditorzip)
   gsu.Copy(gssdkzip, gseditorzip)
   print 'copying {0} to {1}'.format(gssdkzip, gseditorlatestzip)
   gsu.Copy(gssdkzip, gseditorlatestzip)
-  _SetAclOnArtifacts(bucket, [gszip], gsu)
+  _SetAclOnArtifacts(bucket_to, [gszip], gsu)
 
 
 def _PrintSeparator(text):