X Tutup
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 33 additions & 12 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ gulp.task('test.transpiler.unittest',
// Make a temporary directory and symlink dartium from there (just for this command)
// so that it can run.
var dartiumTmpdir = path.join(os.tmpdir(), 'dartium' + new Date().getTime().toString());
gulp.task('test.dart.angular2_testing/ci', ['!pubget.angular2_testing.dart'], function(done) {
gulp.task('test.dart.angular2_testing/ci', ['build/pubspec.dart'], function(done) {
runSequence('test.dart.angular2_testing_symlink', 'test.dart.angular2_testing',
sequenceComplete(done));
});
Expand All @@ -802,11 +802,8 @@ gulp.task(

gulp.task('test.dart.angular2_testing',
shell.task(['PATH=$PATH:' + dartiumTmpdir + ' pub run test -p dartium'],
{'cwd': 'modules_dart/angular2_testing'}));
{'cwd': 'dist/dart/angular2_testing'}));

gulp.task(
'!pubget.angular2_testing.dart',
pubget.dir(gulp, gulpPlugins, {dir: 'modules_dart/angular2_testing', command: DART_SDK.PUB}));

// -----------------
// Pre-test checks
Expand Down Expand Up @@ -865,18 +862,42 @@ gulp.task('test.typings',
// unmodified and directory structure is preserved.
//
// This task is expected to be run after build/tree.dart
gulp.task('build/pure-packages.dart', function() {
var yaml = require('js-yaml');
gulp.task('build/pure-packages.dart', function(done) {
runSequence('build/pure-packages.dart/standalone', 'build/pure-packages.dart/license',
'build/pure-packages.dart/angular2', sequenceComplete(done));
});


gulp.task('build/pure-packages.dart/standalone', function() {
return gulp.src([
'modules_dart/transform/**/*',
'!modules_dart/transform/**/*.proto',
'!modules_dart/transform/pubspec.yaml',
'!modules_dart/transform/**/packages{,/**}',
'modules_dart/**/*',
'!modules_dart/**/*.proto',
'!modules_dart/**/packages{,/**}',
'!modules_dart/payload{,/**}',
'!modules_dart/transform{,/**}',
])
.pipe(gulp.dest(path.join(CONFIG.dest.dart, 'angular2')));
.pipe(gulp.dest(CONFIG.dest.dart));
});

gulp.task('build/pure-packages.dart/license',
function() {
return gulp.src(['LICENSE'])
.pipe(gulp.dest(path.join(CONFIG.dest.dart, 'angular2_testing')));
})


gulp.task('build/pure-packages.dart/angular2', function() {
var yaml = require('js-yaml');

return gulp.src([
'modules_dart/transform/**/*',
'!modules_dart/transform/**/*.proto',
'!modules_dart/transform/pubspec.yaml',
'!modules_dart/transform/**/packages{,/**}',
])
.pipe(gulp.dest(path.join(CONFIG.dest.dart, 'angular2')));
});

// Builds all Dart packages, but does not compile them
gulp.task('build/packages.dart', function(done) {
runSequence('lint_protos.dart', 'build/tree.dart', 'build/pure-packages.dart',
Expand Down
6 changes: 5 additions & 1 deletion modules_dart/angular2_testing/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
name: angular2_testing
description: 'Helpers to run unit tests for angular2 components and injectables.'
version: 0.0.0
environment:
sdk: '>=1.10.0 <2.0.0'
dependencies:
# This will be overridden by scripts/publish/pubspec_cleaner
# to point to the current version of Angular2.
angular2:
path: ../../dist/dart/angular2
path: '../angular2'
dev_dependencies:
test: '^0.12.6'
transformers:
Expand Down
1 change: 1 addition & 0 deletions scripts/publish/pub_publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,4 @@ publishModule angular2
publishModule benchpress
publishModule benchmarks
publishModule angular2_material
publishModule angular2_testing
5 changes: 5 additions & 0 deletions scripts/publish/pubspec_cleaner.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,9 @@ doc['authors'] = Object.keys(BASE_PACKAGE_JSON.contributors).map(function(name)
return BASE_PACKAGE_JSON.contributors[name];
});

if (doc['dependencies'] && doc['dependencies']['angular2']) {
delete doc['dependencies']['angular2'];
doc['dependencies']['angular2'] = BASE_PACKAGE_JSON.version;
}

fs.writeFileSync(pubspecFile, yaml.safeDump(doc));
X Tutup