Generate docgen output along with api_docs as part of the build

utils/apidoc/docgen.gyp

Index: utils/apidoc/docgen.gyp
diff --git a/utils/apidoc/apidoc.gyp b/utils/apidoc/docgen.gyp
similarity index 75%
copy from utils/apidoc/apidoc.gyp
copy to utils/apidoc/docgen.gyp
index 7707557509d983010227613e831824b93930f278..27cc69d1feb500e1a21ff7b6a45fcf25d41dfdd4 100644
--- a/utils/apidoc/apidoc.gyp
+++ b/utils/apidoc/docgen.gyp
@@ -15,19 +15,20 @@
   ],
   'targets': [
     {
-      'target_name': 'api_docs',
+      'target_name': 'docgen',
       'type': 'none',
       'dependencies': [
         '../../utils/compiler/compiler.gyp:dart2js',
         '../../runtime/dart-runtime.gyp:dart',
         '../../pkg/pkg.gyp:pkg_packages',
+        'apidoc.gyp:api_docs',
       ],
       'includes': [
         '../../sdk/lib/core/corelib_sources.gypi',
       ],
       'actions': [
         {
-          'action_name': 'run_apidoc',
+          'action_name': 'run_docgen',
           # The 'inputs' list records the files whose timestamps are
           # compared to the files listed in 'outputs'.  If a file
           # 'outputs' doesn't exist or if a file in 'inputs' is newer
@@ -53,10 +54,6 @@
           # ../../runtime/bin, as most of them has moved to
           # ../../sdk/lib).
           #
-          # In addition, we want to make sure the documentation is
-          # regenerated when a resource file (CSS, PNG, etc) is
-          # updated.  This is because these files are also copied to
-          # the output directory.
           'inputs': [
             '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)dart<(EXECUTABLE_SUFFIX)',
             '<(SHARED_INTERMEDIATE_DIR)/utils_wrapper.dart.snapshot',
@@ -67,10 +64,12 @@
             '../../sdk/bin/dart2js',
             '../../sdk/bin/dart2js.bat',
             '../../tools/only_in_release_mode.py',
+            # We sit inside the api_docs directory, so make sure it has run
+            # before we do. Otherwise it might run later and delete us.
+            '<(PRODUCT_DIR)/api_docs/index.html',
           ],
           'outputs': [
-            '<(PRODUCT_DIR)/api_docs/index.html',
-            '<(PRODUCT_DIR)/api_docs/client-static.js',
+            '<(PRODUCT_DIR)/api_docs/docgen/index.json',
           ],
           'action': [
             'python',
@@ -78,30 +77,19 @@
             '<@(_outputs)',
             '--',
             '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)dart<(EXECUTABLE_SUFFIX)',
+            '--old_gen_heap_size=1024',
             '--package-root=<(PRODUCT_DIR)/packages/',
-            'apidoc.dart',
-            '--out=<(PRODUCT_DIR)/api_docs',
-            '--version=<!@(["python", "../../tools/print_version.py"])',
+            '../../pkg/docgen/bin/docgen.dart',
+            '--out=<(PRODUCT_DIR)/api_docs/docgen',
+            '--json',
+            '--include-sdk',
             '--package-root=<(PRODUCT_DIR)/packages',
-            '--mode=static',
-            '--exclude-lib=analyzer',
             '--exclude-lib=async_helper',
-            '--exclude-lib=barback',
-            '--exclude-lib=browser',
-            '--exclude-lib=dartdoc',
-            '--exclude-lib=docgen',
             '--exclude-lib=expect',
-            '--exclude-lib=http',
-            '--exclude-lib=oauth2',
-            '--exclude-lib=scheduled_test',
-            '--exclude-lib=stack_trace',
-            '--exclude-lib=watcher',
-            '--exclude-lib=webdriver',
-            '--exclude-lib=yaml',
-            '--include-lib=matcher',
-            '--extra-lib=pkg/unittest/lib/mock.dart',
+            '--exclude-lib=docgen',
+            '../../pkg',          
           ],
-          'message': 'Running apidoc: <(_action)',
+          'message': 'Running docgen: <(_action)',
         },
       ],
     }