diff --git a/modules/angular2/src/transform/reflection_remover/codegen.dart b/modules/angular2/src/transform/reflection_remover/codegen.dart index 3b25234802..00d53060e5 100644 --- a/modules/angular2/src/transform/reflection_remover/codegen.dart +++ b/modules/angular2/src/transform/reflection_remover/codegen.dart @@ -17,7 +17,7 @@ class Codegen { {String prefix}) : this.prefix = prefix == null ? _PREFIX_BASE : prefix, importUris = newEntryPointPaths.map((p) => - path.relative(p, from: path.dirname(reflectionEntryPointPath))) { + path.relative(p, from: path.dirname(reflectionEntryPointPath)).replaceAll('\\', '/')) { if (this.prefix.isEmpty) throw new ArgumentError.value('(empty)', 'prefix'); } diff --git a/tools/build/dartanalyzer.js b/tools/build/dartanalyzer.js index 64dff52b72..edd51f7023 100644 --- a/tools/build/dartanalyzer.js +++ b/tools/build/dartanalyzer.js @@ -24,7 +24,7 @@ module.exports = function(gulp, plugins, config) { libFiles.concat(testFiles).concat(webFiles).forEach(function(fileName, index) { if (fileName !== tempFile && fileName.indexOf("/packages/") === -1) { if (fileName.indexOf('lib') == 0) { - fileName = 'package:' + packageName + '/' + path.relative('lib', fileName); + fileName = 'package:' + packageName + '/' + path.relative('lib', fileName).replace(/\\/g, '/'); } analyzeFile.push('import "' + fileName + '" as mod' + index + ';'); } @@ -54,6 +54,10 @@ module.exports = function(gulp, plugins, config) { var errorCount = 0; var warningCount = 0; rl.on('line', function(line) { + if (line == "find: > bin [: No such file or directory") { + //Skip bad output from Dart SDK .bat files on Windows + return; + } var parsedLine = _AnalyzerOutputLine.parse(line); if (!parsedLine) { errorCount++; diff --git a/tools/build/pubbuild.js b/tools/build/pubbuild.js index 1b80bd28ae..985878d1f9 100644 --- a/tools/build/pubbuild.js +++ b/tools/build/pubbuild.js @@ -48,7 +48,7 @@ function replaceDartWithJsScripts(gulp, folder) { function removeWebFolder(gulp, folder) { var folders = [].slice.call(glob.sync(path.join(folder, 'web', '*'))); folders.forEach(function(subFolder) { - fs.renameSync(subFolder, subFolder.replace(path.sep + 'web' + path.sep, path.sep)); + fs.renameSync(subFolder, subFolder.replace('/web/', '/')); }); fs.rmdirSync(path.join(folder, 'web')); return Q.resolve();