Skip to content

Commit

Permalink
THRIFT-217. Use "--gen py" instead of "-py" in build scripts
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@722333 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
dreiss committed Dec 2, 2008
1 parent 47f2404 commit 2a7f6f8
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion if/regen.sh
@@ -1,6 +1,6 @@
#!/bin/sh
cd "`dirname $0`"
../compiler/cpp/thrift -cpp -py reflection_limited.thrift
../compiler/cpp/thrift --gen cpp --gen py reflection_limited.thrift
cp gen-cpp/reflection_limited_types.h ../lib/cpp/src/
cp gen-cpp/reflection_limited_types.cpp ../lib/cpp/src/
cp -r gen-py/thrift/reflection ../lib/py/src
2 changes: 1 addition & 1 deletion test/FastbinaryTest.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
r"""
thrift -py DebugProtoTest.thrift
thrift --gen py DebugProtoTest.thrift
./FastbinaryTest.py
"""

Expand Down
2 changes: 1 addition & 1 deletion test/py/Makefile.am
Expand Up @@ -21,7 +21,7 @@ TESTS= $(py_unit_tests)


gen-py/ThriftTest/__init__.py: ../ThriftTest.thrift
$(THRIFT) -py $<
$(THRIFT) --gen py $<

clean-local:
$(RM) -r gen-py
6 changes: 3 additions & 3 deletions test/py/explicit_module/runtest.sh
@@ -1,13 +1,13 @@
#!/bin/bash

rm -rf gen-py
../../../compiler/cpp/thrift -py test1.thrift || exit 1
../../../compiler/cpp/thrift -py test2.thrift || exit 1
../../../compiler/cpp/thrift --gen py test1.thrift || exit 1
../../../compiler/cpp/thrift --gen py test2.thrift || exit 1
PYTHONPATH=./gen-py python -c 'import foo.bar.baz' || exit 1
PYTHONPATH=./gen-py python -c 'import test2' || exit 1
PYTHONPATH=./gen-py python -c 'import test1' &>/dev/null && exit 1 # Should fail.
cp -r gen-py simple
../../../compiler/cpp/thrift -r -py test2.thrift || exit 1
../../../compiler/cpp/thrift -r --gen py test2.thrift || exit 1
PYTHONPATH=./gen-py python -c 'import test2' || exit 1
diff -ur simple gen-py > thediffs
file thediffs | grep -s -q empty || exit 1
Expand Down
2 changes: 1 addition & 1 deletion test/threads/Makefile
Expand Up @@ -37,7 +37,7 @@ CFL = $(CCFL) $(LFL)
all: server client

stubs: ThreadsTest.thrift
$(THRIFT) -cpp -py ThreadsTest.thrift
$(THRIFT) --gen cpp --gen py ThreadsTest.thrift

server: stubs
g++ -o ThreadsServer $(CFL) ThreadsServer.cpp ./gen-cpp/ThreadsTest.cpp ./gen-cpp/ThreadsTest_types.cpp
Expand Down

0 comments on commit 2a7f6f8

Please sign in to comment.