diff options
| author | Adam Cozzette <acozzette@gmail.com> | 2016-11-22 08:48:41 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-22 08:48:41 -0800 |
| commit | 72002d8898b39e8ba71c04a13e08cd227542b8e4 (patch) | |
| tree | 93937dcae5143d2f729a23ef49a4ce4468499b7e /js/gulpfile.js | |
| parent | 04bd6147113f2ef2784aa800b5f7788dd5ef34a5 (diff) | |
| parent | fda876a1492fcd7120c66abac1b47a9361f928df (diff) | |
| download | protobuf-72002d8898b39e8ba71c04a13e08cd227542b8e4.tar.gz protobuf-72002d8898b39e8ba71c04a13e08cd227542b8e4.tar.bz2 protobuf-72002d8898b39e8ba71c04a13e08cd227542b8e4.zip | |
Merge pull request #2400 from acozzette/jspb-test-fixes
Fixed JSPB test failures
Diffstat (limited to 'js/gulpfile.js')
| -rw-r--r-- | js/gulpfile.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/gulpfile.js b/js/gulpfile.js index cca99131..5f1b1d93 100644 --- a/js/gulpfile.js +++ b/js/gulpfile.js @@ -24,7 +24,7 @@ var wellKnownTypes = [ ]; gulp.task('genproto_closure', function (cb) { - exec(protoc + ' --js_out=library=testproto_libs,binary:. -I ../src -I . *.proto ../src/google/protobuf/descriptor.proto', + exec(protoc + ' --js_out=library=testproto_libs,binary:. -I ../src -I . *.proto && ' + protoc + ' --js_out=one_output_file_per_input_file,binary:. -I ../src -I . ' + wellKnownTypes.join(' '), function (err, stdout, stderr) { console.log(stdout); console.log(stderr); @@ -33,7 +33,7 @@ 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', + exec('mkdir -p commonjs_out && ' + protoc + ' --js_out=import_style=commonjs,binary:commonjs_out -I ../src -I commonjs -I . *.proto commonjs/test*/*.proto ' + wellKnownTypes.join(' '), function (err, stdout, stderr) { console.log(stdout); console.log(stderr); @@ -42,7 +42,7 @@ gulp.task('genproto_commonjs', function (cb) { }); 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', + exec('mkdir -p commonjs_out/node_modules/google-protobuf && ' + protoc + ' --js_out=import_style=commonjs,binary:commonjs_out/node_modules/google-protobuf -I ../src ' + wellKnownTypes.join(' '), function (err, stdout, stderr) { console.log(stdout); console.log(stderr); |