Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1716)

Unified Diff: pkg/polymer/lib/deploy.dart

Issue 31043004: Fixes the deploy step used by the bots in windows (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pkg/pkg.status ('k') | pkg/polymer/lib/src/build/common.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/polymer/lib/deploy.dart
diff --git a/pkg/polymer/lib/deploy.dart b/pkg/polymer/lib/deploy.dart
index c4752a46ccf2ff464758322116bfd06484bffd0f..a28869fdf586675450c885a5fe96c70b8261f0a4 100644
--- a/pkg/polymer/lib/deploy.dart
+++ b/pkg/polymer/lib/deploy.dart
@@ -38,13 +38,15 @@ main() {
var test = args['test'];
var outDir = args['out'];
- var transformOps = new TransformOptions(
- directlyIncludeJS: args['js'],
- contentSecurityPolicy: args['csp']);
-
- var options = (test == null)
- ? new BarbackOptions(createDeployPhases(transformOps), outDir)
- : _createTestOptions(transformOps, test, outDir);
+ var options;
+ if (test == null) {
+ var transformOps = new TransformOptions(
+ directlyIncludeJS: args['js'],
+ contentSecurityPolicy: args['csp']);
+ options = new BarbackOptions(createDeployPhases(transformOps), outDir);
+ } else {
+ options = _createTestOptions(test, outDir, args['js'], args['csp']);
+ }
if (options == null) exit(1);
print('polymer/deploy.dart: creating a deploy target for '
@@ -57,8 +59,8 @@ main() {
createDeployPhases(options) => new PolymerTransformerGroup(options).phases;
-BarbackOptions _createTestOptions(TransformOptions transformOps,
- String testFile, String outDir) {
+BarbackOptions _createTestOptions(String testFile, String outDir,
+ bool directlyIncludeJS, bool contentSecurityPolicy) {
var testDir = path.normalize(path.dirname(testFile));
// A test must be allowed to import things in the package.
@@ -71,8 +73,10 @@ BarbackOptions _createTestOptions(TransformOptions transformOps,
return null;
}
- transformOps.entryPoints = [path.relative(testFile, from: pubspecDir)];
Siggi Cherem (dart-lang) 2013/10/22 18:57:58 I didn't realize this yesterday, but the problem
- var phases = createDeployPhases(transformOps);
+ var phases = createDeployPhases(new TransformOptions(
+ entryPoints: [path.relative(testFile, from: pubspecDir)],
+ directlyIncludeJS: directlyIncludeJS,
+ contentSecurityPolicy: contentSecurityPolicy));
return new BarbackOptions(phases, outDir,
currentPackage: '_test',
packageDirs: {'_test' : pubspecDir},
« no previous file with comments | « pkg/pkg.status ('k') | pkg/polymer/lib/src/build/common.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698