Updated Branches: refs/heads/master 194f0114c -> 507740c93
Thrift-2184: undefined method rspec_verify for Thrift::MemoryBufferTransport Client: rb Patch: jfarrell | Nevo Hed Updates ruby checks to require bundler and uses bundle exec to ensure the required rake version. Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/507740c9 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/507740c9 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/507740c9 Branch: refs/heads/master Commit: 507740c93c795b9d1f927909456962ec64f67b65 Parents: 194f011 Author: jfarrell <[email protected]> Authored: Wed Jan 22 22:20:21 2014 -0500 Committer: jfarrell <[email protected]> Committed: Wed Jan 22 22:20:21 2014 -0500 ---------------------------------------------------------------------- configure.ac | 3 +-- lib/rb/Makefile.am | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/507740c9/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index 593b66c..7d9a82e 100755 --- a/configure.ac +++ b/configure.ac @@ -232,9 +232,8 @@ AX_THRIFT_LIB(ruby, [Ruby], yes) have_ruby=no if test "$with_ruby" = "yes"; then AC_PATH_PROG([RUBY], [ruby]) - AC_PATH_PROG([RAKE], [rake]) AC_PATH_PROG([BUNDLER], [bundle]) - if test "x$RUBY" != "x" -a "x$RAKE" != "x"; then + if test "x$RUBY" != "x" -a "x$BUNDLER" != "x"; then have_ruby="yes" fi fi http://git-wip-us.apache.org/repos/asf/thrift/blob/507740c9/lib/rb/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/rb/Makefile.am b/lib/rb/Makefile.am index 091c67f..300f676 100755 --- a/lib/rb/Makefile.am +++ b/lib/rb/Makefile.am @@ -29,21 +29,21 @@ EXTRA_DIST = \ DESTDIR ?= / -all-local: if HAVE_BUNDLER + +all-local: $(BUNDLER) install $(BUNDLER) exec rake -endif install-exec-hook: - $(RAKE) install + $(BUNDLER) exec rake install clean-local: - $(RAKE) clean + $(BUNDLER) exec rake clean check-local: all -if HAVE_BUNDLER $(BUNDLER) install $(BUNDLER) exec rake + endif
