From 5a84048f7247b5c93e0989938ad8c335141d290c Mon Sep 17 00:00:00 2001
From: Tobias Bosch <tbosch1009@gmail.com>
Date: Wed, 4 May 2016 10:02:12 -0700
Subject: [PATCH] chore: adjust build for `tools/metadata` name change

---
 modules/@angular/compiler_cli/tsconfig-es5.json | 2 +-
 modules/tsconfig.json                           | 3 ++-
 tools/broccoli/broccoli-typescript.ts           | 2 +-
 tools/tsc-watch/index.ts                        | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/@angular/compiler_cli/tsconfig-es5.json b/modules/@angular/compiler_cli/tsconfig-es5.json
index 30b2c68939..3d7410e560 100644
--- a/modules/@angular/compiler_cli/tsconfig-es5.json
+++ b/modules/@angular/compiler_cli/tsconfig-es5.json
@@ -15,7 +15,7 @@
           "@angular/compiler": ["../../../dist/packages-dist/compiler"],
           "@angular/platform-server": ["../../../dist/packages-dist/platform-server"],
           "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"],
-          "ts-metadata-collector": ["dist/tools/metadata"]
+          "ts-metadata-collector": ["../../../dist/tools/ts-metadata-collector"]
         },
         "experimentalDecorators": true,
         "rootDir": ".",
diff --git a/modules/tsconfig.json b/modules/tsconfig.json
index 31a72ba306..140b633440 100644
--- a/modules/tsconfig.json
+++ b/modules/tsconfig.json
@@ -13,7 +13,8 @@
     "paths": {
       "selenium-webdriver": ["./@angular/typings/selenium-webdriver/selenium-webdriver.d.ts"],
       "rxjs/*": ["../node_modules/rxjs/*"],
-      "@angular/*": ["./@angular/*"]
+      "@angular/*": ["./@angular/*"],
+      "ts-metadata-collector": ["../dist/tools/ts-metadata-collector"]
     },
     "rootDir": ".",
     "inlineSourceMap": true,
diff --git a/tools/broccoli/broccoli-typescript.ts b/tools/broccoli/broccoli-typescript.ts
index 9a95295353..83b83e699c 100644
--- a/tools/broccoli/broccoli-typescript.ts
+++ b/tools/broccoli/broccoli-typescript.ts
@@ -5,7 +5,7 @@ import fse = require('fs-extra');
 import path = require('path');
 import * as ts from 'typescript';
 import {wrapDiffingPlugin, DiffingBroccoliPlugin, DiffResult} from './diffing-broccoli-plugin';
-import {MetadataCollector} from '../metadata';
+import {MetadataCollector} from '../ts-metadata-collector';
 
 type FileRegistry = ts.Map<{version: number}>;
 
diff --git a/tools/tsc-watch/index.ts b/tools/tsc-watch/index.ts
index e49be6b8c3..2f6818658c 100644
--- a/tools/tsc-watch/index.ts
+++ b/tools/tsc-watch/index.ts
@@ -95,8 +95,8 @@ if (platform == 'node') {
     onChangeCmds: [
       // TODO: fix and enable tests for public_api_spec again!
       // ['node', 'dist/tools/cjs-jasmine/index-tools', '--',
-      // '{metadata,public_api_guard}/**/*{_,.}spec.js']
-      ['node', 'dist/tools/cjs-jasmine/index-tools', '--', 'metadata/**/*{_,.}spec.js']
+      // '{ts-metadata-collector,public_api_guard}/**/*{_,.}spec.js']
+      ['node', 'dist/tools/cjs-jasmine/index-tools', '--', 'ts-metadata-collector/**/*{_,.}spec.js']
     ]
   });
 }