Expose exported classes as well.

pkg/docgen/bin/dartdoc.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2013, 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.
 
 # Run this script to generate documentation for a directory and serve
 # the results to localhost for viewing in the browser.
 
 import optparse
@@ skipping 10 matching lines @@
 DART_DIR = dirname(dirname(dirname(DIRECTORY)))
 DART_EXECUTABLE = join(DART_DIR,
     '%s/%s/dart-sdk/bin/dart' % (utils.BUILD_ROOT[utils.GuessOS()],
     utils.GetBuildConf('release', utils.GuessArchitecture())))
 PUB = join(DART_DIR, 'sdk/bin/pub')
 DART2JS = join(DART_DIR, 'sdk/bin/dart2js')
 PACKAGE_ROOT = join(dirname(dirname(dirname(DART_EXECUTABLE[:-(len('dart'))]))),
     'packages/')
 EXCLUDED_PACKAGES = ['browser', 'html_import', 'mutation_observer',
     'pkg.xcodeproj', 'shadow_dom']
+APPSERVER_EXECUTABLE = 'dev_appserver.py'
 
 
 def SetPackageRoot(path):
   global PACKAGE_ROOT
   if exists(path):
     PACKAGE_ROOT = abspath(path)
 
 
 def ParseArgs():
   parser = optparse.OptionParser(description='Generate documentation and '
     'display the resulting documentation in the browser.')
   parser.add_option('--full-docs-only', '-d', dest='just_docs',
       action='store_true', default=False,
       help='Only generate documentation, no html output. (If no other '
       'options are specified, will document the SDK and all packages in the '
       'repository.)')
   parser.add_option('--package-root', '-p', dest='pkg_root',
       help='The package root for dart (default is in the build directory).',
       action='store', default=PACKAGE_ROOT)
   parser.add_option('--docgen-options', '-o',
       dest='docgen_options', help='Options to pass to docgen. If no file to '
       'document is specified, by default we generate all documenation for the '
       'SDK and all packages in the dart repository in JSON.',
       default='--json')
   parser.add_option('--gae-sdk',
-      help='The path to the Google App Engine SDK. Defaults to the top level '
-      'dart directory.', default=PACKAGE_ROOT)
+      help='The path to the Google App Engine SDK. Defaults to finding the '
+      'script in the PATH.', default='')
   options, _ = parser.parse_args()
   SetPackageRoot(options.pkg_root)
   return options
 
 
 def AddUserDocgenOptions(sdk_cmd, docgen_options, all_docs=False):
   '''Expand the command with user specified docgen options.'''
   specified_pkg = False
   remove_append = False
   append = '--append'
@@ skipping 70 matching lines @@
     GenerateAllDocs(docgen_options)
   if not options.just_docs:
     cwd = os.getcwd()
     try:
       ExecuteCommand(['git', 'clone', '-b', 'master',
        'git://github.com/dart-lang/dartdoc-viewer.git'])
       ExecuteCommand(['mv', 'docs', 'dartdoc-viewer/client/local'])
       os.chdir('dartdoc-viewer/client/')
       subprocess.call([PUB, 'install'])
       subprocess.call([DART_EXECUTABLE, 'deploy.dart'])
-      server = subprocess.Popen(['python',
-        join(abspath(join(dirname(__file__), options.gae_sdk)),
-        'dev_appserver.py'), '..'])
+      if options.gae_sdk == '':
+        server = subprocess.Popen(' '.join([APPSERVER_EXECUTABLE, '..']),
+            shell=True)
+      else:
+        path_to_gae = options.gae_sdk
+        if not path_to_gae.endswith(APPSERVER_EXECUTABLE):
+          path_to_gae = join(path_to_gae, APPSERVER_EXECUTABLE)
+        server = subprocess.Popen(join(['python', path_to_gae, '..']))
       print (
         "\nPoint your browser to the address of the 'default' server below.")
       raw_input("Press <RETURN> to terminate the server.\n\n")
       server.terminate()
     finally:
       os.chdir(cwd)
       subprocess.call(['rm', '-rf', 'dartdoc-viewer'])
 
 if __name__ == '__main__':
   main()