diff options
author | Roger Meier <roger@apache.org> | 2012-10-26 21:46:18 +0000 |
---|---|---|
committer | Roger Meier <roger@apache.org> | 2012-10-26 21:46:18 +0000 |
commit | 1d66d061b7c513d3e50ad1f3ed346437d213f6d1 (patch) | |
tree | baf0c8edce09c77913371ef0aa68966beed85b88 /tutorial/py | |
parent | ccfedcb64396a630c6233a521b2719c7b4a032f7 (diff) | |
download | thrift-1d66d061b7c513d3e50ad1f3ed346437d213f6d1.tar.gz |
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
Diffstat (limited to 'tutorial/py')
-rwxr-xr-x | tutorial/py/Makefile.am | 35 | ||||
-rwxr-xr-x | tutorial/py/PythonClient.py | 5 | ||||
-rwxr-xr-x | tutorial/py/PythonServer.py | 5 |
3 files changed, 41 insertions, 4 deletions
diff --git a/tutorial/py/Makefile.am b/tutorial/py/Makefile.am new file mode 100755 index 000000000..a5599e574 --- /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 916e91570..0554ee129 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 cf2aab2e4..014a12e35 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 * |