From: Roger Meier Date: Fri, 26 Oct 2012 21:46:18 +0000 (+0000) Subject: THRIFT-1735 integrate tutorial into regular build X-Git-Tag: 0.9.1~249 X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=1d66d061b7c513d3e50ad1f3ed346437d213f6d1;p=common%2Fthrift.git THRIFT-1735 integrate tutorial into regular build python and python twisted git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1402680 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/configure.ac b/configure.ac index 50e68968..123c52b1 100755 --- a/configure.ac +++ b/configure.ac @@ -615,6 +615,8 @@ AC_CONFIG_FILES([ tutorial/cpp/Makefile tutorial/java/Makefile tutorial/js/Makefile + tutorial/py/Makefile + tutorial/py.twisted/Makefile ]) AC_OUTPUT diff --git a/tutorial/Makefile.am b/tutorial/Makefile.am index aadc60e2..169a2c1e 100755 --- a/tutorial/Makefile.am +++ b/tutorial/Makefile.am @@ -41,8 +41,8 @@ if WITH_PHP endif if WITH_PYTHON -#SUBDIRS += py -#SUBDIRS += py.twisted +SUBDIRS += py +SUBDIRS += py.twisted endif if WITH_RUBY diff --git a/tutorial/py.twisted/Makefile.am b/tutorial/py.twisted/Makefile.am new file mode 100755 index 00000000..1973000e --- /dev/null +++ b/tutorial/py.twisted/Makefile.am @@ -0,0 +1,35 @@ +# +# 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/tutorial/Calculator.py gen-py/shared/SharedService.py: $(top_srcdir)/tutorial/tutorial.thrift + $(THRIFT) --gen py:twisted -r $< + +all-local: gen-py/tutorial/Calculator.py + +tutorialserver: all + ${PYTHON} PythonServer.py + +tutorialclient: all + ${PYTHON} PythonClient.py + +EXTRA_DIST = \ + PythonServer.py \ + PythonClient.py diff --git a/tutorial/py.twisted/PythonClient.py b/tutorial/py.twisted/PythonClient.py index 351c7f22..9e086f04 100755 --- a/tutorial/py.twisted/PythonClient.py +++ b/tutorial/py.twisted/PythonClient.py @@ -19,8 +19,9 @@ # under the License. # -import sys -sys.path.append('../gen-py.twisted') +import sys, glob +sys.path.append('gen-py.twisted') +sys.path.insert(0, glob.glob('../../lib/py/build/lib.*')[0]) from tutorial import Calculator from tutorial.ttypes import * diff --git a/tutorial/py.twisted/PythonServer.py b/tutorial/py.twisted/PythonServer.py index 6130b92d..f023cacb 100755 --- a/tutorial/py.twisted/PythonServer.py +++ b/tutorial/py.twisted/PythonServer.py @@ -19,8 +19,9 @@ # under the License. # -import sys -sys.path.append('../gen-py.twisted') +import sys, glob +sys.path.append('gen-py.twisted') +sys.path.insert(0, glob.glob('../../lib/py/build/lib.*')[0]) from tutorial import Calculator from tutorial.ttypes import * diff --git a/tutorial/py.twisted/PythonServer.tac b/tutorial/py.twisted/PythonServer.tac index 11f0f8fd..1d0b6c4b 100755 --- a/tutorial/py.twisted/PythonServer.tac +++ b/tutorial/py.twisted/PythonServer.tac @@ -22,8 +22,9 @@ from twisted.application import internet, service from thrift.transport import TTwisted -import sys -sys.path.append('../gen-py.twisted') +import sys, glob +sys.path.append('gen-py.twisted') +sys.path.insert(0, glob.glob('../../lib/py/build/lib.*')[0]) from tutorial import Calculator from tutorial.ttypes import * from PythonServer import CalculatorHandler diff --git a/tutorial/py/Makefile.am b/tutorial/py/Makefile.am new file mode 100755 index 00000000..a5599e57 --- /dev/null +++ b/tutorial/py/Makefile.am @@ -0,0 +1,35 @@ +# +# 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/tutorial/Calculator.py gen-py/shared/SharedService.py: $(top_srcdir)/tutorial/tutorial.thrift + $(THRIFT) --gen py -r $< + +all-local: gen-py/tutorial/Calculator.py + +tutorialserver: all + ${PYTHON} PythonServer.py + +tutorialclient: all + ${PYTHON} PythonClient.py + +EXTRA_DIST = \ + PythonServer.py \ + PythonClient.py diff --git a/tutorial/py/PythonClient.py b/tutorial/py/PythonClient.py index 916e9157..0554ee12 100755 --- a/tutorial/py/PythonClient.py +++ b/tutorial/py/PythonClient.py @@ -19,8 +19,9 @@ # under the License. # -import sys -sys.path.append('../gen-py') +import sys, glob +sys.path.append('gen-py') +sys.path.insert(0, glob.glob('../../lib/py/build/lib.*')[0]) from tutorial import Calculator from tutorial.ttypes import * diff --git a/tutorial/py/PythonServer.py b/tutorial/py/PythonServer.py index cf2aab2e..014a12e3 100755 --- a/tutorial/py/PythonServer.py +++ b/tutorial/py/PythonServer.py @@ -19,8 +19,9 @@ # under the License. # -import sys -sys.path.append('../gen-py') +import sys, glob +sys.path.append('gen-py') +sys.path.insert(0, glob.glob('../../lib/py/build/lib.*')[0]) from tutorial import Calculator from tutorial.ttypes import *