From c386fc83796e983a745f42f42332ae52dbd588b3 Mon Sep 17 00:00:00 2001
From: Tobias Bosch <tbosch1009@gmail.com>
Date: Mon, 2 May 2016 09:56:38 -0700
Subject: [PATCH] chore: make compiler_cli build again

---
 build.sh                              | 2 +-
 gulpfile.js                           | 7 +++----
 tools/compiler_cli/src/tsconfig.json  | 3 ++-
 tools/compiler_cli/test/tsconfig.json | 1 +
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build.sh b/build.sh
index 7f1fe316db..a93bd22e9e 100755
--- a/build.sh
+++ b/build.sh
@@ -50,7 +50,7 @@ do
   UMDES5PATH=${DESTDIR}/${PACKAGE}.umd.js
 
 
-  echo "======      COMPILING: \$(npm bin)/ng2tc -p ${SRCDIR}/tsconfig.json        ====="
+  echo "======      COMPILING: \$(npm bin)/ng2tc -p ${SRCDIR}/tsconfig-es5.json        ====="
   $(npm bin)/ng2tc -p ${SRCDIR}/tsconfig-es5.json
   cp ${SRCDIR}/package.json ${DESTDIR}/
 
diff --git a/gulpfile.js b/gulpfile.js
index 44d97db350..ca5bd7a564 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1053,8 +1053,7 @@ gulp.task('!test.typings',
 gulp.task('test.typings', ['build.js.cjs'],
           function(done) { runSequence('!test.typings', sequenceComplete(done)); });
 
-gulp.task('!build.compiler_cli', ['build.js.cjs'],
-          function(done) { runTsc('tools/compiler_cli/src', done); });
+gulp.task('!build.compiler_cli', function(done) { runTsc('tools/compiler_cli/src', done); });
 
 gulp.task('!clean.compiler_cli', function(done) {
   fse.remove(path.join('dist', 'tools', 'compiler_cli', 'test'),
@@ -1066,7 +1065,7 @@ gulp.task('!clean.compiler_cli', function(done) {
 
 gulp.task('!test.compiler_cli.codegen', function(done) {
   try {
-    require('./dist/js/cjs/compiler_cli/main')
+    require('./dist/tools/compiler_cli/main')
         .main("tools/compiler_cli/test")
         .then(done)
         .catch(function(rej) { done(new Error(rej)); });
@@ -1076,7 +1075,7 @@ gulp.task('!test.compiler_cli.codegen', function(done) {
 });
 
 gulp.task('!test.compiler_cli.unit',
-          function(done) { runJasmineTests(['dist/js/cjs/compiler_cli/**/*_spec.js'], done) });
+          function(done) { runJasmineTests(['dist/tools/compiler_cli/**/*_spec.js'], done) });
 
 // This task overwrites our careful tsickle-lowered Decorators with normal .js emit.
 // So it should only be run after asserting on the .js file content.
diff --git a/tools/compiler_cli/src/tsconfig.json b/tools/compiler_cli/src/tsconfig.json
index f607606732..1549e0e922 100644
--- a/tools/compiler_cli/src/tsconfig.json
+++ b/tools/compiler_cli/src/tsconfig.json
@@ -9,12 +9,13 @@
         "paths": {
           "@angular/*": ["dist/all/@angular/*"],
           "@angular/core": ["dist/all/@angular/core/"],
+          "@angular/compiler": ["dist/all/@angular/compiler/"],
           "ts-metadata-collector": ["dist/tools/metadata"]
         },
         "experimentalDecorators": true,
         "rootDir": ".",
         // Write to a directory that has the node_modules symlink in a parent
-        "outDir": "../../../dist/js/cjs/compiler_cli",
+        "outDir": "../../../dist/tools/compiler_cli",
         "declaration": true
     },
     "exclude": ["test"]
diff --git a/tools/compiler_cli/test/tsconfig.json b/tools/compiler_cli/test/tsconfig.json
index e6b1bd0771..d9cee13591 100644
--- a/tools/compiler_cli/test/tsconfig.json
+++ b/tools/compiler_cli/test/tsconfig.json
@@ -23,6 +23,7 @@
         "paths": {
           "@angular/*": ["dist/all/@angular/*"],
           "@angular/core": ["dist/all/@angular/core/"],
+          "@angular/compiler": ["dist/all/@angular/compiler/"],
           "rxjs/*": ["node_modules/rxjs/*"],
           "ts-metadata-collector": ["dist/tools/metadata"]
         }