From 6c77d7182ad86ae3b4fc6c60cf4737533b84ac4c Mon Sep 17 00:00:00 2001
From: Marc Laval <mlaval@amadeus.com>
Date: Sat, 27 Aug 2016 00:41:50 +0200
Subject: [PATCH] fix(compiler-cli): make ngc to work on Windows (#10919)

Fixes #10792
---
 modules/@angular/compiler-cli/src/reflector_host.ts | 11 ++++++-----
 test.sh                                             |  6 +++++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/modules/@angular/compiler-cli/src/reflector_host.ts b/modules/@angular/compiler-cli/src/reflector_host.ts
index 6162fb7d94..6baa2f5454 100644
--- a/modules/@angular/compiler-cli/src/reflector_host.ts
+++ b/modules/@angular/compiler-cli/src/reflector_host.ts
@@ -16,7 +16,7 @@ import {StaticReflectorHost, StaticSymbol} from './static_reflector';
 
 const EXT = /(\.ts|\.d\.ts|\.js|\.jsx|\.tsx)$/;
 const DTS = /\.d\.ts$/;
-const NODE_MODULES = path.sep + 'node_modules' + path.sep;
+const NODE_MODULES = '/node_modules/';
 const IS_GENERATED = /\.(ngfactory|css(\.shim)?)$/;
 
 export interface ReflectorHostContext {
@@ -36,8 +36,8 @@ export class ReflectorHost implements StaticReflectorHost, ImportGenerator {
       protected program: ts.Program, protected compilerHost: ts.CompilerHost,
       protected options: AngularCompilerOptions, context?: ReflectorHostContext) {
     // normalize the path so that it never ends with '/'.
-    this.basePath = path.normalize(path.join(this.options.basePath, '.'));
-    this.genDir = path.normalize(path.join(this.options.genDir, '.'));
+    this.basePath = path.normalize(path.join(this.options.basePath, '.')).replace(/\\/g, '/');
+    this.genDir = path.normalize(path.join(this.options.genDir, '.')).replace(/\\/g, '/');
 
     this.context = context || new NodeReflectorHostContext();
     var genPath: string = path.relative(this.basePath, this.genDir);
@@ -60,7 +60,8 @@ export class ReflectorHost implements StaticReflectorHost, ImportGenerator {
 
   protected resolve(m: string, containingFile: string) {
     const resolved =
-        ts.resolveModuleName(m, containingFile, this.options, this.context).resolvedModule;
+        ts.resolveModuleName(m, containingFile.replace(/\\/g, '/'), this.options, this.context)
+            .resolvedModule;
     return resolved ? resolved.resolvedFileName : null;
   };
 
@@ -139,7 +140,7 @@ export class ReflectorHost implements StaticReflectorHost, ImportGenerator {
   }
 
   private dotRelative(from: string, to: string): string {
-    var rPath: string = path.relative(from, to);
+    var rPath: string = path.relative(from, to).replace(/\\/g, '/');
     return rPath.startsWith('.') ? rPath : './' + rPath;
   }
 
diff --git a/test.sh b/test.sh
index b3ea5d628b..c54b868b17 100755
--- a/test.sh
+++ b/test.sh
@@ -10,7 +10,11 @@ if [ $# -eq 0 ]
     echo
 else
   cd `dirname $0`
-  export NODE_PATH=$NODE_PATH:$(pwd)/dist/all:$(pwd)/dist/tools
+  if [ -z ${NODE_PATH+x} ]; then
+    export NODE_PATH=$(pwd)/dist/all:$(pwd)/dist/tools
+  else
+    export NODE_PATH=$NODE_PATH:$(pwd)/dist/all/:$(pwd)/dist/tools/
+  fi
   $(npm bin)/tsc -p tools
   node dist/tools/tsc-watch/ $1 watch
 fi