Further fixes for including package information in docs

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. 
 """
 
@@ skipping 49 matching lines @@
   (status, output) = ExecuteCommand(cmd)
   return status
 
 
 def main():
   GetOptions()
 
   SetGsutil()
 
   # Execute Docgen.dart on the SDK.
-  ExecuteCommand([DART, '--checked', '--package-root=' + PACKAGE_ROOT, 
-      abspath(join(dirname(__file__), 'docgen.dart')), 
-      '--parse-sdk', '--json'])
+  ExecuteCommand(['sh', './generate_all_docs.sh'])
   
   # 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:
       revision = revision_file.readline(5)
       revision_file.close()
     
     if revision is None:
       raise Exception("Unable to find revision. ")
 
   # Upload the all files in Docs into a folder based off Revision number on 
   # Cloud Storage.
-  Upload('./docs/*', GS_SITE + '/' + revision + '/')
+  # TODO(alanknight): If we give it ./docs/* it fails to upload files in the 
+  # subdirectory, probably due to escaping. Work around it by changing dir.
+  # Better, generalize this to be less dependent on the working directory. 
+  os.chdir('docs')
+  Upload('.', GS_SITE + '/' + revision + '/')

[terry, 2013/10/30 18:11:31]

Would this work then you wouldn't have to chdir to drill then then back out
again?

Upload(os.getwd() + '/docs', GS_SITE + '/' + revision + '/')

[Alan Knight, 2013/10/30 18:31:33]

That works, but then uploads into a subdirectory called docs in cloud storage,
which is not where the client expects to find them.

+  os.chdir('..')
 
   # Update VERSION file in Cloud Storage. 
   with open('VERSION', 'w') as version_file:
     version_file.write(revision)
     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()