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 2009/02/17 21:28:47 UTC
svn commit: r745242 - in /incubator/thrift/trunk: lib/py/src/ test/
test/cpp/ test/erl/ test/php/ test/threads/ tutorial/
Author: dreiss
Date: Tue Feb 17 20:28:46 2009
New Revision: 745242
URL: http://svn.apache.org/viewvc?rev=745242&view=rev
Log:
THRIFT-325. Remove a bunch of uses of the old command line format
Modified:
incubator/thrift/trunk/lib/py/src/TSCons.py
incubator/thrift/trunk/test/DenseLinkingTest.thrift
incubator/thrift/trunk/test/DenseProtoTest.cpp
incubator/thrift/trunk/test/ManyTypedefs.thrift
incubator/thrift/trunk/test/ZlibTest.cpp
incubator/thrift/trunk/test/cpp/Makefile.stress
incubator/thrift/trunk/test/cpp/Makefile.thrift
incubator/thrift/trunk/test/erl/Makefile
incubator/thrift/trunk/test/php/Makefile
incubator/thrift/trunk/test/threads/ThreadsTest.thrift
incubator/thrift/trunk/tutorial/shared.thrift
incubator/thrift/trunk/tutorial/tutorial.thrift
Modified: incubator/thrift/trunk/lib/py/src/TSCons.py
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/py/src/TSCons.py?rev=745242&r1=745241&r2=745242&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/py/src/TSCons.py (original)
+++ incubator/thrift/trunk/lib/py/src/TSCons.py Tue Feb 17 20:28:46 2009
@@ -9,7 +9,7 @@
def scons_env(env, add=''):
opath = path.dirname(path.abspath('$TARGET'))
- lstr = 'thrift --cpp -o ' + opath + ' ' + add + ' $SOURCE'
+ lstr = 'thrift --gen cpp -o ' + opath + ' ' + add + ' $SOURCE'
cppbuild = Builder(action = lstr)
env.Append(BUILDERS = {'ThriftCpp' : cppbuild})
Modified: incubator/thrift/trunk/test/DenseLinkingTest.thrift
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/test/DenseLinkingTest.thrift?rev=745242&r1=745241&r2=745242&view=diff
==============================================================================
--- incubator/thrift/trunk/test/DenseLinkingTest.thrift (original)
+++ incubator/thrift/trunk/test/DenseLinkingTest.thrift Tue Feb 17 20:28:46 2009
@@ -1,6 +1,6 @@
/*
-../compiler/cpp/thrift -cpp -dense DebugProtoTest.thrift
-../compiler/cpp/thrift -cpp -dense DenseLinkingTest.thrift
+../compiler/cpp/thrift -gen cpp:dense DebugProtoTest.thrift
+../compiler/cpp/thrift -gen cpp:dense DenseLinkingTest.thrift
g++ -Wall -g -I../lib/cpp/src -I/usr/local/include/boost-1_33_1 \
DebugProtoTest.cpp gen-cpp/DebugProtoTest_types.cpp \
gen-cpp/DenseLinkingTest_types.cpp \
Modified: incubator/thrift/trunk/test/DenseProtoTest.cpp
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/test/DenseProtoTest.cpp?rev=745242&r1=745241&r2=745242&view=diff
==============================================================================
--- incubator/thrift/trunk/test/DenseProtoTest.cpp (original)
+++ incubator/thrift/trunk/test/DenseProtoTest.cpp Tue Feb 17 20:28:46 2009
@@ -1,6 +1,6 @@
/*
-../compiler/cpp/thrift -cpp -dense DebugProtoTest.thrift
-../compiler/cpp/thrift -cpp -dense OptionalRequiredTest.thrift
+../compiler/cpp/thrift --gen cpp:dense DebugProtoTest.thrift
+../compiler/cpp/thrift --gen cpp:dense OptionalRequiredTest.thrift
g++ -Wall -g -I../lib/cpp/src -I/usr/local/include/boost-1_33_1 \
gen-cpp/OptionalRequiredTest_types.cpp \
gen-cpp/DebugProtoTest_types.cpp \
Modified: incubator/thrift/trunk/test/ManyTypedefs.thrift
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/test/ManyTypedefs.thrift?rev=745242&r1=745241&r2=745242&view=diff
==============================================================================
--- incubator/thrift/trunk/test/ManyTypedefs.thrift (original)
+++ incubator/thrift/trunk/test/ManyTypedefs.thrift Tue Feb 17 20:28:46 2009
@@ -3,9 +3,9 @@
/*
rm -rf gen-* orig-*
mkdir old new
-thrift -cpp -java -php -phpi -py -rb -xsd -perl -ocaml -erl -hs -strict ManyTypedefs.thrift
+thrift --gen cpp --gen java --gen php --gen phpi --gen py --gen rb --gen xsd --gen perl --gen ocaml --gen erl --gen hs --strict ManyTypedefs.thrift
mv gen-* old
-../compiler/cpp/thrift -cpp -java -php -phpi -py -rb -xsd -perl -ocaml -erl -hs -strict ManyTypedefs.thrift
+../compiler/cpp/thrift --gen cpp --gen java --gen php --gen phpi --gen py --gen rb --gen xsd --gen perl --gen ocaml --gen erl --gen hs --strict ManyTypedefs.thrift
mv gen-* new
diff -ur old new
rm -rf old new
Modified: incubator/thrift/trunk/test/ZlibTest.cpp
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/test/ZlibTest.cpp?rev=745242&r1=745241&r2=745242&view=diff
==============================================================================
--- incubator/thrift/trunk/test/ZlibTest.cpp (original)
+++ incubator/thrift/trunk/test/ZlibTest.cpp Tue Feb 17 20:28:46 2009
@@ -1,5 +1,5 @@
/*
-thrift -cpp DebugProtoTest.thrift
+thrift --gen cpp DebugProtoTest.thrift
g++ -Wall -g -I../lib/cpp/src -I/usr/local/include/boost-1_33_1 \
ZlibTest.cpp \
../lib/cpp/.libs/libthriftz.a ../lib/cpp/.libs/libthrift.a \
Modified: incubator/thrift/trunk/test/cpp/Makefile.stress
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/test/cpp/Makefile.stress?rev=745242&r1=745241&r2=745242&view=diff
==============================================================================
--- incubator/thrift/trunk/test/cpp/Makefile.stress (original)
+++ incubator/thrift/trunk/test/cpp/Makefile.stress Tue Feb 17 20:28:46 2009
@@ -41,7 +41,7 @@
debug: stress-test-debug stress-test-debug-nb
stubs: ../StressTest.thrift
- $(THRIFT) --cpp --php ../StressTest.thrift
+ $(THRIFT) --gen cpp --gen php ../StressTest.thrift
stress-test-debug-nb: stubs
g++ -o stress-test-nb $(DCFL) src/nb-main.cpp ./gen-cpp/Service.cpp gen-cpp/StressTest_types.cpp
Modified: incubator/thrift/trunk/test/cpp/Makefile.thrift
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/test/cpp/Makefile.thrift?rev=745242&r1=745241&r2=745242&view=diff
==============================================================================
--- incubator/thrift/trunk/test/cpp/Makefile.thrift (original)
+++ incubator/thrift/trunk/test/cpp/Makefile.thrift Tue Feb 17 20:28:46 2009
@@ -41,7 +41,7 @@
debug: server-debug client-debug
stubs: ../ThriftTest.thrift
- $(THRIFT) --cpp ../ThriftTest.thrift
+ $(THRIFT) --gen cpp ../ThriftTest.thrift
server-debug: stubs
g++ -o TestServer $(DCFL) src/TestServer.cpp ./gen-cpp/ThriftTest.cpp ./gen-cpp/ThriftTest_types.cpp
@@ -56,7 +56,7 @@
g++ -o TestClient $(CFL) src/TestClient.cpp ./gen-cpp/ThriftTest.cpp ./gen-cpp/ThriftTest_types.cpp
small:
- $(THRIFT) -cpp ../SmallTest.thrift
+ $(THRIFT) --gen cpp ../SmallTest.thrift
g++ -c $(CCFL) ./gen-cpp/SmallService.cpp ./gen-cpp/SmallTest_types.cpp
clean:
Modified: incubator/thrift/trunk/test/erl/Makefile
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/test/erl/Makefile?rev=745242&r1=745241&r2=745242&view=diff
==============================================================================
--- incubator/thrift/trunk/test/erl/Makefile (original)
+++ incubator/thrift/trunk/test/erl/Makefile Tue Feb 17 20:28:46 2009
@@ -24,8 +24,8 @@
${GENDIR}/: ${RPCFILE}
rm -rf ${GENDIR}
- ${THRIFT} -erl ${TEST_RPCFILE}
- ${THRIFT} -erl ${STRESS_RPCFILE}
+ ${THRIFT} --gen erl ${TEST_RPCFILE}
+ ${THRIFT} --gen erl ${STRESS_RPCFILE}
mkdir -p ${GEN_INCLUDEDIR}
mkdir -p ${GEN_SRCDIR}
mkdir -p ${GEN_TARGETDIR}
Modified: incubator/thrift/trunk/test/php/Makefile
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/test/php/Makefile?rev=745242&r1=745241&r2=745242&view=diff
==============================================================================
--- incubator/thrift/trunk/test/php/Makefile (original)
+++ incubator/thrift/trunk/test/php/Makefile Tue Feb 17 20:28:46 2009
@@ -16,10 +16,10 @@
inline: stubs-inline
stubs: ../ThriftTest.thrift
- $(THRIFT) --phpl ../ThriftTest.thrift
+ $(THRIFT) --gen php ../ThriftTest.thrift
stubs-inline: ../ThriftTest.thrift
- $(THRIFT) --phpi ../ThriftTest.thrift
+ $(THRIFT) --gen php:inlined ../ThriftTest.thrift
clean:
$(RM) -r gen-php gen-phpi
Modified: incubator/thrift/trunk/test/threads/ThreadsTest.thrift
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/test/threads/ThreadsTest.thrift?rev=745242&r1=745241&r2=745242&view=diff
==============================================================================
--- incubator/thrift/trunk/test/threads/ThreadsTest.thrift (original)
+++ incubator/thrift/trunk/test/threads/ThreadsTest.thrift Tue Feb 17 20:28:46 2009
@@ -1,5 +1,3 @@
-#!/usr/local/bin/thrift -cpp -php -perl
-
service ThreadsTest {
i32 threadOne(1: i32 sleep=15),
i32 threadTwo(2: i32 sleep=15),
Modified: incubator/thrift/trunk/tutorial/shared.thrift
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/tutorial/shared.thrift?rev=745242&r1=745241&r2=745242&view=diff
==============================================================================
--- incubator/thrift/trunk/tutorial/shared.thrift (original)
+++ incubator/thrift/trunk/tutorial/shared.thrift Tue Feb 17 20:28:46 2009
@@ -1,5 +1,3 @@
-#!/usr/local/bin/thrift --gen cpp --gen java --gen py --php --xsd --perl
-
/**
* This Thrift file can be included by other Thrift files that want to share
* these definitions.
Modified: incubator/thrift/trunk/tutorial/tutorial.thrift
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/tutorial/tutorial.thrift?rev=745242&r1=745241&r2=745242&view=diff
==============================================================================
--- incubator/thrift/trunk/tutorial/tutorial.thrift (original)
+++ incubator/thrift/trunk/tutorial/tutorial.thrift Tue Feb 17 20:28:46 2009
@@ -1,5 +1,3 @@
-#!/usr/local/bin/thrift --gen cpp --gen java --gen py --php --gen rb --gen perl --erl --xsd -r
-#
# Thrift Tutorial
# Mark Slee (mcslee@facebook.com)
#