From ed817d0102164b9dc35f5a4781f40587ed1b714f Mon Sep 17 00:00:00 2001
From: Roger Meier <roger@apache.org>
Date: Sun, 9 Jun 2013 23:10:06 +0200
Subject: [PATCH] THRIFT-1735 integrate tutorial into regular build THRIFT-1811
 ruby tutorial as part of the regular build

---
 .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(-)
 create mode 100755 tutorial/rb/Makefile.am

diff --git a/.gitignore b/.gitignore
index b9c63dca..be5ced21 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
 
diff --git a/configure.ac b/configure.ac
index 757922ed..ed2ba000 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
diff --git a/tutorial/Makefile.am b/tutorial/Makefile.am
index 86c08c06..6ca82ede 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
diff --git a/tutorial/rb/Makefile.am b/tutorial/rb/Makefile.am
new file mode 100755
index 00000000..369e903a
--- /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
diff --git a/tutorial/rb/RubyClient.rb b/tutorial/rb/RubyClient.rb
index fd726995..9a5aa432 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'
diff --git a/tutorial/rb/RubyServer.rb b/tutorial/rb/RubyServer.rb
index 30aa7f21..22cec311 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'
-- 
2.17.1