diff options
author | Josh Haberman <jhaberman@gmail.com> | 2016-06-16 18:40:07 -0700 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2016-06-17 11:25:02 -0700 |
commit | d4d13a4349e4e59d67f311185ddcc1890d956d7a (patch) | |
tree | 8e6bbad1120663463ec73e71a2fbc7ad83418686 | |
parent | 73054ef888b6f81569bf9c904d202266085b0a66 (diff) | |
download | protobuf-d4d13a4349e4e59d67f311185ddcc1890d956d7a.tar.gz protobuf-d4d13a4349e4e59d67f311185ddcc1890d956d7a.tar.bz2 protobuf-d4d13a4349e4e59d67f311185ddcc1890d956d7a.zip |
Fix tests for CommonJS.v3.0.0-beta-3.2
-rw-r--r-- | js/gulpfile.js | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/js/gulpfile.js b/js/gulpfile.js index b6ee7c57..cca99131 100644 --- a/js/gulpfile.js +++ b/js/gulpfile.js @@ -33,7 +33,16 @@ gulp.task('genproto_closure', function (cb) { }); gulp.task('genproto_commonjs', function (cb) { - exec('mkdir -p commonjs_out && ' + protoc + ' --js_out=import_style=commonjs,binary:commonjs_out -I ../src -I commonjs -I . *.proto commonjs/test*/*.proto ../src/google/protobuf/descriptor.proto' + wellKnownTypes.join(' '), + exec('mkdir -p commonjs_out && ' + protoc + ' --js_out=import_style=commonjs,binary:commonjs_out -I ../src -I commonjs -I . *.proto commonjs/test*/*.proto ../src/google/protobuf/descriptor.proto', + function (err, stdout, stderr) { + console.log(stdout); + console.log(stderr); + cb(err); + }); +}); + +gulp.task('genproto_commonjs_wellknowntypes', function (cb) { + exec('mkdir -p commonjs_out/node_modules/google-protobuf && ' + protoc + ' --js_out=import_style=commonjs,binary:commonjs_out/node_modules/google-protobuf -I ../src ../src/google/protobuf/descriptor.proto', function (err, stdout, stderr) { console.log(stdout); console.log(stderr); @@ -79,7 +88,7 @@ gulp.task('commonjs_testdeps', function (cb) { }); }); -gulp.task('make_commonjs_out', ['dist', 'genproto_commonjs', 'commonjs_asserts', 'commonjs_testdeps'], function (cb) { +gulp.task('make_commonjs_out', ['dist', 'genproto_commonjs', 'genproto_commonjs_wellknowntypes', 'commonjs_asserts', 'commonjs_testdeps'], function (cb) { // TODO(haberman): minify this more aggressively. // Will require proper externs/exports. var cmd = "mkdir -p commonjs_out/binary && mkdir -p commonjs_out/test_node_modules && "; |