Changed script to use an explicit package root to execute docgen.

pkg/docgen/bin/upload_docgen.py

 #!/usr/bin/python
 #
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 """ This file will run docgen.dart on the SDK libraries, and upload them to 
   Google Cloud Storage for the documentation viewer. 
 """
 
+import argparse

[Emily Fortuna, 2013/07/19 22:49:28]

Our buildbots actually still have python 2.6, and argparse was introduced in
python 2.7. You can use optparse instead. It's nearly identical from your
perspective.

[janicejl, 2013/07/22 16:56:11]

Done.

 import os
 from os.path import join, dirname, abspath, exists 
 import platform
 import subprocess
 import sys
 sys.path.append(abspath(join(dirname(__file__), '../../../tools')))
 import utils
 from upload_sdk import ExecuteCommand
 
 
 DART = abspath(join(dirname(__file__), '../../../%s/%s/dart-sdk/bin/dart' 
     % (utils.BUILD_ROOT[utils.GuessOS()], utils.GetBuildConf('release', 
     utils.GuessArchitecture()))))
+PACKAGE_ROOT = abspath(join(dirname(__file__), '../../../%s/%s/packages/' 
+    % (utils.BUILD_ROOT[utils.GuessOS()], utils.GetBuildConf('release', 
+    utils.GuessArchitecture()))))
 GSUTIL = utils.GetBuildbotGSUtilPath()
 GS_SITE = 'gs://dartlang-docgen'
+DESCRIPTION='Runs docgen.dart on the SDK libraries, and uploads them to Google \
+    Cloud Storage for the dartdoc-viewer. '
+
+
+def GetOptions():
+  parser = argparse.ArgumentParser(description=DESCRIPTION)
+  parser.add_argument('--package-root', action=SetPackageRoot,

[Emily Fortuna, 2013/07/19 22:49:28]

Instead of having the separate SetPackageRoot class and everything you can just
use action='store':

parser.add_option('--package-root', dest='pkg_root',
      help = 'The package root for dart (default is in the build directory).',
      action = 'store', default = PACKAGE_ROOT)
PACKAGE_ROOT = parser.parse_args().pkg_root
etc

[janicejl, 2013/07/22 16:56:11]

Done.

+    help='Sets the package root for dart.')
+  parser.parse_args()
+
+
+class SetPackageRoot(argparse.Action):
+  def __call__(self, parser, namespace, values, option_string=None):
+    global PACKAGE_ROOT
+    if exists(values):
+      PACKAGE_ROOT = abspath(values) 
 
 
 def SetGsutil():
   """ If not on buildbots, find gsutil relative to docgen. """
   global GSUTIL
   if not exists(GSUTIL):
     GSUTIL = abspath(join(dirname(__file__), 
         '../../../third_party/gsutil/gsutil'))
 
 
 def Upload(source, target):
   """ Upload files to Google Storage. """
   cmd = [GSUTIL, '-m', 'cp', '-q', '-a', 'public-read', '-r', source, target]
   (status, output) = ExecuteCommand(cmd)
   return status
 
 
 def main():
+  GetOptions()
+
   SetGsutil()
 
   # Execute Docgen.dart on the SDK.
-  ExecuteCommand([DART, abspath(join(dirname(__file__), 'docgen.dart')), 
+  ExecuteCommand([DART, '--checked', '--package-root=' + PACKAGE_ROOT, 
+      abspath(join(dirname(__file__), 'docgen.dart')), 
       '--parse-sdk'])
   
   # Use SVN Revision to get the revision number.
   revision = utils.GetSVNRevision()
   if revision is None:
     # Try to find the version from the dart-sdk folder. 
     revision_file_location = abspath(join(dirname(__file__), 
         '../../../%s/%s/dart-sdk/revision' % (utils.BUILD_ROOT[utils.GuessOS()],
         utils.GetBuildConf('release', utils.GuessArchitecture()))))
     with open(revision_file_location, 'r') as revision_file:
@@ skipping 13 matching lines @@
     version_file.close()
   Upload('./VERSION', GS_SITE + '/VERSION')
 
   # Clean up the files it creates. 
   ExecuteCommand(['rm', '-rf', './docs'])
   ExecuteCommand(['rm', '-f', './VERSION'])
 
 
 if __name__ == '__main__':
   main()