languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-16 03:07:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix writing summaries

Browse source 
I also renamed "outPath" so this bug is less likely to happen in the future :)

R=vsm@google.com

Review URL: https://codereview.chromium.org/2279833002 .
This commit is contained in:
John Messerly 2016-08-25 10:40:09 -07:00
parent c1139934a7
commit bc50963a61
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkg/dev_compiler/lib/src/compiler/command.dart
View file

@ -103,7 +103,7 @@ void _compile(ArgResults argResults, void printFn(Object obj)) {
// TODO(jmesserly): for now the first one is special. This will go away once
// we've removed the "root" and "module name" variables.
var outPath = outPaths[0];
var firstOutPath = outPaths[0];
var libraryRoot = argResults['library-root'] as String;
libraryRoot ??= argResults['build-root'] as String;
@ -116,35 +116,35 @@ void _compile(ArgResults argResults, void printFn(Object obj)) {
String modulePath;
if (moduleRoot != null) {
moduleRoot = path.absolute(moduleRoot);
if (!path.isWithin(moduleRoot, outPath)) {
_usageException('Output file $outPath must be within the module root '
'directory $moduleRoot');
if (!path.isWithin(moduleRoot, firstOutPath)) {
_usageException('Output file $firstOutPath must be within the module '
'root directory $moduleRoot');
}
modulePath =
path.withoutExtension(path.relative(outPath, from: moduleRoot));
path.withoutExtension(path.relative(firstOutPath, from: moduleRoot));
} else {
moduleRoot = path.dirname(outPath);
modulePath = path.basenameWithoutExtension(outPath);
moduleRoot = path.dirname(firstOutPath);
modulePath = path.basenameWithoutExtension(firstOutPath);
}
var unit = new BuildUnit(modulePath, libraryRoot, argResults.rest,
(source) => _moduleForLibrary(moduleRoot, source, compilerOpts));
JSModuleFile module = compiler.compile(unit, compilerOpts);
var module = compiler.compile(unit, compilerOpts);
module.errors.forEach(printFn);
if (!module.isValid) throw new CompileErrorException();
// Write JS file, as well as source map and summary (if requested).
for (var i = 0; i < outPaths.length; i++) {
module.writeCodeSync(moduleFormats[i], outPaths[i]);
var outPath = outPaths[i];
module.writeCodeSync(moduleFormats[i], outPath);
if (module.summaryBytes != null) {
var summaryPath =
path.withoutExtension(outPath) + '.${compilerOpts.summaryExtension}';
new File(summaryPath).writeAsBytesSync(module.summaryBytes);
}
}
}
String _moduleForLibrary(