| Index: third_party/grpc/tools/distrib/build_ruby_environment_macos.sh
|
| diff --git a/third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py b/third_party/grpc/tools/distrib/build_ruby_environment_macos.sh
|
| old mode 100644
|
| new mode 100755
|
| similarity index 62%
|
| copy from third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py
|
| copy to third_party/grpc/tools/distrib/build_ruby_environment_macos.sh
|
| index 429f58186e3fce43dc21e81e0f9d7e20c7e0bf70..ff3a388eaf6babacc2ae95e7123ac7b9d289b437
|
| --- a/third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py
|
| +++ b/third_party/grpc/tools/distrib/build_ruby_environment_macos.sh
|
| @@ -1,4 +1,5 @@
|
| -# Copyright 2010, Google Inc.
|
| +#!/bin/bash
|
| +# Copyright 2015-2016, Google Inc.
|
| # All rights reserved.
|
| #
|
| # Redistribution and use in source and binary forms, with or without
|
| @@ -27,20 +28,34 @@
|
| # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
| +set -ex
|
|
|
| -from mod_pywebsocket import msgutil
|
| +rm -rf ~/.rake-compiler
|
|
|
| +CROSS_RUBY=`mktemp tmpfile.XXXXXXXX`
|
|
|
| -_GOODBYE_MESSAGE = 'Goodbye'
|
| +curl https://raw.githubusercontent.com/rake-compiler/rake-compiler/v0.9.5/tasks/bin/cross-ruby.rake > $CROSS_RUBY
|
|
|
| +patch $CROSS_RUBY << EOF
|
| +--- cross-ruby.rake 2016-02-05 16:26:53.000000000 -0800
|
| ++++ cross-ruby.rake.patched 2016-02-05 16:27:33.000000000 -0800
|
| +@@ -133,7 +133,8 @@
|
| + "--host=#{MINGW_HOST}",
|
| + "--target=#{MINGW_TARGET}",
|
| + "--build=#{RUBY_BUILD}",
|
| +- '--enable-shared',
|
| ++ '--enable-static',
|
| ++ '--disable-shared',
|
| + '--disable-install-doc',
|
| + '--without-tk',
|
| + '--without-tcl'
|
| +EOF
|
|
|
| -def web_socket_do_extra_handshake(request):
|
| - pass # Always accept.
|
| +MAKE="make -j8"
|
|
|
| +for v in 2.3.0 2.2.2 2.1.5 2.0.0-p645 ; do
|
| + rake -f $CROSS_RUBY cross-ruby VERSION=$v HOST=x86_64-darwin11
|
| +done
|
|
|
| -def web_socket_transfer_data(request):
|
| - while True:
|
| - line = msgutil.receive_message(request)
|
| - msgutil.send_message(request, line)
|
| - if line == _GOODBYE_MESSAGE:
|
| - return
|
| +sed 's/x86_64-darwin-11/universal-darwin/' ~/.rake-compiler/config.yml > $CROSS_RUBY
|
| +mv $CROSS_RUBY ~/.rake-compiler/config.yml
|
|
|