pkg/docgen: fix compile and serve

pkg/docgen/lib/docgen.dart

 // 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.
 
 /// **docgen** is a tool for creating machine readable representations of Dart
 /// code metadata, including: classes, members, comments and annotations.
 ///
 /// docgen is run on a `.dart` file or a directory containing `.dart` files.
 ///
 ///      $ dart docgen.dart [OPTIONS] [FILE/DIR]
@@ skipping 711 matching lines @@
     else {
       var processResult = Process.runSync('git', ['clone', '-b', 'master',
           'git://github.com/dart-lang/dartdoc-viewer.git'],
           runInShell: true);
 
       if (processResult.exitCode == 0) {
         /// Move the generated json/yaml docs directory to the dartdoc-viewer
         /// directory, to run as a webpage.
         var processResult = Process.runSync(_Generator._pubScript,
             ['upgrade'], runInShell: true,
-            workingDirectory: path.join(viewerCodePath, 'client'));
+            workingDirectory: viewerCodePath);
         print('process output: ${processResult.stdout}');
         print('process stderr: ${processResult.stderr}');
 
         var dir = new Directory(_Generator._outputDirectory == null? 'docs' :
             _Generator._outputDirectory);
-        _webDocsDir = new Directory(path.join(viewerCodePath, 'client',
-            'web', 'docs'));
+        _webDocsDir = new Directory(path.join(viewerCodePath, 'web', 'docs'));
         if (dir.existsSync()) {
           // Move the docs folder to dartdoc-viewer/client/web/docs
           dir.renameSync(_webDocsDir.path);
         }
       } else {
         print('Error cloning git repository:');
         print('process output: ${processResult.stdout}');
         print('process stderr: ${processResult.stderr}');
       }
     }
   }
 
   static void _compile() {
     if (_webDocsDir.existsSync()) {
       // Compile the code to JavaScript so we can run on any browser.
       print('Compile app to JavaScript for viewing.');
       var processResult = Process.runSync(_Generator._dartBinary,
-          ['deploy.dart'], workingDirectory : path.join(viewerCodePath,
-          'client'), runInShell: true);
+          ['deploy.dart'], workingDirectory: viewerCodePath, runInShell: true);
       print('process output: ${processResult.stdout}');
       print('process stderr: ${processResult.stderr}');
-      var outputDir = path.join(viewerCodePath, 'client', 'out', 'web');
+      var outputDir = path.join(viewerCodePath, 'out', 'web');
       print('Docs are available at $outputDir');
     }
   }
 
   /// A simple HTTP server. Implemented here because this is part of the SDK,
   /// so it shouldn't have any external dependencies.
   static void _runServer() {
     // Launch a server to serve out of the directory dartdoc-viewer/client/web.
     HttpServer.bind('localhost', 8080).then((HttpServer httpServer) {
       print('Server launched. Navigate your browser to: '
           'http://localhost:${httpServer.port}');
       httpServer.listen((HttpRequest request) {
         var response = request.response;
-        var basePath = path.join(viewerCodePath, 'client', 'out',
-            'web');
+        var basePath = path.join(viewerCodePath, 'out', 'web');
         var requestPath = path.join(basePath, request.uri.path.substring(1));
         bool found = true;
         var file = new File(requestPath);
         if (file.existsSync()) {
           // Set the correct header type.
           if (requestPath.endsWith('.html')) {
             response.headers.set('Content-Type', 'text/html');
           } else if (requestPath.endsWith('.js')) {
             response.headers.set('Content-Type', 'application/javascript');
           } else if (requestPath.endsWith('.dart')) {
@@ skipping 1445 matching lines @@
         .map((e) => originalMirror.getField(e.simpleName).reflectee)
         .where((e) => e != null)
         .toList();
   }
 
   Map toMap() => {
     'name': Indexable.getDocgenObject(mirror, owningLibrary).docName,
     'parameters': parameters
   };
 }