Skip to content
Snippets Groups Projects
Commit 1700cc31 authored by nweiz@google.com's avatar nweiz@google.com Committed by Natalie Weizenbaum
Browse files

Stop emitting dart2js's .precompiled.js file.

dart2js itself will stop emitting this file soon.

R=rnystrom@google.com

Review URL: https://codereview.chromium.org//701283002

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge@41534 260f80e4-7a28-3924-810f-c04153c831b5
parent 590efdb9
No related branches found
No related tags found
No related merge requests found
...@@ -89,7 +89,6 @@ class Dart2JSTransformer extends Transformer implements LazyTransformer { ...@@ -89,7 +89,6 @@ class Dart2JSTransformer extends Transformer implements LazyTransformer {
void declareOutputs(DeclaringTransform transform) { void declareOutputs(DeclaringTransform transform) {
var primaryId = transform.primaryId; var primaryId = transform.primaryId;
transform.declareOutput(primaryId.addExtension(".js")); transform.declareOutput(primaryId.addExtension(".js"));
transform.declareOutput(primaryId.addExtension(".precompiled.js"));
if (_generateSourceMaps) { if (_generateSourceMaps) {
transform.declareOutput(primaryId.addExtension(".js.map")); transform.declareOutput(primaryId.addExtension(".js.map"));
} }
...@@ -284,6 +283,10 @@ class _BarbackCompilerProvider implements dart.CompilerProvider { ...@@ -284,6 +283,10 @@ class _BarbackCompilerProvider implements dart.CompilerProvider {
return new NullSink<String>(); return new NullSink<String>();
} }
// TODO(nweiz): remove this special case when dart2js stops generating these
// files.
if (extension.endsWith(".precompiled.js")) return new NullSink<String>();
var primaryId = _transform.primaryInput.id; var primaryId = _transform.primaryInput.id;
// Dart2js uses an empty string for the name of the entrypoint library. // Dart2js uses an empty string for the name of the entrypoint library.
......
...@@ -43,7 +43,6 @@ main() { ...@@ -43,7 +43,6 @@ main() {
d.dir('build', [ d.dir('build', [
d.dir('foo', [ d.dir('foo', [
d.matcherFile('file.dart.js', isNot(isEmpty)), d.matcherFile('file.dart.js', isNot(isEmpty)),
d.matcherFile('file.dart.precompiled.js', isNot(isEmpty)),
d.dir('packages', [d.dir('browser', [ d.dir('packages', [d.dir('browser', [
d.file('dart.js', 'contents of dart.js'), d.file('dart.js', 'contents of dart.js'),
d.file('interop.js', 'contents of interop.js') d.file('interop.js', 'contents of interop.js')
...@@ -54,12 +53,10 @@ main() { ...@@ -54,12 +53,10 @@ main() {
d.file('interop.js', 'contents of interop.js') d.file('interop.js', 'contents of interop.js')
])]), ])]),
d.matcherFile('subfile.dart.js', isNot(isEmpty)), d.matcherFile('subfile.dart.js', isNot(isEmpty)),
d.matcherFile('subfile.dart.precompiled.js', isNot(isEmpty)),
]) ])
]), ]),
d.dir('web', [ d.dir('web', [
d.matcherFile('file.dart.js', isNot(isEmpty)), d.matcherFile('file.dart.js', isNot(isEmpty)),
d.matcherFile('file.dart.precompiled.js', isNot(isEmpty)),
d.dir('packages', [d.dir('browser', [ d.dir('packages', [d.dir('browser', [
d.file('dart.js', 'contents of dart.js'), d.file('dart.js', 'contents of dart.js'),
d.file('interop.js', 'contents of interop.js') d.file('interop.js', 'contents of interop.js')
...@@ -69,8 +66,7 @@ main() { ...@@ -69,8 +66,7 @@ main() {
d.file('dart.js', 'contents of dart.js'), d.file('dart.js', 'contents of dart.js'),
d.file('interop.js', 'contents of interop.js') d.file('interop.js', 'contents of interop.js')
])]), ])]),
d.matcherFile('subfile.dart.js', isNot(isEmpty)), d.matcherFile('subfile.dart.js', isNot(isEmpty))
d.matcherFile('subfile.dart.precompiled.js', isNot(isEmpty))
]) ])
]) ])
]) ])
......
...@@ -46,34 +46,28 @@ main() { ...@@ -46,34 +46,28 @@ main() {
d.dir('build', [ d.dir('build', [
d.dir('benchmark', [ d.dir('benchmark', [
d.matcherFile('file.dart.js', isNot(isEmpty)), d.matcherFile('file.dart.js', isNot(isEmpty)),
d.matcherFile('file.dart.precompiled.js', isNot(isEmpty)),
d.nothing('file.dart'), d.nothing('file.dart'),
d.nothing('lib.dart'), d.nothing('lib.dart'),
d.dir('subdir', [ d.dir('subdir', [
d.matcherFile('subfile.dart.js', isNot(isEmpty)), d.matcherFile('subfile.dart.js', isNot(isEmpty)),
d.matcherFile('subfile.dart.precompiled.js', isNot(isEmpty)),
d.nothing('subfile.dart') d.nothing('subfile.dart')
]) ])
]), ]),
d.dir('foo', [ d.dir('foo', [
d.matcherFile('file.dart.js', isNot(isEmpty)), d.matcherFile('file.dart.js', isNot(isEmpty)),
d.matcherFile('file.dart.precompiled.js', isNot(isEmpty)),
d.nothing('file.dart'), d.nothing('file.dart'),
d.nothing('lib.dart'), d.nothing('lib.dart'),
d.dir('subdir', [ d.dir('subdir', [
d.matcherFile('subfile.dart.js', isNot(isEmpty)), d.matcherFile('subfile.dart.js', isNot(isEmpty)),
d.matcherFile('subfile.dart.precompiled.js', isNot(isEmpty)),
d.nothing('subfile.dart') d.nothing('subfile.dart')
]) ])
]), ]),
d.dir('web', [ d.dir('web', [
d.matcherFile('file.dart.js', isNot(isEmpty)), d.matcherFile('file.dart.js', isNot(isEmpty)),
d.matcherFile('file.dart.precompiled.js', isNot(isEmpty)),
d.nothing('file.dart'), d.nothing('file.dart'),
d.nothing('lib.dart'), d.nothing('lib.dart'),
d.dir('subdir', [ d.dir('subdir', [
d.matcherFile('subfile.dart.js', isNot(isEmpty)), d.matcherFile('subfile.dart.js', isNot(isEmpty)),
d.matcherFile('subfile.dart.precompiled.js', isNot(isEmpty)),
d.nothing('subfile.dart') d.nothing('subfile.dart')
]) ])
]) ])
......
...@@ -56,7 +56,6 @@ main() { ...@@ -56,7 +56,6 @@ main() {
d.dir('build', [ d.dir('build', [
d.dir('web', [ d.dir('web', [
d.matcherFile('main.dart.js', isNot(isEmpty)), d.matcherFile('main.dart.js', isNot(isEmpty)),
d.matcherFile('main.dart.precompiled.js', isNot(isEmpty)),
d.matcherFile('main.dart.js_1.part.js', isNot(isEmpty)), d.matcherFile('main.dart.js_1.part.js', isNot(isEmpty)),
d.matcherFile('main.dart.js_2.part.js', isNot(isEmpty)), d.matcherFile('main.dart.js_2.part.js', isNot(isEmpty)),
]) ])
......
...@@ -75,7 +75,6 @@ main() { ...@@ -75,7 +75,6 @@ main() {
d.dir('build', [ d.dir('build', [
d.dir('web', [ d.dir('web', [
d.matcherFile('file.dart.js', isMinifiedDart2JSOutput), d.matcherFile('file.dart.js', isMinifiedDart2JSOutput),
d.matcherFile('file.dart.precompiled.js', isNot(isEmpty)),
d.dir('packages', [ d.dir('packages', [
d.dir('browser', [ d.dir('browser', [
d.file('dart.js', 'contents of dart.js'), d.file('dart.js', 'contents of dart.js'),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment