diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2016-06-17 11:14:25 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-17 11:14:25 -0700 |
commit | b7560df598f1c7c443b724403fbf102a2bbf75ba (patch) | |
tree | fae04f307b863ff8ce9592708c38fa0c97ee6f9a /js/gulpfile.js | |
parent | 8c20e55c57c90a1a84ac7cf4de96e65911c8212b (diff) | |
parent | 104723fccf4c9f7bf2398073e6b04390dcd2298a (diff) | |
download | protobuf-b7560df598f1c7c443b724403fbf102a2bbf75ba.tar.gz protobuf-b7560df598f1c7c443b724403fbf102a2bbf75ba.tar.bz2 protobuf-b7560df598f1c7c443b724403fbf102a2bbf75ba.zip |
Merge pull request #1696 from haberman/jswkt
JS: import well-known types from google-protobuf package.
Diffstat (limited to 'js/gulpfile.js')
-rw-r--r-- | js/gulpfile.js | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/js/gulpfile.js b/js/gulpfile.js index c5220153..cca99131 100644 --- a/js/gulpfile.js +++ b/js/gulpfile.js @@ -8,6 +8,21 @@ function exec(command, cb) { var protoc = process.env.PROTOC || '../src/protoc'; +var wellKnownTypes = [ + '../src/google/protobuf/any.proto', + '../src/google/protobuf/api.proto', + '../src/google/protobuf/compiler/plugin.proto', + '../src/google/protobuf/descriptor.proto', + '../src/google/protobuf/duration.proto', + '../src/google/protobuf/empty.proto', + '../src/google/protobuf/field_mask.proto', + '../src/google/protobuf/source_context.proto', + '../src/google/protobuf/struct.proto', + '../src/google/protobuf/timestamp.proto', + '../src/google/protobuf/type.proto', + '../src/google/protobuf/wrappers.proto', +]; + gulp.task('genproto_closure', function (cb) { exec(protoc + ' --js_out=library=testproto_libs,binary:. -I ../src -I . *.proto ../src/google/protobuf/descriptor.proto', function (err, stdout, stderr) { @@ -26,7 +41,25 @@ gulp.task('genproto_commonjs', function (cb) { }); }); -gulp.task('dist', 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', + function (err, stdout, stderr) { + console.log(stdout); + console.log(stderr); + cb(err); + }); +}); + +gulp.task('genproto_wellknowntypes', function (cb) { + exec(protoc + ' --js_out=import_style=commonjs,binary:. -I ../src ' + wellKnownTypes.join(' '), + function (err, stdout, stderr) { + console.log(stdout); + console.log(stderr); + cb(err); + }); +}); + +gulp.task('dist', ['genproto_wellknowntypes'], function (cb) { // TODO(haberman): minify this more aggressively. // Will require proper externs/exports. exec('./node_modules/google-closure-library/closure/bin/calcdeps.py -i message.js -i binary/reader.js -i binary/writer.js -i commonjs/export.js -p . -p node_modules/google-closure-library/closure -o compiled --compiler_jar node_modules/google-closure-compiler/compiler.jar > google-protobuf.js', @@ -55,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 && "; |