Updated Branches: refs/heads/master 6afe0535e -> ed817d010
THRIFT-1735 integrate tutorial into regular build THRIFT-1811 ruby tutorial as part of the regular build Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/ed817d01 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/ed817d01 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/ed817d01 Branch: refs/heads/master Commit: ed817d0102164b9dc35f5a4781f40587ed1b714f Parents: 6afe053 Author: Roger Meier <[email protected]> Authored: Sun Jun 9 23:10:06 2013 +0200 Committer: Roger Meier <[email protected]> Committed: Sun Jun 9 23:10:06 2013 +0200 ---------------------------------------------------------------------- .gitignore | 2 ++ configure.ac | 1 + tutorial/Makefile.am | 2 +- tutorial/rb/Makefile.am | 38 ++++++++++++++++++++++++++++++++++++++ tutorial/rb/RubyClient.rb | 2 +- tutorial/rb/RubyServer.rb | 2 +- 6 files changed, 44 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/ed817d01/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index b9c63dc..be5ced2 100644 --- a/.gitignore +++ b/.gitignore @@ -270,5 +270,7 @@ gen-* /tutorial/py.tornado/Makefile.in /tutorial/py/Makefile /tutorial/py/Makefile.in +/tutorial/rb/Makefile +/tutorial/rb/Makefile.in /ylwrap http://git-wip-us.apache.org/repos/asf/thrift/blob/ed817d01/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index 757922e..ed2ba00 100755 --- a/configure.ac +++ b/configure.ac @@ -629,6 +629,7 @@ AC_CONFIG_FILES([ tutorial/py/Makefile tutorial/py.twisted/Makefile tutorial/py.tornado/Makefile + tutorial/rb/Makefile ]) AC_OUTPUT http://git-wip-us.apache.org/repos/asf/thrift/blob/ed817d01/tutorial/Makefile.am ---------------------------------------------------------------------- diff --git a/tutorial/Makefile.am b/tutorial/Makefile.am index 86c08c0..6ca82ed 100755 --- a/tutorial/Makefile.am +++ b/tutorial/Makefile.am @@ -47,7 +47,7 @@ SUBDIRS += py.tornado endif if WITH_RUBY -#SUBDIRS += rb +SUBDIRS += rb endif if WITH_HASKELL http://git-wip-us.apache.org/repos/asf/thrift/blob/ed817d01/tutorial/rb/Makefile.am ---------------------------------------------------------------------- diff --git a/tutorial/rb/Makefile.am b/tutorial/rb/Makefile.am new file mode 100755 index 0000000..369e903 --- /dev/null +++ b/tutorial/rb/Makefile.am @@ -0,0 +1,38 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +THRIFT = $(top_builddir)/compiler/cpp/thrift + +gen-py/calculator.rb gen-py/shared_service.rb: $(top_srcdir)/tutorial/tutorial.thrift + $(THRIFT) --gen rb -r $< + +all-local: gen-py/calculator.rb + +tutorialserver: all + ${RUBY} RubyServer.rb + +tutorialclient: all + ${RUBY} RubyClient.rb + +clean-local: + $(RM) -r gen-* + +EXTRA_DIST = \ + RubyServer.rb \ + RubyClient.rb http://git-wip-us.apache.org/repos/asf/thrift/blob/ed817d01/tutorial/rb/RubyClient.rb ---------------------------------------------------------------------- diff --git a/tutorial/rb/RubyClient.rb b/tutorial/rb/RubyClient.rb index fd72699..9a5aa43 100755 --- a/tutorial/rb/RubyClient.rb +++ b/tutorial/rb/RubyClient.rb @@ -19,7 +19,7 @@ # under the License. # -$:.push('../gen-rb') +$:.push('gen-rb') $:.unshift '../../lib/rb/lib' require 'thrift' http://git-wip-us.apache.org/repos/asf/thrift/blob/ed817d01/tutorial/rb/RubyServer.rb ---------------------------------------------------------------------- diff --git a/tutorial/rb/RubyServer.rb b/tutorial/rb/RubyServer.rb index 30aa7f2..22cec31 100755 --- a/tutorial/rb/RubyServer.rb +++ b/tutorial/rb/RubyServer.rb @@ -19,7 +19,7 @@ # under the License. # -$:.push('../gen-rb') +$:.push('gen-rb') $:.unshift '../../lib/rb/lib' require 'thrift'
