Create the SDK in dart-sdk directory. The sdk zip file's contents

tools/upload_sdk.py

 #!/usr/bin/python
 
 # Copyright (c) 2011 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.
 
 # This zips the SDK and uploads it to Google Storage when run on a buildbot.
+#
+# Usage: upload_sdk.py path_to_sdk
 
 import os
 import subprocess
 import sys
 import utils
 
+from os.path import basename, dirname, join

[Siggi Cherem (dart-lang), 2011/12/13 19:01:00]

I personally like how this looks in the code, but I think our style guide
requires using os.path.X in the code instead.

[dgrove, 2011/12/13 22:38:41]

Done.

+
 
 GSUTIL = '/b/build/scripts/slave/gsutil'
 GS_SITE = 'gs://'
 GS_DIR = 'dart-dump-render-tree'
 LATEST = 'latest'

[Siggi Cherem (dart-lang), 2011/12/13 19:01:00]

this var is not used

[dgrove, 2011/12/13 22:38:41]

Done.

 SDK = 'sdk'

[Siggi Cherem (dart-lang), 2011/12/13 19:01:00]

maybe rename to GS_SDK_SUBDIR (for a moment I thought this could be the local
dir that got renamed to dart-sdk)

[dgrove, 2011/12/13 22:38:41]

Done.

 
 def ExecuteCommand(cmd):
   """Execute a command in a subprocess.
   """
   print 'Executing: ' + ' '.join(cmd)
   pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
   output = pipe.communicate()
   if pipe.returncode != 0:
     print 'Execution failed: ' + str(output)
   return (pipe.returncode, output)
@@ skipping 38 matching lines @@
     sys.stderr.write('Path not found: %s\n' % argv[1])
     Usage(argv[0])
     return 1
   if not os.path.exists(GSUTIL):
     sys.stderr.write('cound not find {0}'.format(GSUTIL))
     exit(0)
   revision = GetSVNRevision()
   if revision is None:
     sys.stderr.write('Unable to find SVN revision.\n')
     return 1
-  os.chdir(argv[1])
+  os.chdir(dirname(argv[1]))
+  revision_file = open(join(basename(argv[1]), 'revision'), 'w')
+  revision_file.write(revision + '\n')
+  revision_file.close()

[Siggi Cherem (dart-lang), 2011/12/13 19:01:00]

(nit): slightly better style:
with open(join(basename(argv[1]), 'revision'), 'w') as f:
  f.write(revision + '\n')

(close is done automatically, even if an exception is thrown)

[dgrove, 2011/12/13 22:38:41]

Done.

+
   # TODO(dgrove) - deal with architectures that are not ia32.
-  sdk_name = 'dart-' + utils.GuessOS() + '-' + revision + '.zip'
-  sdk_file = '../' + sdk_name
-  ExecuteCommand(['zip', '-yr', sdk_file, '.'])
-  UploadArchive(sdk_file, GS_SITE + os.path.join(gsdir, SDK, sdk_name))
+  sdk_file = 'dart-' + utils.GuessOS() + '-' + revision + '.zip'

[Siggi Cherem (dart-lang), 2011/12/13 19:01:00]

(style nit):
sdk_file = 'dart-%s-%s.zip' % (utils.GuessOS(), revision)

+  ExecuteCommand(['zip', '-yr', sdk_file, basename(argv[1])])
+  UploadArchive(sdk_file, GS_SITE + join(gsdir, SDK, sdk_file))
   latest_name = 'dart-' + utils.GuessOS() + '-latest' + '.zip'
-  UploadArchive(sdk_file, GS_SITE + os.path.join(gsdir, SDK, latest_name))
+  UploadArchive(sdk_file, GS_SITE + join(gsdir, SDK, latest_name))
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))