diff options
author | Alistair Veitch <aveitch@google.com> | 2016-07-21 17:29:04 -0700 |
---|---|---|
committer | Alistair Veitch <aveitch@google.com> | 2016-07-21 17:29:04 -0700 |
commit | 3abd27e5312540e2efd63e94ca024a2e8d42af39 (patch) | |
tree | 9d580b71d6e81fd42f7ef9cb72e6b74321a9b55e /tools/run_tests/build_package_ruby.sh | |
parent | ef1c860197742c87819070e6906b96d1e42451b3 (diff) | |
parent | b8e26c021718758c2a0b2e73757580476d995498 (diff) |
merge to upstream/master
Diffstat (limited to 'tools/run_tests/build_package_ruby.sh')
-rwxr-xr-x | tools/run_tests/build_package_ruby.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/run_tests/build_package_ruby.sh b/tools/run_tests/build_package_ruby.sh index e44428bf7e..0a755bddb0 100755 --- a/tools/run_tests/build_package_ruby.sh +++ b/tools/run_tests/build_package_ruby.sh @@ -40,6 +40,8 @@ mkdir -p artifacts/ # and we only collect them here to deliver them to the distribtest phase. cp -r $EXTERNAL_GIT_ROOT/architecture={x86,x64},language=ruby,platform={windows,linux,macos}/artifacts/* artifacts/ || true +well_known_protos=( any api compiler/plugin descriptor duration empty field_mask source_context struct timestamp type wrappers ) + # TODO: all the artifact builder configurations generate a grpc-VERSION.gem # source distribution package, and only one of them will end up # in the artifacts/ directory. They should be all equivalent though. @@ -56,9 +58,13 @@ for arch in {x86,x64}; do for plat in {windows,linux,macos}; do input_dir="$EXTERNAL_GIT_ROOT/architecture=$arch,language=protoc,platform=$plat/artifacts" output_dir="$base/src/ruby/tools/bin/${ruby_arch}-${plat}" - mkdir -p $output_dir + mkdir -p $output_dir/google/protobuf + mkdir -p $output_dir/google/protobuf/compiler # needed for plugin.proto cp $input_dir/protoc* $output_dir/ cp $input_dir/grpc_ruby_plugin* $output_dir/ + for proto in "${well_known_protos[@]}"; do + cp $base/third_party/protobuf/src/google/protobuf/$proto.proto $output_dir/google/protobuf/$proto.proto + done done done |