You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by dr...@apache.org on 2008/12/02 03:11:13 UTC
svn commit: r722333 - in /incubator/thrift/trunk: if/regen.sh
test/FastbinaryTest.py test/py/Makefile.am
test/py/explicit_module/runtest.sh test/threads/Makefile
Author: dreiss
Date: Mon Dec 1 18:11:13 2008
New Revision: 722333
URL: http://svn.apache.org/viewvc?rev=722333&view=rev
Log:
THRIFT-217. Use "--gen py" instead of "-py" in build scripts
Modified:
incubator/thrift/trunk/if/regen.sh
incubator/thrift/trunk/test/FastbinaryTest.py
incubator/thrift/trunk/test/py/Makefile.am
incubator/thrift/trunk/test/py/explicit_module/runtest.sh
incubator/thrift/trunk/test/threads/Makefile
Modified: incubator/thrift/trunk/if/regen.sh
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/if/regen.sh?rev=722333&r1=722332&r2=722333&view=diff
==============================================================================
--- incubator/thrift/trunk/if/regen.sh (original)
+++ incubator/thrift/trunk/if/regen.sh Mon Dec 1 18:11:13 2008
@@ -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
Modified: incubator/thrift/trunk/test/FastbinaryTest.py
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/test/FastbinaryTest.py?rev=722333&r1=722332&r2=722333&view=diff
==============================================================================
--- incubator/thrift/trunk/test/FastbinaryTest.py (original)
+++ incubator/thrift/trunk/test/FastbinaryTest.py Mon Dec 1 18:11:13 2008
@@ -1,6 +1,6 @@
#!/usr/bin/env python
r"""
-thrift -py DebugProtoTest.thrift
+thrift --gen py DebugProtoTest.thrift
./FastbinaryTest.py
"""
Modified: incubator/thrift/trunk/test/py/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/test/py/Makefile.am?rev=722333&r1=722332&r2=722333&view=diff
==============================================================================
--- incubator/thrift/trunk/test/py/Makefile.am (original)
+++ incubator/thrift/trunk/test/py/Makefile.am Mon Dec 1 18:11:13 2008
@@ -21,7 +21,7 @@
gen-py/ThriftTest/__init__.py: ../ThriftTest.thrift
- $(THRIFT) -py $<
+ $(THRIFT) --gen py $<
clean-local:
$(RM) -r gen-py
Modified: incubator/thrift/trunk/test/py/explicit_module/runtest.sh
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/test/py/explicit_module/runtest.sh?rev=722333&r1=722332&r2=722333&view=diff
==============================================================================
--- incubator/thrift/trunk/test/py/explicit_module/runtest.sh (original)
+++ incubator/thrift/trunk/test/py/explicit_module/runtest.sh Mon Dec 1 18:11:13 2008
@@ -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
Modified: incubator/thrift/trunk/test/threads/Makefile
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/test/threads/Makefile?rev=722333&r1=722332&r2=722333&view=diff
==============================================================================
--- incubator/thrift/trunk/test/threads/Makefile (original)
+++ incubator/thrift/trunk/test/threads/Makefile Mon Dec 1 18:11:13 2008
@@ -37,7 +37,7 @@
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