THRIFT-2768: Whitespace Fixup Client: General (Makefile.am, *.thrift) Patch: Jens Geyer
DocTest.thrift has NOT been changed, the trailing whitespaces are part of the test case. Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/aaa8947f Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/aaa8947f Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/aaa8947f Branch: refs/heads/master Commit: aaa8947f3a149d38dd4bfd395573860c2f18ea93 Parents: d5436f5 Author: Jens Geyer <[email protected]> Authored: Fri Oct 3 20:22:28 2014 +0200 Committer: Jens Geyer <[email protected]> Committed: Fri Oct 3 20:30:38 2014 +0200 ---------------------------------------------------------------------- Makefile.am | 34 ++--- compiler/cpp/Makefile.am | 2 +- contrib/Rebus/sample.thrift | 12 +- contrib/fb303/cpp/Makefile.am | 2 +- contrib/fb303/py/Makefile.am | 12 +- lib/Makefile.am | 18 +-- lib/c_glib/test/Makefile.am | 58 ++++---- lib/cpp/Makefile.am | 2 +- lib/cpp/test/Makefile.am | 178 ++++++++++++------------ lib/d/Makefile.am | 52 +++---- lib/d/test/Makefile.am | 42 +++--- lib/erl/Makefile.am | 52 +++---- lib/go/Makefile.am | 16 +-- lib/go/test/GoTagTest.thrift | 4 +- lib/go/test/Makefile.am | 88 ++++++------ lib/go/test/MultiplexedProtocolTest.thrift | 4 +- lib/go/test/OnewayTest.thrift | 6 +- lib/go/test/ServicesTest.thrift | 110 +++++++-------- lib/hs/Makefile.am | 10 +- lib/java/Makefile.am | 22 +-- lib/js/test/Makefile.am | 6 +- lib/lua/Makefile.am | 32 ++--- lib/nodejs/Makefile.am | 18 +-- lib/nodejs/examples/user.thrift | 2 +- lib/perl/Makefile.am | 48 +++---- lib/perl/test/Makefile.am | 4 +- lib/php/Makefile.am | 2 +- lib/php/test/Makefile.am | 32 ++--- lib/php/test/TestValidators.thrift | 10 +- lib/py/Makefile.am | 16 +-- lib/rb/Makefile.am | 30 ++-- test/AnnotationTest.thrift | 2 +- test/DebugProtoTest.thrift | 6 +- test/Makefile.am | 74 +++++----- test/NameConflictTest.thrift | 30 ++-- test/Recursive.thrift | 4 +- test/ThriftTest.thrift | 42 +++--- test/c_glib/Makefile.am | 44 +++--- test/cpp/Makefile.am | 96 ++++++------- test/erl/Makefile.am | 18 +-- test/go/Makefile.am | 32 ++--- test/hs/Makefile.am | 30 ++-- test/perl/Makefile.am | 4 +- test/php/Makefile.am | 8 +- test/py.tornado/Makefile.am | 8 +- test/py.twisted/Makefile.am | 8 +- test/py/Makefile.am | 28 ++-- test/rb/Makefile.am | 8 +- tutorial/Makefile.am | 26 ++-- tutorial/c_glib/Makefile.am | 48 +++---- tutorial/cpp/Makefile.am | 52 +++---- tutorial/go/Makefile.am | 38 ++--- tutorial/hs/Makefile.am | 16 +-- tutorial/java/Makefile.am | 20 +-- tutorial/js/Makefile.am | 16 +-- tutorial/nodejs/Makefile.am | 20 +-- tutorial/py.tornado/Makefile.am | 12 +- tutorial/py.twisted/Makefile.am | 14 +- tutorial/py/Makefile.am | 12 +- tutorial/rb/Makefile.am | 12 +- 60 files changed, 826 insertions(+), 826 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/Makefile.am ---------------------------------------------------------------------- diff --git a/Makefile.am b/Makefile.am index 26ddab6..04cd63b 100755 --- a/Makefile.am +++ b/Makefile.am @@ -30,27 +30,27 @@ SUBDIRS += tutorial endif dist-hook: - find $(distdir) -type f \( -iname ".DS_Store" -or -iname "._*" -or -iname ".gitignore" \) | xargs rm -rf - find $(distdir) -type d \( -iname ".deps" -or -iname ".libs" \) | xargs rm -rf - find $(distdir) -type d \( -iname ".svn" -or -iname ".git" \) | xargs rm -rf + find $(distdir) -type f \( -iname ".DS_Store" -or -iname "._*" -or -iname ".gitignore" \) | xargs rm -rf + find $(distdir) -type d \( -iname ".deps" -or -iname ".libs" \) | xargs rm -rf + find $(distdir) -type d \( -iname ".svn" -or -iname ".git" \) | xargs rm -rf print-version: - @echo $(VERSION) + @echo $(VERSION) cross: check - sh test/test.sh + sh test/test.sh EXTRA_DIST = \ - .travis.yml \ - bower.json \ - composer.json \ - contrib \ - debian \ - doc \ - doap.rdf \ - sonar-project.properties \ - LICENSE \ - CHANGES \ - NOTICE \ - README.md + .travis.yml \ + bower.json \ + composer.json \ + contrib \ + debian \ + doc \ + doap.rdf \ + sonar-project.properties \ + LICENSE \ + CHANGES \ + NOTICE \ + README.md http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/compiler/cpp/Makefile.am ---------------------------------------------------------------------- diff --git a/compiler/cpp/Makefile.am b/compiler/cpp/Makefile.am index 601fd32..00b027d 100644 --- a/compiler/cpp/Makefile.am +++ b/compiler/cpp/Makefile.am @@ -112,6 +112,6 @@ EXTRA_DIST = \ $(WINDOWS_DIST) clean-local: - $(RM) thriftl.cc thrifty.cc thrifty.h thrifty.hh version.h windows/version.h + $(RM) thriftl.cc thrifty.cc thrifty.h thrifty.hh version.h windows/version.h src/main.cc: version.h http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/contrib/Rebus/sample.thrift ---------------------------------------------------------------------- diff --git a/contrib/Rebus/sample.thrift b/contrib/Rebus/sample.thrift index fe1d21a..785e2d3 100644 --- a/contrib/Rebus/sample.thrift +++ b/contrib/Rebus/sample.thrift @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ - + service BasicMathServer { - oneway void DoTheMath( 1: i32 arg1, 2: i32 arg2) - oneway void Ping(1: i64 value) + oneway void DoTheMath( 1: i32 arg1, 2: i32 arg2) + oneway void Ping(1: i64 value) } service BasicMathClient { - oneway void ThreeResults( 1 : i32 added, 2 : i32 multiplied, 3 : i32 subtracted); - oneway void FourResults( 1 : i32 added, 2 : i32 multiplied, 3 : i32 subtracted, 4 : i32 divided); - oneway void Pong(1: i64 value) + oneway void ThreeResults( 1 : i32 added, 2 : i32 multiplied, 3 : i32 subtracted); + oneway void FourResults( 1 : i32 added, 2 : i32 multiplied, 3 : i32 subtracted, 4 : i32 divided); + oneway void Pong(1: i64 value) } http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/contrib/fb303/cpp/Makefile.am ---------------------------------------------------------------------- diff --git a/contrib/fb303/cpp/Makefile.am b/contrib/fb303/cpp/Makefile.am index 748d329..bb1cb60 100644 --- a/contrib/fb303/cpp/Makefile.am +++ b/contrib/fb303/cpp/Makefile.am @@ -38,7 +38,7 @@ endif AM_CPPFLAGS = -I.. AM_CPPFLAGS += -Igen-cpp -AM_CPPFLAGS += -I$(thrift_home)/include/thrift +AM_CPPFLAGS += -I$(thrift_home)/include/thrift AM_CPPFLAGS += $(BOOST_CPPFLAGS) AM_CPPFLAGS += $(FB_CPPFLAGS) $(DEBUG_CPPFLAGS) http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/contrib/fb303/py/Makefile.am ---------------------------------------------------------------------- diff --git a/contrib/fb303/py/Makefile.am b/contrib/fb303/py/Makefile.am index 060495e..dc8c037 100644 --- a/contrib/fb303/py/Makefile.am +++ b/contrib/fb303/py/Makefile.am @@ -23,22 +23,22 @@ EXTRA_DIST = setup.py src all: all-local: - $(thrift_home)/bin/thrift --gen py $(top_srcdir)/if/fb303.thrift - mv gen-py/fb303/* fb303 - $(PYTHON) setup.py build + $(thrift_home)/bin/thrift --gen py $(top_srcdir)/if/fb303.thrift + mv gen-py/fb303/* fb303 + $(PYTHON) setup.py build # We're ignoring prefix here because site-packages seems to be # the equivalent of /usr/local/lib in Python land. # Old version (can't put inline because it's not portable). #$(PYTHON) setup.py install --prefix=$(prefix) --root=$(DESTDIR) $(PYTHON_SETUPUTIL_ARGS) install-exec-hook: - $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(PY_PREFIX) $(PYTHON_SETUPUTIL_ARGS) + $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(PY_PREFIX) $(PYTHON_SETUPUTIL_ARGS) -clean: clean-local +clean: clean-local clean-local: - $(RM) -r build + $(RM) -r build check-local: all http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/lib/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/Makefile.am b/lib/Makefile.am index 5751a2c..ee919b4 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -81,12 +81,12 @@ endif # All of the libs that don't use Automake need to go in here # so they will end up in our release tarballs. EXTRA_DIST = \ - as3 \ - cocoa \ - d \ - delphi \ - javame \ - js \ - ocaml \ - st \ - ts + as3 \ + cocoa \ + d \ + delphi \ + javame \ + js \ + ocaml \ + st \ + ts http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/lib/c_glib/test/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/c_glib/test/Makefile.am b/lib/c_glib/test/Makefile.am index 72d0f64..e106bb1 100755 --- a/lib/c_glib/test/Makefile.am +++ b/lib/c_glib/test/Makefile.am @@ -159,16 +159,16 @@ libtestgencpp_la_CPPFLAGS = -I../../cpp/src $(BOOST_CPPFLAGS) -I./gen-cpp THRIFT = $(top_builddir)/compiler/cpp/thrift gen-c_glib/t_test_debug_proto_test_types.c gen-c_glib/t_test_debug_proto_test_types.h gen-c_glib/t_test_empty_service.c gen-c_glib/t_test_empty_service.h gen-c_glib/t_test_inherited.c gen-c_glib/t_test_inherited.h gen-c_glib/t_test_reverse_order_service.c gen-c_glib/t_test_reverse_order_service.h gen-c_glib/t_test_service_for_exception_with_a_map.c gen-c_glib/t_test_service_for_exception_with_a_map.h gen-c_glib/t_test_srv.c gen-c_glib/t_test_srv.h: ../../../test/DebugProtoTest.thrift - $(THRIFT) --gen c_glib $< + $(THRIFT) --gen c_glib $< gen-c_glib/t_test_optional_required_test_types.c gen-c_glib/t_test_optional_required_test_types.h: ../../../test/OptionalRequiredTest.thrift - $(THRIFT) --gen c_glib $< + $(THRIFT) --gen c_glib $< gen-c_glib/t_test_second_service.c gen-c_glib/t_test_thrift_test.c gen-c_glib/t_test_thrift_test_types.c gen-c_glib/t_test_second_service.h gen-c_glib/t_test_thrift_test-.h gen-c_glib/t_test_thrift_test_types.h: ../../../test/ThriftTest.thrift - $(THRIFT) --gen c_glib $< + $(THRIFT) --gen c_glib $< gen-cpp/ThriftTest.cpp gen-cpp/ThriftTest.h: ../../../test/ThriftTest.thrift - $(THRIFT) --gen cpp $< + $(THRIFT) --gen cpp $< TESTS = \ $(check_PROGRAMS) \ @@ -191,39 +191,39 @@ VALGRIND_LEAK_OPTS = --tool=memcheck \ ${myextravalgrindleakopts} memcheck: $(check_PROGRAMS) - @for x in $(check_PROGRAMS); \ - do \ - $(MAKE) memcheck-$$x; \ - done + @for x in $(check_PROGRAMS); \ + do \ + $(MAKE) memcheck-$$x; \ + done leakcheck: $(check_PROGRAMS) - @for x in $(check_PROGRAMS); \ - do \ - $(MAKE) leakcheck-$$x; \ - done + @for x in $(check_PROGRAMS); \ + do \ + $(MAKE) leakcheck-$$x; \ + done memcheck-%: % - @echo "*****************************************"; \ - echo "MEMCHECK: $<"; \ - echo "ARGS: ${VALGRIND_OPTS} ${VALGRIND_MEM_OPTS} ${$<_VALGRIND_MEM_OPTS}"; \ - $(LIBTOOL) --mode=execute \ - valgrind \ - ${VALGRIND_OPTS} \ - ${VALGRIND_MEM_OPTS} \ - ${$<_VALGRIND_MEM_OPTS} ./$< + @echo "*****************************************"; \ + echo "MEMCHECK: $<"; \ + echo "ARGS: ${VALGRIND_OPTS} ${VALGRIND_MEM_OPTS} ${$<_VALGRIND_MEM_OPTS}"; \ + $(LIBTOOL) --mode=execute \ + valgrind \ + ${VALGRIND_OPTS} \ + ${VALGRIND_MEM_OPTS} \ + ${$<_VALGRIND_MEM_OPTS} ./$< leakcheck-%: % - @echo "*****************************************"; \ - echo "LEAKCHECK: $<"; \ - echo "ARGS: ${VALGRIND_OPTS} ${VALGRIND_LEAK_OPTS} ${$<_VALGRIND_LEAK_OPTS}"; \ - G_SLICE=always-malloc $(LIBTOOL) --mode=execute \ - valgrind \ - ${VALGRIND_OPTS} \ - ${VALGRIND_LEAK_OPTS} \ - ${$<_VALGRIND_LEAK_OPTS} ./$< + @echo "*****************************************"; \ + echo "LEAKCHECK: $<"; \ + echo "ARGS: ${VALGRIND_OPTS} ${VALGRIND_LEAK_OPTS} ${$<_VALGRIND_LEAK_OPTS}"; \ + G_SLICE=always-malloc $(LIBTOOL) --mode=execute \ + valgrind \ + ${VALGRIND_OPTS} \ + ${VALGRIND_LEAK_OPTS} \ + ${$<_VALGRIND_LEAK_OPTS} ./$< clean-local: - $(RM) -r gen-c_glib gen-cpp + $(RM) -r gen-c_glib gen-cpp CLEANFILES = \ *.bb \ http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/lib/cpp/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am index 4bd40fb..2d77a34 100755 --- a/lib/cpp/Makefile.am +++ b/lib/cpp/Makefile.am @@ -18,7 +18,7 @@ # moc_%.cpp: %.h - $(QT_MOC) $(QT_CFLAGS) $< -o $@ + $(QT_MOC) $(QT_CFLAGS) $< -o $@ SUBDIRS = . http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/lib/cpp/test/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/cpp/test/Makefile.am b/lib/cpp/test/Makefile.am index 012d226..3dbcb45 100755 --- a/lib/cpp/test/Makefile.am +++ b/lib/cpp/test/Makefile.am @@ -19,28 +19,28 @@ .NOTPARALLEL: noinst_LTLIBRARIES = libtestgencpp.la libprocessortest.la nodist_libtestgencpp_la_SOURCES = \ - gen-cpp/DebugProtoTest_types.cpp \ - gen-cpp/DebugProtoTest_types.h \ - gen-cpp/EnumTest_types.cpp \ - gen-cpp/EnumTest_types.h \ - gen-cpp/OptionalRequiredTest_types.cpp \ - gen-cpp/OptionalRequiredTest_types.h \ - gen-cpp/Recursive_types.cpp \ - gen-cpp/Recursive_types.h \ - gen-cpp/ThriftTest_types.cpp \ - gen-cpp/ThriftTest_types.h \ - gen-cpp/TypedefTest_types.cpp \ - gen-cpp/TypedefTest_types.h \ - ThriftTest_extras.cpp \ - DebugProtoTest_extras.cpp + gen-cpp/DebugProtoTest_types.cpp \ + gen-cpp/DebugProtoTest_types.h \ + gen-cpp/EnumTest_types.cpp \ + gen-cpp/EnumTest_types.h \ + gen-cpp/OptionalRequiredTest_types.cpp \ + gen-cpp/OptionalRequiredTest_types.h \ + gen-cpp/Recursive_types.cpp \ + gen-cpp/Recursive_types.h \ + gen-cpp/ThriftTest_types.cpp \ + gen-cpp/ThriftTest_types.h \ + gen-cpp/TypedefTest_types.cpp \ + gen-cpp/TypedefTest_types.h \ + ThriftTest_extras.cpp \ + DebugProtoTest_extras.cpp nodist_libprocessortest_la_SOURCES = \ - gen-cpp/ChildService.cpp \ - gen-cpp/ChildService.h \ - gen-cpp/ParentService.cpp \ - gen-cpp/ParentService.h \ - gen-cpp/proc_types.cpp \ - gen-cpp/proc_types.h + gen-cpp/ChildService.cpp \ + gen-cpp/ChildService.h \ + gen-cpp/ParentService.cpp \ + gen-cpp/ParentService.h \ + gen-cpp/proc_types.cpp \ + gen-cpp/proc_types.h ThriftTest_extras.o: gen-cpp/ThriftTest_types.h DebugProtoTest_extras.o: gen-cpp/DebugProtoTest_types.h @@ -50,45 +50,45 @@ libtestgencpp_la_LIBADD = $(top_builddir)/lib/cpp/libthrift.la noinst_PROGRAMS = Benchmark Benchmark_SOURCES = \ - Benchmark.cpp + Benchmark.cpp Benchmark_LDADD = libtestgencpp.la check_PROGRAMS = \ - TFDTransportTest \ - TPipedTransportTest \ - DebugProtoTest \ - JSONProtoTest \ - OptionalRequiredTest \ - RecursiveTest \ - SpecializationTest \ - AllProtocolsTest \ - TransportTest \ - ZlibTest \ - TFileTransportTest \ - UnitTests \ - link_test \ - OpenSSLManualInitTest \ - EnumTest + TFDTransportTest \ + TPipedTransportTest \ + DebugProtoTest \ + JSONProtoTest \ + OptionalRequiredTest \ + RecursiveTest \ + SpecializationTest \ + AllProtocolsTest \ + TransportTest \ + ZlibTest \ + TFileTransportTest \ + UnitTests \ + link_test \ + OpenSSLManualInitTest \ + EnumTest # disable these test ... too strong # processor_test -# concurrency_test +# concurrency_test TESTS_ENVIRONMENT= \ - BOOST_TEST_LOG_SINK=tests.xml \ - BOOST_TEST_LOG_LEVEL=test_suite \ - BOOST_TEST_LOG_FORMAT=xml + BOOST_TEST_LOG_SINK=tests.xml \ + BOOST_TEST_LOG_LEVEL=test_suite \ + BOOST_TEST_LOG_FORMAT=xml TESTS = \ - $(check_PROGRAMS) + $(check_PROGRAMS) UnitTests_SOURCES = \ - UnitTestMain.cpp \ - TMemoryBufferTest.cpp \ - TBufferBaseTest.cpp \ - Base64Test.cpp \ - ToStringTest.cpp \ - TypedefTest.cpp + UnitTestMain.cpp \ + TMemoryBufferTest.cpp \ + TBufferBaseTest.cpp \ + Base64Test.cpp \ + ToStringTest.cpp \ + TypedefTest.cpp if !WITH_BOOSTTHREADS UnitTests_SOURCES += \ @@ -100,7 +100,7 @@ UnitTests_LDADD = \ -l:libboost_unit_test_framework.a TransportTest_SOURCES = \ - TransportTest.cpp + TransportTest.cpp TransportTest_LDADD = \ libtestgencpp.la \ @@ -109,7 +109,7 @@ TransportTest_LDADD = \ -lz ZlibTest_SOURCES = \ - ZlibTest.cpp + ZlibTest.cpp ZlibTest_LDADD = \ libtestgencpp.la \ @@ -125,7 +125,7 @@ EnumTest_LDADD = \ -l:libboost_unit_test_framework.a TFileTransportTest_SOURCES = \ - TFileTransportTest.cpp + TFileTransportTest.cpp TFileTransportTest_LDADD = \ libtestgencpp.la \ @@ -135,28 +135,28 @@ TFileTransportTest_LDADD = \ # TFDTransportTest # TFDTransportTest_SOURCES = \ - TFDTransportTest.cpp + TFDTransportTest.cpp TFDTransportTest_LDADD = \ - $(top_builddir)/lib/cpp/libthrift.la + $(top_builddir)/lib/cpp/libthrift.la # # TPipedTransportTest # TPipedTransportTest_SOURCES = \ - TPipedTransportTest.cpp + TPipedTransportTest.cpp TPipedTransportTest_LDADD = \ - $(top_builddir)/lib/cpp/libthrift.la + $(top_builddir)/lib/cpp/libthrift.la # # AllProtocolsTest # AllProtocolsTest_SOURCES = \ - AllProtocolTests.cpp \ - AllProtocolTests.tcc \ - GenericHelpers.h + AllProtocolTests.cpp \ + AllProtocolTests.tcc \ + GenericHelpers.h AllProtocolsTest_LDADD = libtestgencpp.la @@ -164,7 +164,7 @@ AllProtocolsTest_LDADD = libtestgencpp.la # DebugProtoTest # DebugProtoTest_SOURCES = \ - DebugProtoTest.cpp + DebugProtoTest.cpp DebugProtoTest_LDADD = libtestgencpp.la @@ -173,7 +173,7 @@ DebugProtoTest_LDADD = libtestgencpp.la # JSONProtoTest # JSONProtoTest_SOURCES = \ - JSONProtoTest.cpp + JSONProtoTest.cpp JSONProtoTest_LDADD = libtestgencpp.la @@ -181,7 +181,7 @@ JSONProtoTest_LDADD = libtestgencpp.la # OptionalRequiredTest # OptionalRequiredTest_SOURCES = \ - OptionalRequiredTest.cpp + OptionalRequiredTest.cpp OptionalRequiredTest_LDADD = libtestgencpp.la @@ -189,7 +189,7 @@ OptionalRequiredTest_LDADD = libtestgencpp.la # OptionalRequiredTest # RecursiveTest_SOURCES = \ - RecursiveTest.cpp + RecursiveTest.cpp RecursiveTest_LDADD = libtestgencpp.la @@ -197,15 +197,15 @@ RecursiveTest_LDADD = libtestgencpp.la # SpecializationTest # SpecializationTest_SOURCES = \ - SpecializationTest.cpp + SpecializationTest.cpp SpecializationTest_LDADD = libtestgencpp.la concurrency_test_SOURCES = \ - concurrency/Tests.cpp \ - concurrency/ThreadFactoryTests.h \ - concurrency/ThreadManagerTests.h \ - concurrency/TimerManagerTests.h + concurrency/Tests.cpp \ + concurrency/ThreadFactoryTests.h \ + concurrency/ThreadManagerTests.h \ + concurrency/TimerManagerTests.h concurrency_test_LDADD = \ $(top_builddir)/lib/cpp/libthrift.la @@ -216,12 +216,12 @@ link_test_SOURCES = \ link/TemplatedService2.cpp processor_test_SOURCES = \ - processor/ProcessorTest.cpp \ - processor/EventLog.cpp \ - processor/ServerThread.cpp \ - processor/EventLog.h \ - processor/Handlers.h \ - processor/ServerThread.h + processor/ProcessorTest.cpp \ + processor/EventLog.cpp \ + processor/ServerThread.cpp \ + processor/EventLog.h \ + processor/Handlers.h \ + processor/ServerThread.h processor_test_LDADD = libprocessortest.la \ $(top_builddir)/lib/cpp/libthrift.la \ @@ -231,11 +231,11 @@ processor_test_LDADD = libprocessortest.la \ -l:libboost_unit_test_framework.a OpenSSLManualInitTest_SOURCES = \ - OpenSSLManualInitTest.cpp + OpenSSLManualInitTest.cpp OpenSSLManualInitTest_LDADD = \ - $(top_builddir)/lib/cpp/libthrift.la \ - -l:libboost_unit_test_framework.a + $(top_builddir)/lib/cpp/libthrift.la \ + -l:libboost_unit_test_framework.a # # Common thrift code generation rules @@ -243,39 +243,39 @@ OpenSSLManualInitTest_LDADD = \ THRIFT = $(top_builddir)/compiler/cpp/thrift gen-cpp/DebugProtoTest_types.cpp gen-cpp/DebugProtoTest_types.h: $(top_srcdir)/test/DebugProtoTest.thrift - $(THRIFT) --gen cpp:dense $< + $(THRIFT) --gen cpp:dense $< gen-cpp/EnumTest_types.cpp gen-cpp/EnumTest_types.h: $(top_srcdir)/test/EnumTest.thrift - $(THRIFT) --gen cpp $< + $(THRIFT) --gen cpp $< gen-cpp/TypedefTest_types.cpp gen-cpp/TypedefTest_types.h: $(top_srcdir)/test/TypedefTest.thrift - $(THRIFT) --gen cpp $< + $(THRIFT) --gen cpp $< gen-cpp/OptionalRequiredTest_types.cpp gen-cpp/OptionalRequiredTest_types.h: $(top_srcdir)/test/OptionalRequiredTest.thrift - $(THRIFT) --gen cpp:dense $< + $(THRIFT) --gen cpp:dense $< gen-cpp/Recursive_types.cpp gen-cpp/Recursive_types.h: $(top_srcdir)/test/Recursive.thrift - $(THRIFT) --gen cpp $< + $(THRIFT) --gen cpp $< gen-cpp/Service.cpp gen-cpp/StressTest_types.cpp: $(top_srcdir)/test/StressTest.thrift - $(THRIFT) --gen cpp:dense $< + $(THRIFT) --gen cpp:dense $< gen-cpp/SecondService.cpp gen-cpp/ThriftTest_constants.cpp gen-cpp/ThriftTest.cpp gen-cpp/ThriftTest_types.cpp gen-cpp/ThriftTest_types.h: $(top_srcdir)/test/ThriftTest.thrift - $(THRIFT) --gen cpp:dense $< + $(THRIFT) --gen cpp:dense $< gen-cpp/ChildService.cpp: processor/proc.thrift - $(THRIFT) --gen cpp:templates,cob_style $< + $(THRIFT) --gen cpp:templates,cob_style $< AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(top_srcdir)/lib/cpp/src AM_LDFLAGS = $(BOOST_LDFLAGS) AM_CXXFLAGS = -Wall clean-local: - $(RM) -r gen-cpp + $(RM) -r gen-cpp EXTRA_DIST = \ - DenseProtoTest.cpp \ - ThriftTest_extras.cpp \ - DebugProtoTest_extras.cpp \ - concurrency \ - processor + DenseProtoTest.cpp \ + ThriftTest_extras.cpp \ + DebugProtoTest_extras.cpp \ + concurrency \ + processor http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/lib/d/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/d/Makefile.am b/lib/d/Makefile.am index 759677a..5e34f99 100644 --- a/lib/d/Makefile.am +++ b/lib/d/Makefile.am @@ -41,37 +41,37 @@ d_asyncdir = $(d_thriftdir)/async d_async_DATA = $(addprefix src/, $(addsuffix .d, $(d_asyncmodules))) d_codegenmodules = $(addprefix thrift/codegen/, async_client \ - async_client_pool base client client_pool idlgen processor) + async_client_pool base client client_pool idlgen processor) d_codegendir = $(d_thriftdir)/codegen d_codegen_DATA = $(addprefix src/, $(addsuffix .d, $(d_codegenmodules))) d_protocolmodules = $(addprefix thrift/protocol/, base binary compact json \ - processor) + processor) d_protocoldir = $(d_thriftdir)/protocol d_protocol_DATA = $(addprefix src/, $(addsuffix .d, $(d_protocolmodules))) d_servermodules = $(addprefix thrift/server/, base simple nonblocking \ - taskpool threaded) + taskpool threaded) d_serverdir = $(d_thriftdir)/server d_server_DATA = $(addprefix src/, $(addsuffix .d, $(d_servermodules))) d_servertransportmodules = $(addprefix thrift/server/transport/, base socket ssl) d_servertransportdir = $(d_thriftdir)/server/transport d_servertransport_DATA = $(addprefix src/, $(addsuffix .d, \ - $(d_servertransportmodules))) + $(d_servertransportmodules))) d_transportmodules = $(addprefix thrift/transport/, base buffered file \ - framed http memory piped range socket ssl zlib) + framed http memory piped range socket ssl zlib) d_transportdir = $(d_thriftdir)/transport d_transport_DATA = $(addprefix src/, $(addsuffix .d, $(d_transportmodules))) d_utilmodules = $(addprefix thrift/util/, awaitable cancellation future \ - hashset) + hashset) d_utildir = $(d_thriftdir)/util d_util_DATA = $(addprefix src/, $(addsuffix .d, $(d_utilmodules))) d_internalmodules = $(addprefix thrift/internal/, algorithm codegen ctfe \ - endian resource_pool socket ssl ssl_bio traits) + endian resource_pool socket ssl ssl_bio traits) d_internaldir = $(d_thriftdir)/internal d_internal_DATA = $(addprefix src/, $(addsuffix .d, $(d_internalmodules))) @@ -80,8 +80,8 @@ d_testdir = $(d_internaldir)/test d_test_DATA = $(addprefix src/, $(addsuffix .d, $(d_testmodules))) d_publicmodules = $(d_thriftmodules) $(d_asyncmodules) \ - $(d_codegenmodules) $(d_protocolmodules) $(d_servermodules) \ - $(d_servertransportmodules) $(d_transportmodules) $(d_utilmodules) + $(d_codegenmodules) $(d_protocolmodules) $(d_servermodules) \ + $(d_servertransportmodules) $(d_transportmodules) $(d_utilmodules) d_publicsources = $(addprefix src/, $(addsuffix .d, $(d_publicmodules))) d_modules = $(d_publicmodules) $(d_internalmodules) $(d_testmodules) @@ -89,9 +89,9 @@ d_modules = $(d_publicmodules) $(d_internalmodules) $(d_testmodules) # List modules with external dependencies and remove them from the main list d_libevent_dependent_modules = thrift/async/libevent thrift/server/nonblocking d_openssl_dependent_modules = thrift/async/ssl thrift/internal/ssl \ - thrift/internal/ssl_bio thrift/transport/ssl thrift/server/transport/ssl + thrift/internal/ssl_bio thrift/transport/ssl thrift/server/transport/ssl d_main_modules = $(filter-out $(d_libevent_dependent_modules) \ - $(d_openssl_dependent_modules),$(d_modules)) + $(d_openssl_dependent_modules),$(d_modules)) d_lib_flags = -w -wi -Isrc -lib @@ -102,7 +102,7 @@ all_targets = # if HAVE_DEIMOS_EVENT2 $(D_EVENT_LIB_NAME): $(addprefix src/, $(addsuffix .d, $(d_libevent_dependent_modules))) - $(DMD) -of$(D_EVENT_LIB_NAME) $(d_lib_flags) $^ + $(DMD) -of$(D_EVENT_LIB_NAME) $(d_lib_flags) $^ all_targets += $(D_EVENT_LIB_NAME) endif @@ -111,7 +111,7 @@ endif # if HAVE_DEIMOS_OPENSSL $(D_SSL_LIB_NAME): $(addprefix src/, $(addsuffix .d, $(d_openssl_dependent_modules))) - $(DMD) -of$(D_SSL_LIB_NAME) $(d_lib_flags) $^ + $(DMD) -of$(D_SSL_LIB_NAME) $(d_lib_flags) $^ all_targets += $(D_SSL_LIB_NAME) endif @@ -119,7 +119,7 @@ endif # Main library target. # $(D_LIB_NAME): $(addprefix src/, $(addsuffix .d, $(d_main_modules))) - $(DMD) -of$(D_LIB_NAME) $(d_lib_flags) $^ + $(DMD) -of$(D_LIB_NAME) $(d_lib_flags) $^ all_targets += $(D_LIB_NAME) @@ -127,7 +127,7 @@ all_targets += $(D_LIB_NAME) # Documentation target (requires Dil). # docs: $(d_publicsources) src/thrift/index.d - dil ddoc docs -hl --kandil $^ + dil ddoc docs -hl --kandil $^ # @@ -136,11 +136,11 @@ docs: $(d_publicsources) src/thrift/index.d all-local: $(all_targets) install-exec-local: - $(INSTALL_PROGRAM) $(all_targets) $(DESTDIR)$(libdir) + $(INSTALL_PROGRAM) $(all_targets) $(DESTDIR)$(libdir) clean-local: - $(RM) -rf docs $(D_LIB_NAME) $(D_EVENT_LIB_NAME) $(D_SSL_LIB_NAME) unittest + $(RM) -rf docs $(D_LIB_NAME) $(D_EVENT_LIB_NAME) $(D_SSL_LIB_NAME) unittest # @@ -167,23 +167,23 @@ d_test_modules = $(filter-out $(d_openssl_dependent_modules), $(d_test_modules_) endif unittest/emptymain.d: unittest/.directory - @echo 'void main(){}' >$@ + @echo 'void main(){}' >$@ unittest/.directory: - mkdir -p unittest || exists unittest - touch $@ + mkdir -p unittest || exists unittest + touch $@ unittest/debug/%: src/%.d $(all_targets) unittest/emptymain.d - $(DMD) -gc -of$(subst /,$(DMD_OF_DIRSEP),$@) $(d_test_flags) $^ + $(DMD) -gc -of$(subst /,$(DMD_OF_DIRSEP),$@) $(d_test_flags) $^ unittest/release/%: src/%.d $(all_targets) unittest/emptymain.d - $(DMD) -O -release -of$(subst /,$(DMD_OF_DIRSEP),$@) $(d_test_flags) $^ + $(DMD) -O -release -of$(subst /,$(DMD_OF_DIRSEP),$@) $(d_test_flags) $^ TESTS = $(addprefix unittest/debug/, $(d_test_modules)) \ - $(addprefix unittest/release/, $(d_test_modules)) + $(addprefix unittest/release/, $(d_test_modules)) EXTRA_DIST = \ - src \ - test \ - README.md + src \ + test \ + README.md http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/lib/d/test/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/d/test/Makefile.am b/lib/d/test/Makefile.am index 0482583..b2f5a4b 100755 --- a/lib/d/test/Makefile.am +++ b/lib/d/test/Makefile.am @@ -26,33 +26,33 @@ THRIFT = $(top_builddir)/compiler/cpp/thrift debug_proto_gen = $(addprefix gen-d/, DebugProtoTest_types.d) $(debug_proto_gen): $(top_srcdir)/test/DebugProtoTest.thrift - $(THRIFT) --gen d -nowarn $< + $(THRIFT) --gen d -nowarn $< stress_test_gen = $(addprefix gen-d/thrift/test/stress/, Service.d \ - StressTest_types.d) + StressTest_types.d) $(stress_test_gen): $(top_srcdir)/test/StressTest.thrift - $(THRIFT) --gen d $< + $(THRIFT) --gen d $< thrift_test_gen = $(addprefix gen-d/thrift/test/, SecondService.d \ - ThriftTest.d ThriftTest_constants.d ThriftTest_types.d) + ThriftTest.d ThriftTest_constants.d ThriftTest_types.d) $(thrift_test_gen): $(top_srcdir)/test/ThriftTest.thrift - $(THRIFT) --gen d $< + $(THRIFT) --gen d $< # The actual test targets. # There just must be some way to reassign a variable without warnings in # Automake... targets__ = async_test client_pool_test serialization_benchmark \ - stress_test_server thrift_test_client thrift_test_server transport_test + stress_test_server thrift_test_client thrift_test_server transport_test ran_tests__ = client_pool_test \ - transport_test \ - async_test_runner.sh \ - thrift_test_runner.sh + transport_test \ + async_test_runner.sh \ + thrift_test_runner.sh libevent_dependent_targets = async_test_client client_pool_test \ - stress_test_server thrift_test_server + stress_test_server thrift_test_server libevent_dependent_ran_tests = client_pool_test async_test_runner.sh thrift_test_runner.sh openssl_dependent_targets = async_test thrift_test_client thrift_test_server @@ -79,23 +79,23 @@ ran_tests = $(filter-out $(openssl_dependent_ran_tests), $(ran_tests_)) endif d_test_flags += -w -wi -O -release -inline -I$(top_srcdir)/lib/d/src -Igen-d \ - $(top_builddir)/lib/d/$(D_LIB_NAME) + $(top_builddir)/lib/d/$(D_LIB_NAME) async_test client_pool_test transport_test: %: %.d - $(DMD) $(d_test_flags) -of$@ $^ + $(DMD) $(d_test_flags) -of$@ $^ serialization_benchmark: %: %.d $(debug_proto_gen) - $(DMD) $(d_test_flags) -of$@ $^ + $(DMD) $(d_test_flags) -of$@ $^ stress_test_server: %: %.d test_utils.d $(stress_test_gen) - $(DMD) $(d_test_flags) -of$@ $^ + $(DMD) $(d_test_flags) -of$@ $^ thrift_test_client: %: %.d thrift_test_common.d $(thrift_test_gen) - $(DMD) $(d_test_flags) -of$@ $^ + $(DMD) $(d_test_flags) -of$@ $^ thrift_test_server: %: %.d thrift_test_common.d test_utils.d $(thrift_test_gen) - $(DMD) $(d_test_flags) -of$@ $^ + $(DMD) $(d_test_flags) -of$@ $^ # Certificate generation targets (for the SSL tests). @@ -103,22 +103,22 @@ thrift_test_server: %: %.d thrift_test_common.d test_utils.d $(thrift_test_gen) # replaced by a more elaborate mechanism. server-certificate.pem: openssl.test.cnf - openssl req -new -x509 -nodes -config openssl.test.cnf \ - -out server-certificate.pem + openssl req -new -x509 -nodes -config openssl.test.cnf \ + -out server-certificate.pem trusted-ca-certificate.pem: server-certificate.pem - cat server-certificate.pem > $@ + cat server-certificate.pem > $@ check-local: $(targets) clean-local: - $(RM) -rf gen-d $(targets) $(addsuffix .o, $(targets)) + $(RM) -rf gen-d $(targets) $(addsuffix .o, $(targets)) # Tests ran as part of make check. async_test_runner.sh: async_test trusted-ca-certificate.pem server-certificate.pem thrift_test_runner.sh: thrift_test_client thrift_test_server \ - trusted-ca-certificate.pem server-certificate.pem + trusted-ca-certificate.pem server-certificate.pem TESTS = $(ran_tests) http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/lib/erl/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/erl/Makefile.am b/lib/erl/Makefile.am index 60c7e5a..9614379 100644 --- a/lib/erl/Makefile.am +++ b/lib/erl/Makefile.am @@ -19,47 +19,47 @@ THRIFT = ../../compiler/cpp/thrift THRIFT_FILES = $(wildcard test/*.thrift) \ - ../../test/ThriftTest.thrift + ../../test/ThriftTest.thrift .generated: $(THRIFT_FILES) - for f in $(THRIFT_FILES) ; do \ - $(THRIFT) --gen erl -o test $$f ; \ - done ; \ - touch .generated + for f in $(THRIFT_FILES) ; do \ + $(THRIFT) --gen erl -o test $$f ; \ + done ; \ + touch .generated all: .generated - ./rebar get-deps - ./rebar compile + ./rebar get-deps + ./rebar compile check: .generated - ./rebar skip_deps=true eunit + ./rebar skip_deps=true eunit install: all - mkdir -p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift) ; \ - mkdir -p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)/ebin ; \ - mkdir -p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)/include ; \ - mkdir -p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)/src ; \ - for p in ebin/*.app* ebin/*.beam include/*.hrl src/*.erl ; \ - do $(INSTALL) $$p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)/$$p ; \ - done + mkdir -p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift) ; \ + mkdir -p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)/ebin ; \ + mkdir -p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)/include ; \ + mkdir -p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)/src ; \ + for p in ebin/*.app* ebin/*.beam include/*.hrl src/*.erl ; \ + do $(INSTALL) $$p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)/$$p ; \ + done uninstall: - rm -rf $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift) + rm -rf $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift) clean: - rm -f .generated - rm -rf test/gen-erl/ - ./rebar clean + rm -f .generated + rm -rf test/gen-erl/ + ./rebar clean maintainer-clean-local: - rm -rf ebin + rm -rf ebin EXTRA_DIST = \ - include \ - src \ - rebar \ - rebar.config \ - test \ - README.md + include \ + src \ + rebar \ + rebar.config \ + test \ + README.md MAINTAINERCLEANFILES = Makefile.in http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/lib/go/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/go/Makefile.am b/lib/go/Makefile.am index be2a2e5..05369b9 100644 --- a/lib/go/Makefile.am +++ b/lib/go/Makefile.am @@ -24,17 +24,17 @@ SUBDIRS += test endif install: - @echo '##############################################################' - @echo '##############################################################' - @echo 'The Go client library should be installed via "go get", please see /lib/go/README.md' - @echo '##############################################################' - @echo '##############################################################' + @echo '##############################################################' + @echo '##############################################################' + @echo 'The Go client library should be installed via "go get", please see /lib/go/README.md' + @echo '##############################################################' + @echo '##############################################################' check-local: - $(GO) test ./thrift + $(GO) test ./thrift all-local: check-local EXTRA_DIST = \ - thrift \ - README.md + thrift \ + README.md http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/lib/go/test/GoTagTest.thrift ---------------------------------------------------------------------- diff --git a/lib/go/test/GoTagTest.thrift b/lib/go/test/GoTagTest.thrift index d92c66b..539f3d2 100644 --- a/lib/go/test/GoTagTest.thrift +++ b/lib/go/test/GoTagTest.thrift @@ -18,6 +18,6 @@ # struct tagged { - 1: string string_thing, - 2: i64 int_thing (go.tag = "json:\"int_thing,string\"") + 1: string string_thing, + 2: i64 int_thing (go.tag = "json:\"int_thing,string\"") } http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/lib/go/test/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/go/test/Makefile.am b/lib/go/test/Makefile.am index c13ba74..b319d4f 100644 --- a/lib/go/test/Makefile.am +++ b/lib/go/test/Makefile.am @@ -22,55 +22,55 @@ THRIFTTEST = $(top_srcdir)/test/ThriftTest.thrift # Thrift for GO has problems with complex map keys: THRIFT-2063 gopath: $(top_srcdir)/compiler/cpp/thrift $(THRIFTTEST) \ - IncludesTest.thrift \ - NamespacedTest.thrift \ - MultiplexedProtocolTest.thrift \ - OnewayTest.thrift \ - OptionalFieldsTest.thrift \ - ServicesTest.thrift \ - GoTagTest.thrift \ - TypedefFieldTest.thrift \ - RefAnnotationFieldsTest.thrift - mkdir -p gopath/src - grep -v list.*map.*list.*map $(THRIFTTEST) | grep -v 'set<Insanity>' > ThriftTest.thrift - $(THRIFT) -r IncludesTest.thrift - $(THRIFT) BinaryKeyTest.thrift - $(THRIFT) MultiplexedProtocolTest.thrift - $(THRIFT) OnewayTest.thrift - $(THRIFT) OptionalFieldsTest.thrift - $(THRIFT) ServicesTest.thrift - $(THRIFT) GoTagTest.thrift - $(THRIFT) TypedefFieldTest.thrift - $(THRIFT) RefAnnotationFieldsTest.thrift - GOPATH=`pwd`/gopath $(GO) get code.google.com/p/gomock/gomock - ln -nfs ../../../thrift gopath/src/thrift - ln -nfs ../../tests gopath/src/tests - touch gopath + IncludesTest.thrift \ + NamespacedTest.thrift \ + MultiplexedProtocolTest.thrift \ + OnewayTest.thrift \ + OptionalFieldsTest.thrift \ + ServicesTest.thrift \ + GoTagTest.thrift \ + TypedefFieldTest.thrift \ + RefAnnotationFieldsTest.thrift + mkdir -p gopath/src + grep -v list.*map.*list.*map $(THRIFTTEST) | grep -v 'set<Insanity>' > ThriftTest.thrift + $(THRIFT) -r IncludesTest.thrift + $(THRIFT) BinaryKeyTest.thrift + $(THRIFT) MultiplexedProtocolTest.thrift + $(THRIFT) OnewayTest.thrift + $(THRIFT) OptionalFieldsTest.thrift + $(THRIFT) ServicesTest.thrift + $(THRIFT) GoTagTest.thrift + $(THRIFT) TypedefFieldTest.thrift + $(THRIFT) RefAnnotationFieldsTest.thrift + GOPATH=`pwd`/gopath $(GO) get code.google.com/p/gomock/gomock + ln -nfs ../../../thrift gopath/src/thrift + ln -nfs ../../tests gopath/src/tests + touch gopath check: gopath - GOPATH=`pwd`/gopath $(GO) build \ - includestest \ - binarykeytest \ - servicestest \ - typedeffieldtest \ - refannotationfieldstest - GOPATH=`pwd`/gopath $(GO) test thrift tests + GOPATH=`pwd`/gopath $(GO) build \ + includestest \ + binarykeytest \ + servicestest \ + typedeffieldtest \ + refannotationfieldstest + GOPATH=`pwd`/gopath $(GO) test thrift tests clean-local: - $(RM) -r gopath ThriftTest.thrift gen-go + $(RM) -r gopath ThriftTest.thrift gen-go client: stubs - $(GO) run TestClient.go + $(GO) run TestClient.go EXTRA_DIST = \ - tests \ - BinaryKeyTest.thrift \ - GoTagTest.thrift \ - IncludesTest.thrift \ - MultiplexedProtocolTest.thrift \ - NamespacedTest.thrift \ - OnewayTest.thrift \ - OptionalFieldsTest.thrift \ - RefAnnotationFieldsTest.thrift \ - ServicesTest.thrift \ - TypedefFieldTest.thrift + tests \ + BinaryKeyTest.thrift \ + GoTagTest.thrift \ + IncludesTest.thrift \ + MultiplexedProtocolTest.thrift \ + NamespacedTest.thrift \ + OnewayTest.thrift \ + OptionalFieldsTest.thrift \ + RefAnnotationFieldsTest.thrift \ + ServicesTest.thrift \ + TypedefFieldTest.thrift http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/lib/go/test/MultiplexedProtocolTest.thrift ---------------------------------------------------------------------- diff --git a/lib/go/test/MultiplexedProtocolTest.thrift b/lib/go/test/MultiplexedProtocolTest.thrift index 0e21061..b263f59 100644 --- a/lib/go/test/MultiplexedProtocolTest.thrift +++ b/lib/go/test/MultiplexedProtocolTest.thrift @@ -18,10 +18,10 @@ # service First { - i64 returnOne(); + i64 returnOne(); } service Second { - i64 returnTwo(); + i64 returnTwo(); } http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/lib/go/test/OnewayTest.thrift ---------------------------------------------------------------------- diff --git a/lib/go/test/OnewayTest.thrift b/lib/go/test/OnewayTest.thrift index cabb5da..3242f80 100644 --- a/lib/go/test/OnewayTest.thrift +++ b/lib/go/test/OnewayTest.thrift @@ -18,7 +18,7 @@ # service OneWay { - oneway void hi(1: i64 i, 2: string s) - void emptyfunc() - i64 echo_int(1: i64 param) + oneway void hi(1: i64 i, 2: string s) + void emptyfunc() + i64 echo_int(1: i64 param) } http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/lib/go/test/ServicesTest.thrift ---------------------------------------------------------------------- diff --git a/lib/go/test/ServicesTest.thrift b/lib/go/test/ServicesTest.thrift index c79f472..882b03a 100644 --- a/lib/go/test/ServicesTest.thrift +++ b/lib/go/test/ServicesTest.thrift @@ -34,78 +34,78 @@ struct struct_a { } service a_serv { - void voidfunc(), - void void_with_1ex() throws(1: moderate_disaster err1) - void void_with_2ex() throws(1: moderate_disaster err1, 2:total_disaster err2) + void voidfunc(), + void void_with_1ex() throws(1: moderate_disaster err1) + void void_with_2ex() throws(1: moderate_disaster err1, 2:total_disaster err2) - string stringfunc() - string stringfunc_1ex() throws(1: moderate_disaster err1) - string stringfunc_2ex() throws(1: moderate_disaster err1, 2:total_disaster err2) + string stringfunc() + string stringfunc_1ex() throws(1: moderate_disaster err1) + string stringfunc_2ex() throws(1: moderate_disaster err1, 2:total_disaster err2) - i64 i64func() - i64 i64func_1ex() throws(1: moderate_disaster err1) - i64 i64func_2ex() throws(1: moderate_disaster err1, 2:total_disaster err2) + i64 i64func() + i64 i64func_1ex() throws(1: moderate_disaster err1) + i64 i64func_2ex() throws(1: moderate_disaster err1, 2:total_disaster err2) - list<string> list_of_strings_func() - list<string> list_of_strings_func_1ex() throws(1: moderate_disaster err1) - list<string> list_of_strings_func_2ex() throws(1: moderate_disaster err1, 2:total_disaster err2) + list<string> list_of_strings_func() + list<string> list_of_strings_func_1ex() throws(1: moderate_disaster err1) + list<string> list_of_strings_func_2ex() throws(1: moderate_disaster err1, 2:total_disaster err2) - map<i64,string> map_func() - map<i64,string> map_func_1ex() throws(1: moderate_disaster err1) - map<i64,string> map_func_2ex() throws(1: moderate_disaster err1, 2:total_disaster err2) + map<i64,string> map_func() + map<i64,string> map_func_1ex() throws(1: moderate_disaster err1) + map<i64,string> map_func_2ex() throws(1: moderate_disaster err1, 2:total_disaster err2) - struct_a struct_a_func() - struct_a struct_a_func_1ex() throws(1: moderate_disaster err1) - struct_a struct_a_func_2ex() throws(1: moderate_disaster err1, 2:total_disaster err2) + struct_a struct_a_func() + struct_a struct_a_func_1ex() throws(1: moderate_disaster err1) + struct_a struct_a_func_2ex() throws(1: moderate_disaster err1, 2:total_disaster err2) - void voidfunc_1int(1: i64 i), - void void_with_1ex_1int(1: i64 i) throws(1: moderate_disaster err1) - void void_with_2ex_1int(1: i64 i) throws(1: moderate_disaster err1, 2:total_disaster err2) + void voidfunc_1int(1: i64 i), + void void_with_1ex_1int(1: i64 i) throws(1: moderate_disaster err1) + void void_with_2ex_1int(1: i64 i) throws(1: moderate_disaster err1, 2:total_disaster err2) - string stringfunc_1int(1: i64 i) - string stringfunc_1ex_1int(1: i64 i) throws(1: moderate_disaster err1) - string stringfunc_2ex_1int(1: i64 i) throws(1: moderate_disaster err1, 2:total_disaster err2) + string stringfunc_1int(1: i64 i) + string stringfunc_1ex_1int(1: i64 i) throws(1: moderate_disaster err1) + string stringfunc_2ex_1int(1: i64 i) throws(1: moderate_disaster err1, 2:total_disaster err2) - i64 i64func_1int(1: i64 i) - i64 i64func_1ex_1int(1: i64 i) throws(1: moderate_disaster err1) - i64 i64func_2ex_1int(1: i64 i) throws(1: moderate_disaster err1, 2:total_disaster err2) + i64 i64func_1int(1: i64 i) + i64 i64func_1ex_1int(1: i64 i) throws(1: moderate_disaster err1) + i64 i64func_2ex_1int(1: i64 i) throws(1: moderate_disaster err1, 2:total_disaster err2) - list<string> list_of_strings_func_1int(1: i64 i) - list<string> list_of_strings_func_1ex_1int(1: i64 i) throws(1: moderate_disaster err1) - list<string> list_of_strings_func_2ex_1int(1: i64 i) throws(1: moderate_disaster err1, 2:total_disaster err2) + list<string> list_of_strings_func_1int(1: i64 i) + list<string> list_of_strings_func_1ex_1int(1: i64 i) throws(1: moderate_disaster err1) + list<string> list_of_strings_func_2ex_1int(1: i64 i) throws(1: moderate_disaster err1, 2:total_disaster err2) - map<i64,string> map_func_1int(1: i64 i) - map<i64,string> map_func_1ex_1int(1: i64 i) throws(1: moderate_disaster err1) - map<i64,string> map_func_2ex_1int(1: i64 i) throws(1: moderate_disaster err1, 2:total_disaster err2) + map<i64,string> map_func_1int(1: i64 i) + map<i64,string> map_func_1ex_1int(1: i64 i) throws(1: moderate_disaster err1) + map<i64,string> map_func_2ex_1int(1: i64 i) throws(1: moderate_disaster err1, 2:total_disaster err2) - struct_a struct_a_func_1int(1: i64 i) - struct_a struct_a_func_1ex_1int(1: i64 i) throws(1: moderate_disaster err1) - struct_a struct_a_func_2ex_1int(1: i64 i) throws(1: moderate_disaster err1, 2:total_disaster err2) + struct_a struct_a_func_1int(1: i64 i) + struct_a struct_a_func_1ex_1int(1: i64 i) throws(1: moderate_disaster err1) + struct_a struct_a_func_2ex_1int(1: i64 i) throws(1: moderate_disaster err1, 2:total_disaster err2) - void voidfunc_1int_1s(1: i64 i, 2: string s), - void void_with_1ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1) - void void_with_2ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1, 2:total_disaster err2) + void voidfunc_1int_1s(1: i64 i, 2: string s), + void void_with_1ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1) + void void_with_2ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1, 2:total_disaster err2) - string stringfunc_1int_1s(1: i64 i, 2: string s) - string stringfunc_1ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1) - string stringfunc_2ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1, 2:total_disaster err2) + string stringfunc_1int_1s(1: i64 i, 2: string s) + string stringfunc_1ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1) + string stringfunc_2ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1, 2:total_disaster err2) - i64 i64func_1int_1s(1: i64 i, 2: string s) - i64 i64func_1ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1) - i64 i64func_2ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1, 2:total_disaster err2) + i64 i64func_1int_1s(1: i64 i, 2: string s) + i64 i64func_1ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1) + i64 i64func_2ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1, 2:total_disaster err2) - list<string> list_of_strings_func_1int_1s(1: i64 i, 2: string s) - list<string> list_of_strings_func_1ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1) - list<string> list_of_strings_func_2ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1, 2:total_disaster err2) + list<string> list_of_strings_func_1int_1s(1: i64 i, 2: string s) + list<string> list_of_strings_func_1ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1) + list<string> list_of_strings_func_2ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1, 2:total_disaster err2) - map<i64,string> map_func_1int_1s(1: i64 i, 2: string s) - map<i64,string> map_func_1ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1) - map<i64,string> map_func_2ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1, 2:total_disaster err2) + map<i64,string> map_func_1int_1s(1: i64 i, 2: string s) + map<i64,string> map_func_1ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1) + map<i64,string> map_func_2ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1, 2:total_disaster err2) - struct_a struct_a_func_1int_1s(1: i64 i, 2: string s) - struct_a struct_a_func_1ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1) - struct_a struct_a_func_2ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1, 2:total_disaster err2) + struct_a struct_a_func_1int_1s(1: i64 i, 2: string s) + struct_a struct_a_func_1ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1) + struct_a struct_a_func_2ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1, 2:total_disaster err2) - struct_a struct_a_func_1struct_a(1: struct_a st) + struct_a struct_a_func_1struct_a(1: struct_a st) } http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/lib/hs/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/hs/Makefile.am b/lib/hs/Makefile.am index 3c891f4..54e4bc9 100755 --- a/lib/hs/Makefile.am +++ b/lib/hs/Makefile.am @@ -26,17 +26,17 @@ EXTRA_DIST = \ src all-local: - $(CABAL) install + $(CABAL) install install-exec-hook: - $(CABAL) install + $(CABAL) install # Make sure this doesn't fail if Haskell is not configured. clean-local: - $(CABAL) clean + $(CABAL) clean maintainer-clean-local: - $(CABAL) clean + $(CABAL) clean check-local: - $(CABAL) check + $(CABAL) check http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/lib/java/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/java/Makefile.am b/lib/java/Makefile.am index cbec7af..e93f43e 100644 --- a/lib/java/Makefile.am +++ b/lib/java/Makefile.am @@ -20,23 +20,23 @@ export CLASSPATH all-local: - $(ANT) $(ANT_FLAGS) + $(ANT) $(ANT_FLAGS) install-exec-hook: - $(ANT) $(ANT_FLAGS) install -Dinstall.path=$(DESTDIR)$(JAVA_PREFIX) \ - -Dinstall.javadoc.path=$(DESTDIR)$(docdir)/java + $(ANT) $(ANT_FLAGS) install -Dinstall.path=$(DESTDIR)$(JAVA_PREFIX) \ + -Dinstall.javadoc.path=$(DESTDIR)$(docdir)/java # Make sure this doesn't fail if ant is not configured. clean-local: - ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \ - $$ANT $(ANT_FLAGS) clean + ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \ + $$ANT $(ANT_FLAGS) clean check-local: all - $(ANT) $(ANT_FLAGS) test + $(ANT) $(ANT_FLAGS) test EXTRA_DIST = \ - build.xml \ - build.properties \ - src \ - test \ - README.md \ No newline at end of file + build.xml \ + build.properties \ + src \ + test \ + README.md \ No newline at end of file http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/lib/js/test/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/js/test/Makefile.am b/lib/js/test/Makefile.am index 14927c4..d8f1159 100755 --- a/lib/js/test/Makefile.am +++ b/lib/js/test/Makefile.am @@ -21,9 +21,9 @@ export CLASSPATH # Make sure this doesn't fail if ant is not configured. clean-local: - ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \ - $$ANT $(ANT_FLAGS) clean + ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \ + $$ANT $(ANT_FLAGS) clean check-local: all - $(ANT) $(ANT_FLAGS) test + $(ANT) $(ANT_FLAGS) test http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/lib/lua/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/lua/Makefile.am b/lib/lua/Makefile.am index 364a25d..fe6c936 100644 --- a/lib/lua/Makefile.am +++ b/lib/lua/Makefile.am @@ -20,14 +20,14 @@ SUBDIRS = . lib_LTLIBRARIES = \ - libluasocket.la \ - libluabpack.la \ - libluabitwise.la \ - liblualongnumber.la + libluasocket.la \ + libluabpack.la \ + libluabitwise.la \ + liblualongnumber.la libluasocket_la_SOURCES = \ - src/luasocket.c \ - src/usocket.c + src/luasocket.c \ + src/usocket.c nobase_include_HEADERS = src/socket.h @@ -46,18 +46,18 @@ libluabitwise_la_CPPFLAGS = $(AM_CPPFLAGS) -I/usr/include/lua5.2 -DLUA_COMPAT_MO libluabitwise_la_LDFLAGS = $(AM_LDFLAGS) -llua5.2 -lm liblualongnumber_la_SOURCES = \ - src/lualongnumber.c \ - src/longnumberutils.c + src/lualongnumber.c \ + src/longnumberutils.c liblualongnumber_la_CPPFLAGS = $(AM_CPPFLAGS) -I/usr/include/lua5.2 -DLUA_COMPAT_MODULE liblualongnumber_la_LDFLAGS = $(AM_LDFLAGS) -llua5.2 -lm EXTRA_DIST = TBinaryProtocol.lua \ - TBufferedTransport.lua \ - TFramedTransport.lua \ - Thrift.lua \ - TMemoryBuffer.lua \ - TProtocol.lua \ - TServer.lua \ - TSocket.lua \ - TTransport.lua \ No newline at end of file + TBufferedTransport.lua \ + TFramedTransport.lua \ + Thrift.lua \ + TMemoryBuffer.lua \ + TProtocol.lua \ + TServer.lua \ + TSocket.lua \ + TTransport.lua \ No newline at end of file http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/lib/nodejs/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/nodejs/Makefile.am b/lib/nodejs/Makefile.am index 3868905..bdd6ca2 100755 --- a/lib/nodejs/Makefile.am +++ b/lib/nodejs/Makefile.am @@ -19,20 +19,20 @@ THRIFT = $(top_srcdir)/compiler/cpp/thrift #stubs: $(top_srcdir)/test/ThriftTest.thrift -# $(THRIFT) --gen js:node -o test/ $(top_srcdir)/test/ThriftTest.thrift +# $(THRIFT) --gen js:node -o test/ $(top_srcdir)/test/ThriftTest.thrift deps: package.json - $(NPM) install --no-bin-links + $(NPM) install --no-bin-links check: deps - $(NPM) test + $(NPM) test clean-local: - $(RM) -r test/gen-nodejs + $(RM) -r test/gen-nodejs EXTRA_DIST = \ - examples \ - lib \ - package.json \ - test \ - README.md + examples \ + lib \ + package.json \ + test \ + README.md http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/lib/nodejs/examples/user.thrift ---------------------------------------------------------------------- diff --git a/lib/nodejs/examples/user.thrift b/lib/nodejs/examples/user.thrift index ee260e5..d087fd4 100644 --- a/lib/nodejs/examples/user.thrift +++ b/lib/nodejs/examples/user.thrift @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. - + struct UserProfile { 1: i32 uid, 2: string name, http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/lib/perl/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/perl/Makefile.am b/lib/perl/Makefile.am index 067ed69..26f7c07 100644 --- a/lib/perl/Makefile.am +++ b/lib/perl/Makefile.am @@ -20,37 +20,37 @@ SUBDIRS = test Makefile-perl.mk : Makefile.PL - $(PERL) Makefile.PL MAKEFILE=Makefile-perl.mk INSTALLDIRS=$(INSTALLDIRS) INSTALL_BASE=$(PERL_PREFIX) + $(PERL) Makefile.PL MAKEFILE=Makefile-perl.mk INSTALLDIRS=$(INSTALLDIRS) INSTALL_BASE=$(PERL_PREFIX) all-local: Makefile-perl.mk - $(MAKE) -f Makefile-perl.mk - find blib -name 'Makefile*' -exec rm -f {} \; + $(MAKE) -f Makefile-perl.mk + find blib -name 'Makefile*' -exec rm -f {} \; check-local: - $(PERL) -Iblib/lib -I@abs_srcdir@ -I@builddir@/test/gen-perl \ - @abs_srcdir@/test.pl @abs_srcdir@/test/*.t + $(PERL) -Iblib/lib -I@abs_srcdir@ -I@builddir@/test/gen-perl \ + @abs_srcdir@/test.pl @abs_srcdir@/test/*.t install-exec-local: Makefile-perl.mk - $(MAKE) -f Makefile-perl.mk install DESTDIR=$(DESTDIR)/ + $(MAKE) -f Makefile-perl.mk install DESTDIR=$(DESTDIR)/ clean-local: - if test -f Makefile-perl.mk ; then \ - $(MAKE) -f Makefile-perl.mk clean ; \ - fi - rm -f Makefile-perl.mk.old + if test -f Makefile-perl.mk ; then \ + $(MAKE) -f Makefile-perl.mk clean ; \ + fi + rm -f Makefile-perl.mk.old EXTRA_DIST = \ - Makefile.PL \ - test.pl \ - lib/Thrift.pm \ - lib/Thrift.pm \ - lib/Thrift/BinaryProtocol.pm \ - lib/Thrift/BufferedTransport.pm \ - lib/Thrift/FramedTransport.pm \ - lib/Thrift/HttpClient.pm \ - lib/Thrift/MemoryBuffer.pm \ - lib/Thrift/Protocol.pm \ - lib/Thrift/Server.pm \ - lib/Thrift/Socket.pm \ - lib/Thrift/Transport.pm \ - README.md + Makefile.PL \ + test.pl \ + lib/Thrift.pm \ + lib/Thrift.pm \ + lib/Thrift/BinaryProtocol.pm \ + lib/Thrift/BufferedTransport.pm \ + lib/Thrift/FramedTransport.pm \ + lib/Thrift/HttpClient.pm \ + lib/Thrift/MemoryBuffer.pm \ + lib/Thrift/Protocol.pm \ + lib/Thrift/Server.pm \ + lib/Thrift/Socket.pm \ + lib/Thrift/Transport.pm \ + README.md http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/lib/perl/test/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/perl/test/Makefile.am b/lib/perl/test/Makefile.am index 795aaed..6a20319 100644 --- a/lib/perl/test/Makefile.am +++ b/lib/perl/test/Makefile.am @@ -23,9 +23,9 @@ THRIFT_IF = @top_srcdir@/test/ThriftTest.thrift check-local: gen-perl/ThriftTest/Types.pm gen-perl/ThriftTest/Types.pm: $(THRIFT_IF) - $(THRIFT) --gen perl $(THRIFT_IF) + $(THRIFT) --gen perl $(THRIFT_IF) clean-local: - rm -rf gen-perl + rm -rf gen-perl EXTRA_DIST = memory_buffer.t processor.t http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/lib/php/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/php/Makefile.am b/lib/php/Makefile.am index e9d673c..da8ffdd 100755 --- a/lib/php/Makefile.am +++ b/lib/php/Makefile.am @@ -24,7 +24,7 @@ endif if WITH_PHP_EXTENSION %.so: - cd src/ext/thrift_protocol/ && $(MAKE) + cd src/ext/thrift_protocol/ && $(MAKE) phpconfdir=$(PHP_CONFIG_PREFIX) phpconf_DATA=thrift_protocol.ini http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/lib/php/test/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/php/test/Makefile.am b/lib/php/test/Makefile.am index a529d8c..66e69d5 100755 --- a/lib/php/test/Makefile.am +++ b/lib/php/test/Makefile.am @@ -20,29 +20,29 @@ THRIFT = $(top_builddir)/compiler/cpp/thrift stubs: ../../../test/ThriftTest.thrift TestValidators.thrift - mkdir -p ./packages - $(THRIFT) --gen php -r --out ./packages ../../../test/ThriftTest.thrift - mkdir -p ./packages/phpv - mkdir -p ./packages/phpvo - $(THRIFT) --gen php:validate -r --out ./packages/phpv TestValidators.thrift - $(THRIFT) --gen php:validate,oop -r --out ./packages/phpvo TestValidators.thrift - -check-validator: stubs - php Test/Thrift/TestValidators.php - php Test/Thrift/TestValidators.php -oop - -check-protocol: stubs + mkdir -p ./packages + $(THRIFT) --gen php -r --out ./packages ../../../test/ThriftTest.thrift + mkdir -p ./packages/phpv + mkdir -p ./packages/phpvo + $(THRIFT) --gen php:validate -r --out ./packages/phpv TestValidators.thrift + $(THRIFT) --gen php:validate,oop -r --out ./packages/phpvo TestValidators.thrift + +check-validator: stubs + php Test/Thrift/TestValidators.php + php Test/Thrift/TestValidators.php -oop + +check-protocol: stubs if HAVE_PHPUNIT - $(PHPUNIT) --log-junit=phpunit.xml Test/Thrift/Protocol/TestTJSONProtocol.php - $(PHPUNIT) --log-junit=phpunit.xml Test/Thrift/Protocol/TestBinarySerializer.php + $(PHPUNIT) --log-junit=phpunit.xml Test/Thrift/Protocol/TestTJSONProtocol.php + $(PHPUNIT) --log-junit=phpunit.xml Test/Thrift/Protocol/TestBinarySerializer.php endif - + check: stubs \ check-protocol \ check-validator clean-local: - $(RM) -r ./packages + $(RM) -r ./packages EXTRA_DIST = Test http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/lib/php/test/TestValidators.thrift ---------------------------------------------------------------------- diff --git a/lib/php/test/TestValidators.thrift b/lib/php/test/TestValidators.thrift index d0ed9cc..9c38d92 100644 --- a/lib/php/test/TestValidators.thrift +++ b/lib/php/test/TestValidators.thrift @@ -18,13 +18,13 @@ */ namespace php TestValidators - + include "../../../test/ThriftTest.thrift" -union UnionOfStrings { - 1: string aa; - 2: string bb; -} +union UnionOfStrings { + 1: string aa; + 2: string bb; +} service TestService { void test() throws(1: ThriftTest.Xception xception); http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/lib/py/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/py/Makefile.am b/lib/py/Makefile.am index a504b5c..d3e55fe 100755 --- a/lib/py/Makefile.am +++ b/lib/py/Makefile.am @@ -20,23 +20,23 @@ DESTDIR ?= / all-local: - $(PYTHON) setup.py build + $(PYTHON) setup.py build # We're ignoring prefix here because site-packages seems to be # the equivalent of /usr/local/lib in Python land. # Old version (can't put inline because it's not portable). #$(PYTHON) setup.py install --prefix=$(prefix) --root=$(DESTDIR) $(PYTHON_SETUPUTIL_ARGS) install-exec-hook: - $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(PY_PREFIX) $(PYTHON_SETUPUTIL_ARGS) + $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(PY_PREFIX) $(PYTHON_SETUPUTIL_ARGS) clean-local: - $(RM) -r build + $(RM) -r build check-local: all EXTRA_DIST = \ - compat \ - setup.py \ - setup.cfg \ - src \ - README.md + compat \ + setup.py \ + setup.cfg \ + src \ + README.md http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/lib/rb/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/rb/Makefile.am b/lib/rb/Makefile.am index 2d0c12e..fc75146 100755 --- a/lib/rb/Makefile.am +++ b/lib/rb/Makefile.am @@ -22,28 +22,28 @@ DESTDIR ?= / if HAVE_BUNDLER all-local: - $(BUNDLER) install - $(BUNDLER) exec rake + $(BUNDLER) install + $(BUNDLER) exec rake install-exec-hook: - $(BUNDLER) exec rake install + $(BUNDLER) exec rake install clean-local: - $(BUNDLER) exec rake clean + $(BUNDLER) exec rake clean check-local: all - $(BUNDLER) install - $(BUNDLER) exec rake + $(BUNDLER) install + $(BUNDLER) exec rake endif EXTRA_DIST = \ - Rakefile \ - Gemfile \ - thrift.gemspec \ - lib \ - ext \ - benchmark \ - script \ - spec \ - README.md + Rakefile \ + Gemfile \ + thrift.gemspec \ + lib \ + ext \ + benchmark \ + script \ + spec \ + README.md http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/test/AnnotationTest.thrift ---------------------------------------------------------------------- diff --git a/test/AnnotationTest.thrift b/test/AnnotationTest.thrift index 06bf571..191995a 100644 --- a/test/AnnotationTest.thrift +++ b/test/AnnotationTest.thrift @@ -52,7 +52,7 @@ enum weekdays { /* Note that annotations on senum values are not supported. */ senum seasons { "Spring", - "Summer", + "Summer", "Fall", "Winter" } ( foo = "bar" ) http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/test/DebugProtoTest.thrift ---------------------------------------------------------------------- diff --git a/test/DebugProtoTest.thrift b/test/DebugProtoTest.thrift index 3cb3478..fb16982 100644 --- a/test/DebugProtoTest.thrift +++ b/test/DebugProtoTest.thrift @@ -110,7 +110,7 @@ struct CompactProtoTestStruct { 8: bool true_field; 9: bool false_field; 10: Empty empty_struct_field; - + // primitives in lists 11: list<byte> byte_list; 12: list<i16> i16_list; @@ -121,7 +121,7 @@ struct CompactProtoTestStruct { 17: list<binary> binary_list; 18: list<bool> boolean_list; 19: list<Empty> struct_list; - + // primitives in sets 20: set<byte> byte_set; 21: set<i16> i16_set; @@ -132,7 +132,7 @@ struct CompactProtoTestStruct { 26: set<binary> binary_set; 27: set<bool> boolean_set; 28: set<Empty> struct_set; - + // maps // primitives as keys 29: map<byte, byte> byte_byte_map; http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/test/Makefile.am ---------------------------------------------------------------------- diff --git a/test/Makefile.am b/test/Makefile.am index cc1f43d..7745adc 100755 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -61,42 +61,42 @@ endif # generate html for ThriftTest.thrift # check-local: - $(top_builddir)/compiler/cpp/thrift --gen html -r $(top_srcdir)/test/ThriftTest.thrift + $(top_builddir)/compiler/cpp/thrift --gen html -r $(top_srcdir)/test/ThriftTest.thrift EXTRA_DIST = \ - keys \ - test.sh \ - test.py \ - tests.json \ - c_glib \ - cpp \ - erl \ - hs \ - lua \ - ocaml \ - perl \ - php \ - py \ - py.twisted \ - py.tornado \ - rb \ - threads \ - AnnotationTest.thrift \ - BrokenConstants.thrift \ - ConstantsDemo.thrift \ - DebugProtoTest.thrift \ - DenseLinkingTest.thrift \ - DocTest.thrift \ - Include.thrift \ - JavaBeansTest.thrift \ - ManyOptionals.thrift \ - ManyTypedefs.thrift \ - NameConflictTest.thrift \ - OptionalRequiredTest.thrift \ - Recursive.thrift \ - ReuseObjects.thrift \ - SmallTest.thrift \ - StressTest.thrift \ - ThriftTest.thrift \ - FastbinaryTest.py \ - README.md + keys \ + test.sh \ + test.py \ + tests.json \ + c_glib \ + cpp \ + erl \ + hs \ + lua \ + ocaml \ + perl \ + php \ + py \ + py.twisted \ + py.tornado \ + rb \ + threads \ + AnnotationTest.thrift \ + BrokenConstants.thrift \ + ConstantsDemo.thrift \ + DebugProtoTest.thrift \ + DenseLinkingTest.thrift \ + DocTest.thrift \ + Include.thrift \ + JavaBeansTest.thrift \ + ManyOptionals.thrift \ + ManyTypedefs.thrift \ + NameConflictTest.thrift \ + OptionalRequiredTest.thrift \ + Recursive.thrift \ + ReuseObjects.thrift \ + SmallTest.thrift \ + StressTest.thrift \ + ThriftTest.thrift \ + FastbinaryTest.py \ + README.md http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/test/NameConflictTest.thrift ---------------------------------------------------------------------- diff --git a/test/NameConflictTest.thrift b/test/NameConflictTest.thrift index 24757c0..337be07 100644 --- a/test/NameConflictTest.thrift +++ b/test/NameConflictTest.thrift @@ -4,21 +4,21 @@ struct using { - 1: double single - 2: double integer + 1: double single + 2: double integer } struct delegate { - 1: string partial - 2: delegate delegate + 1: string partial + 2: delegate delegate } struct get { - 1: bool sbyte + 1: bool sbyte } struct partial { - 1: using using + 1: using using } enum Maybe { @@ -91,11 +91,11 @@ struct Tricky_ { } struct Nested { - 1: ClassAndProp ClassAndProp - 2: second_chance second_chance - 3: NOW_EAT_THIS NOW_EAT_THIS - 4: TheEdgeCase TheEdgeCase - 5: Tricky_ Tricky_ + 1: ClassAndProp ClassAndProp + 2: second_chance second_chance + 3: NOW_EAT_THIS NOW_EAT_THIS + 4: TheEdgeCase TheEdgeCase + 5: Tricky_ Tricky_ 6: Nested Nested } @@ -106,12 +106,12 @@ exception Problem_ { service extern { - delegate event(1: partial get) - void Foo(1: Nested Foo_args) throws (1: Problem_ Foo_result) + delegate event(1: partial get) + void Foo(1: Nested Foo_args) throws (1: Problem_ Foo_result) } service qualified { - Maybe maybe(1: Maybe foldr) - Either either(1: foldr of) + Maybe maybe(1: Maybe foldr) + Either either(1: foldr of) } // eof http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/test/Recursive.thrift ---------------------------------------------------------------------- diff --git a/test/Recursive.thrift b/test/Recursive.thrift index 9c29983..c982582 100644 --- a/test/Recursive.thrift +++ b/test/Recursive.thrift @@ -23,12 +23,12 @@ struct RecTree { } struct RecList { - 1: RecList & nextitem + 1: RecList & nextitem 3: i16 item } struct CoRec { - 1: CoRec2 & other + 1: CoRec2 & other } struct CoRec2 { http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/test/ThriftTest.thrift ---------------------------------------------------------------------- diff --git a/test/ThriftTest.thrift b/test/ThriftTest.thrift index 4a689fe..061a570 100644 --- a/test/ThriftTest.thrift +++ b/test/ThriftTest.thrift @@ -135,56 +135,56 @@ service ThriftTest * Prints "testVoid()" and returns nothing. */ void testVoid(), - + /** * Prints 'testString("%s")' with thing as '%s' * @param string thing - the string to print * @return string - returns the string 'thing' */ string testString(1: string thing), - + /** * Prints 'testByte("%d")' with thing as '%d' * @param byte thing - the byte to print * @return byte - returns the byte 'thing' */ byte testByte(1: byte thing), - + /** * Prints 'testI32("%d")' with thing as '%d' * @param i32 thing - the i32 to print * @return i32 - returns the i32 'thing' */ i32 testI32(1: i32 thing), - + /** * Prints 'testI64("%d")' with thing as '%d' * @param i64 thing - the i64 to print * @return i64 - returns the i64 'thing' */ i64 testI64(1: i64 thing), - + /** * Prints 'testDouble("%f")' with thing as '%f' * @param double thing - the double to print * @return double - returns the double 'thing' */ double testDouble(1: double thing), - + /** * Prints 'testStruct("{%s}")' where thing has been formatted into a string of comma seperated values * @param Xtruct thing - the Xtruct to print * @return Xtruct - returns the Xtruct 'thing' */ Xtruct testStruct(1: Xtruct thing), - + /** * Prints 'testNest("{%s}")' where thing has been formatted into a string of the nested struct * @param Xtruct2 thing - the Xtruct2 to print * @return Xtruct2 - returns the Xtruct2 'thing' */ Xtruct2 testNest(1: Xtruct2 thing), - + /** * Prints 'testMap("{%s")' where thing has been formatted into a string of 'key => value' pairs * seperated by commas and new lines @@ -192,7 +192,7 @@ service ThriftTest * @return map<i32,i32> - returns the map<i32,i32> 'thing' */ map<i32,i32> testMap(1: map<i32,i32> thing), - + /** * Prints 'testStringMap("{%s}")' where thing has been formatted into a string of 'key => value' pairs * seperated by commas and new lines @@ -200,7 +200,7 @@ service ThriftTest * @return map<string,string> - returns the map<string,string> 'thing' */ map<string,string> testStringMap(1: map<string,string> thing), - + /** * Prints 'testSet("{%s}")' where thing has been formatted into a string of values * seperated by commas and new lines @@ -208,7 +208,7 @@ service ThriftTest * @return set<i32> - returns the set<i32> 'thing' */ set<i32> testSet(1: set<i32> thing), - + /** * Prints 'testList("{%s}")' where thing has been formatted into a string of values * seperated by commas and new lines @@ -216,7 +216,7 @@ service ThriftTest * @return list<i32> - returns the list<i32> 'thing' */ list<i32> testList(1: list<i32> thing), - + /** * Prints 'testEnum("%d")' where thing has been formatted into it's numeric value * @param Numberz thing - the Numberz to print @@ -243,23 +243,23 @@ service ThriftTest * So you think you've got this all worked, out eh? * * Creates a the returned map with these values and prints it out: - * { 1 => { 2 => argument, - * 3 => argument, + * { 1 => { 2 => argument, + * 3 => argument, * }, * 2 => { 6 => <empty Insanity struct>, }, * } - * @return map<UserId, map<Numberz,Insanity>> - a map with the above values + * @return map<UserId, map<Numberz,Insanity>> - a map with the above values */ map<UserId, map<Numberz,Insanity>> testInsanity(1: Insanity argument), /** * Prints 'testMulti()' - * @param byte arg0 - - * @param i32 arg1 - - * @param i64 arg2 - - * @param map<i16, string> arg3 - - * @param Numberz arg4 - - * @param UserId arg5 - + * @param byte arg0 - + * @param i32 arg1 - + * @param i64 arg2 - + * @param map<i16, string> arg3 - + * @param Numberz arg4 - + * @param UserId arg5 - * @return Xtruct - returns an Xtruct with string_thing = "Hello2, byte_thing = arg0, i32_thing = arg1 * and i64_thing = arg2 */ http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/test/c_glib/Makefile.am ---------------------------------------------------------------------- diff --git a/test/c_glib/Makefile.am b/test/c_glib/Makefile.am index de23cb9..7de3998 100755 --- a/test/c_glib/Makefile.am +++ b/test/c_glib/Makefile.am @@ -19,34 +19,34 @@ .NOTPARALLEL: noinst_LTLIBRARIES = libtestcglib.la nodist_libtestcglib_la_SOURCES = \ - gen-c_glib/t_test_second_service.c \ - gen-c_glib/t_test_second_service.h \ - gen-c_glib/t_test_thrift_test.c \ - gen-c_glib/t_test_thrift_test.h \ - gen-c_glib/t_test_thrift_test_types.c \ - gen-c_glib/t_test_thrift_test_types.h + gen-c_glib/t_test_second_service.c \ + gen-c_glib/t_test_second_service.h \ + gen-c_glib/t_test_thrift_test.c \ + gen-c_glib/t_test_thrift_test.h \ + gen-c_glib/t_test_thrift_test_types.c \ + gen-c_glib/t_test_thrift_test_types.h libtestcglib_la_LIBADD = $(top_builddir)/lib/c_glib/libthrift_c_glib.la check_PROGRAMS = \ - test_client \ - test_server + test_client \ + test_server test_client_SOURCES = \ - src/test_client.c + src/test_client.c test_client_LDADD = \ - libtestcglib.la \ - $(top_builddir)/lib/c_glib/libthrift_c_glib.la + libtestcglib.la \ + $(top_builddir)/lib/c_glib/libthrift_c_glib.la test_server_SOURCES = \ - src/thrift_test_handler.c \ - src/thrift_test_handler.h \ - src/test_server.c + src/thrift_test_handler.c \ + src/thrift_test_handler.h \ + src/test_server.c test_server_LDADD = \ - libtestcglib.la \ - $(top_builddir)/lib/c_glib/libthrift_c_glib.la + libtestcglib.la \ + $(top_builddir)/lib/c_glib/libthrift_c_glib.la # # Common thrift code generation rules @@ -54,7 +54,7 @@ test_server_LDADD = \ THRIFT = $(top_builddir)/compiler/cpp/thrift gen-c_glib/t_test_second_service.c gen-c_glib/t_test_second_service.h gen-c_glib/t_test_thrift_test.c gen-c_glib/t_test_thrift_test.h gen-c_glib/t_test_thrift_test_types.c gen-c_glib/t_test_thrift_test_types.h: $(top_srcdir)/test/ThriftTest.thrift - $(THRIFT) --gen c_glib -r $< + $(THRIFT) --gen c_glib -r $< AM_CFLAGS = -g -Wall -Wextra $(GLIB_CFLAGS) $(GOBJECT_CFLAGS) AM_CXXFLAGS = $(AM_CFLAGS) @@ -62,10 +62,10 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib/c_glib/src -Igen-c_glib AM_LDFLAGS = $(GLIB_LIBS) $(GOBJECT_LIBS) @GCOV_LDFLAGS@ clean-local: - $(RM) -r gen-c_glib + $(RM) -r gen-c_glib EXTRA_DIST = \ - src/test_client.c \ - src/thrift_test_handler.c \ - src/thrift_test_handler.h \ - src/test_server.c + src/test_client.c \ + src/thrift_test_handler.c \ + src/thrift_test_handler.h \ + src/test_server.c http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/test/cpp/Makefile.am ---------------------------------------------------------------------- diff --git a/test/cpp/Makefile.am b/test/cpp/Makefile.am index 3dbcaaa..d1086c0 100755 --- a/test/cpp/Makefile.am +++ b/test/cpp/Makefile.am @@ -19,94 +19,94 @@ .NOTPARALLEL: noinst_LTLIBRARIES = libtestgencpp.la libstresstestgencpp.la nodist_libtestgencpp_la_SOURCES = \ - gen-cpp/ThriftTest_constants.cpp \ - gen-cpp/ThriftTest_constants.h \ - gen-cpp/ThriftTest_types.cpp \ - gen-cpp/ThriftTest_types.h \ - gen-cpp/ThriftTest_types.tcc \ - gen-cpp/ThriftTest.cpp \ - gen-cpp/ThriftTest.h \ - gen-cpp/ThriftTest.tcc \ - src/ThriftTest_extras.cpp + gen-cpp/ThriftTest_constants.cpp \ + gen-cpp/ThriftTest_constants.h \ + gen-cpp/ThriftTest_types.cpp \ + gen-cpp/ThriftTest_types.h \ + gen-cpp/ThriftTest_types.tcc \ + gen-cpp/ThriftTest.cpp \ + gen-cpp/ThriftTest.h \ + gen-cpp/ThriftTest.tcc \ + src/ThriftTest_extras.cpp libtestgencpp_la_LIBADD = $(top_builddir)/lib/cpp/libthrift.la nodist_libstresstestgencpp_la_SOURCES = \ - gen-cpp/StressTest_constants.cpp \ - gen-cpp/StressTest_types.cpp \ - gen-cpp/StressTest_constants.h \ - gen-cpp/StressTest_types.h \ - gen-cpp/Service.cpp \ - gen-cpp/Service.h + gen-cpp/StressTest_constants.cpp \ + gen-cpp/StressTest_types.cpp \ + gen-cpp/StressTest_constants.h \ + gen-cpp/StressTest_types.h \ + gen-cpp/Service.cpp \ + gen-cpp/Service.h libstresstestgencpp_la_LIBADD = $(top_builddir)/lib/cpp/libthrift.la check_PROGRAMS = \ - TestServer \ - TestClient \ - StressTest \ - StressTestNonBlocking + TestServer \ + TestClient \ + StressTest \ + StressTestNonBlocking # we currently do not run the testsuite, stop c++ server issue # TESTS = \ -# $(check_PROGRAMS) +# $(check_PROGRAMS) TestServer_SOURCES = \ - src/TestServer.cpp + src/TestServer.cpp TestServer_LDADD = \ - libtestgencpp.la \ - $(top_builddir)/lib/cpp/libthrift.la \ - $(top_builddir)/lib/cpp/libthriftz.la \ - $(top_builddir)/lib/cpp/libthriftnb.la \ - -levent -lboost_program_options -lboost_system -lboost_filesystem + libtestgencpp.la \ + $(top_builddir)/lib/cpp/libthrift.la \ + $(top_builddir)/lib/cpp/libthriftz.la \ + $(top_builddir)/lib/cpp/libthriftnb.la \ + -levent -lboost_program_options -lboost_system -lboost_filesystem TestClient_SOURCES = \ - src/TestClient.cpp + src/TestClient.cpp TestClient_LDADD = \ - libtestgencpp.la \ - $(top_builddir)/lib/cpp/libthrift.la \ - $(top_builddir)/lib/cpp/libthriftz.la \ - $(top_builddir)/lib/cpp/libthriftnb.la \ - -levent -lboost_program_options -lboost_system -lboost_filesystem + libtestgencpp.la \ + $(top_builddir)/lib/cpp/libthrift.la \ + $(top_builddir)/lib/cpp/libthriftz.la \ + $(top_builddir)/lib/cpp/libthriftnb.la \ + -levent -lboost_program_options -lboost_system -lboost_filesystem StressTest_SOURCES = \ - src/StressTest.cpp + src/StressTest.cpp StressTest_LDADD = \ - libstresstestgencpp.la \ - $(top_builddir)/lib/cpp/libthrift.la + libstresstestgencpp.la \ + $(top_builddir)/lib/cpp/libthrift.la StressTestNonBlocking_SOURCES = \ - src/StressTestNonBlocking.cpp + src/StressTestNonBlocking.cpp StressTestNonBlocking_LDADD = \ - libstresstestgencpp.la \ - $(top_builddir)/lib/cpp/libthriftnb.la \ - -levent + libstresstestgencpp.la \ + $(top_builddir)/lib/cpp/libthriftnb.la \ + -levent # # Common thrift code generation rules # THRIFT = $(top_builddir)/compiler/cpp/thrift gen-cpp/ThriftTest.cpp gen-cpp/ThriftTest_types.cpp gen-cpp/ThriftTest_constants.cpp: $(top_srcdir)/test/ThriftTest.thrift - $(THRIFT) --gen cpp:templates,cob_style -r $< + $(THRIFT) --gen cpp:templates,cob_style -r $< gen-cpp/StressTest_types.cpp gen-cpp/StressTest_constants.cpp: $(top_srcdir)/test/StressTest.thrift - $(THRIFT) --gen cpp $< + $(THRIFT) --gen cpp $< AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(LIBEVENT_CPPFLAGS) -I$(top_srcdir)/lib/cpp/src -Igen-cpp AM_CXXFLAGS = -Wall AM_LDFLAGS = $(BOOST_LDFLAGS) $(LIBEVENT_LDFLAGS) clean-local: - $(RM) -r gen-cpp + $(RM) -r gen-cpp EXTRA_DIST = \ - src/TestClient.cpp \ - src/TestServer.cpp \ - src/StressTest.cpp \ - src/StressTestNonBlocking.cpp \ - realloc/realloc_test.c \ - realloc/Makefile + src/TestClient.cpp \ + src/TestServer.cpp \ + src/StressTest.cpp \ + src/StressTestNonBlocking.cpp \ + realloc/realloc_test.c \ + realloc/Makefile http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/test/erl/Makefile.am ---------------------------------------------------------------------- diff --git a/test/erl/Makefile.am b/test/erl/Makefile.am index 309d07e..030c6fb 100644 --- a/test/erl/Makefile.am +++ b/test/erl/Makefile.am @@ -23,16 +23,16 @@ REBAR = $(top_srcdir)/lib/erl/rebar THRIFT_FILES = $(wildcard ../*.thrift) .generated: $(THRIFT_FILES) - for f in $(THRIFT_FILES) ; do \ - $(THRIFT) --gen erl $$f ; \ - done ; \ - $(THRIFT) --gen erl:legacynames LegacyNames.thrift - touch .generated + for f in $(THRIFT_FILES) ; do \ + $(THRIFT) --gen erl $$f ; \ + done ; \ + $(THRIFT) --gen erl:legacynames LegacyNames.thrift + touch .generated check: .generated - $(REBAR) eunit + $(REBAR) eunit clean: - rm -f .generated - rm -rf gen-erl - $(REBAR) clean + rm -f .generated + rm -rf gen-erl + $(REBAR) clean http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/test/go/Makefile.am ---------------------------------------------------------------------- diff --git a/test/go/Makefile.am b/test/go/Makefile.am index 66f81ad..afea106 100644 --- a/test/go/Makefile.am +++ b/test/go/Makefile.am @@ -24,36 +24,36 @@ THRIFTTEST = $(top_srcdir)/test/ThriftTest.thrift all: bin/testclient bin/testserver bin/stress ThriftTest.thrift: $(THRIFTTEST) - grep -v list.*map.*list.*map $(THRIFTTEST) > ThriftTest.thrift + grep -v list.*map.*list.*map $(THRIFTTEST) > ThriftTest.thrift # Thrift for GO has problems with complex map keys: THRIFT-2063 gopath: $(THRIFT) ThriftTest.thrift - mkdir -p src/gen - $(THRIFTCMD) ThriftTest.thrift - $(THRIFTCMD) ../StressTest.thrift - ln -nfs ../../../lib/go/thrift src/thrift - GOPATH=`pwd` $(GO) get code.google.com/p/gomock/gomock - touch gopath + mkdir -p src/gen + $(THRIFTCMD) ThriftTest.thrift + $(THRIFTCMD) ../StressTest.thrift + ln -nfs ../../../lib/go/thrift src/thrift + GOPATH=`pwd` $(GO) get code.google.com/p/gomock/gomock + touch gopath bin/testclient: gopath - GOPATH=`pwd` $(GO) install bin/testclient + GOPATH=`pwd` $(GO) install bin/testclient bin/testserver: gopath - GOPATH=`pwd` $(GO) install bin/testserver + GOPATH=`pwd` $(GO) install bin/testserver bin/stress: gopath - GOPATH=`pwd` $(GO) install bin/stress + GOPATH=`pwd` $(GO) install bin/stress clean-local: - $(RM) -r src/gen src/code.google.com src/thrift bin pkg gopath ThriftTest.thrift + $(RM) -r src/gen src/code.google.com src/thrift bin pkg gopath ThriftTest.thrift check: gopath - GOPATH=`pwd` $(GO) test -v common/... + GOPATH=`pwd` $(GO) test -v common/... genmock: gopath - GOPATH=`pwd` $(GO) install code.google.com/p/gomock/mockgen - GOPATH=`pwd` bin/mockgen -destination=src/common/mock_handler.go -package=common gen/thrifttest ThriftTest + GOPATH=`pwd` $(GO) install code.google.com/p/gomock/mockgen + GOPATH=`pwd` bin/mockgen -destination=src/common/mock_handler.go -package=common gen/thrifttest ThriftTest EXTRA_DIST = \ - src/bin \ - src/common + src/bin \ + src/common http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/test/hs/Makefile.am ---------------------------------------------------------------------- diff --git a/test/hs/Makefile.am b/test/hs/Makefile.am index 2629ca1..a39d025 100644 --- a/test/hs/Makefile.am +++ b/test/hs/Makefile.am @@ -20,24 +20,24 @@ THRIFT = $(top_srcdir)/compiler/cpp/thrift stubs: ../ConstantsDemo.thrift ../DebugProtoTest.thrift ../ThriftTest.thrift ../Include.thrift ../NameConflictTest.thrift - $(THRIFT) --gen hs ../ConstantsDemo.thrift - $(THRIFT) --gen hs ../DebugProtoTest.thrift - $(THRIFT) --gen hs ../ThriftTest.thrift - $(THRIFT) --gen hs ../Include.thrift - $(THRIFT) --gen hs ../NameConflictTest.thrift + $(THRIFT) --gen hs ../ConstantsDemo.thrift + $(THRIFT) --gen hs ../DebugProtoTest.thrift + $(THRIFT) --gen hs ../ThriftTest.thrift + $(THRIFT) --gen hs ../Include.thrift + $(THRIFT) --gen hs ../NameConflictTest.thrift check: stubs - sh run-test.sh ConstantsDemo - sh run-test.sh DebugProtoTest - sh run-test.sh ThriftTest - sh run-test.sh Include - sh run-test.sh NameConflictTest + sh run-test.sh ConstantsDemo + sh run-test.sh DebugProtoTest + sh run-test.sh ThriftTest + sh run-test.sh Include + sh run-test.sh NameConflictTest clean-local: - $(RM) -r gen-hs - $(RM) *.hi - $(RM) *.o + $(RM) -r gen-hs + $(RM) *.hi + $(RM) *.o all: check - ghc -igen-hs TestServer.hs - ghc -igen-hs TestClient.hs \ No newline at end of file + ghc -igen-hs TestServer.hs + ghc -igen-hs TestClient.hs \ No newline at end of file http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/test/perl/Makefile.am ---------------------------------------------------------------------- diff --git a/test/perl/Makefile.am b/test/perl/Makefile.am index 291106b..7fd151a 100644 --- a/test/perl/Makefile.am +++ b/test/perl/Makefile.am @@ -20,10 +20,10 @@ THRIFT = $(top_srcdir)/compiler/cpp/thrift stubs: ../ThriftTest.thrift - $(THRIFT) --gen perl ../ThriftTest.thrift + $(THRIFT) --gen perl ../ThriftTest.thrift check: stubs clean-local: - $(RM) -r gen-perl + $(RM) -r gen-perl http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/test/php/Makefile.am ---------------------------------------------------------------------- diff --git a/test/php/Makefile.am b/test/php/Makefile.am index 1625903..d3f38f8 100755 --- a/test/php/Makefile.am +++ b/test/php/Makefile.am @@ -20,13 +20,13 @@ THRIFT = $(top_srcdir)/compiler/cpp/thrift stubs: ../ThriftTest.thrift - $(THRIFT) --gen php ../ThriftTest.thrift - $(THRIFT) --gen php:inlined ../ThriftTest.thrift + $(THRIFT) --gen php ../ThriftTest.thrift + $(THRIFT) --gen php:inlined ../ThriftTest.thrift check: stubs clean-local: - $(RM) -r gen-php gen-phpi + $(RM) -r gen-php gen-phpi client: stubs - php TestClient.php + php TestClient.php http://git-wip-us.apache.org/repos/asf/thrift/blob/aaa8947f/test/py.tornado/Makefile.am ---------------------------------------------------------------------- diff --git a/test/py.tornado/Makefile.am b/test/py.tornado/Makefile.am index a8e680a..a33b725 100644 --- a/test/py.tornado/Makefile.am +++ b/test/py.tornado/Makefile.am @@ -20,11 +20,11 @@ THRIFT = $(top_srcdir)/compiler/cpp/thrift thrift_gen: ../ThriftTest.thrift ../SmallTest.thrift - $(THRIFT) --gen py:tornado ../ThriftTest.thrift - $(THRIFT) --gen py:tornado ../SmallTest.thrift + $(THRIFT) --gen py:tornado ../ThriftTest.thrift + $(THRIFT) --gen py:tornado ../SmallTest.thrift check: thrift_gen - ./test_suite.py + ./test_suite.py clean-local: - $(RM) -r gen-py.tornado + $(RM) -r gen-py.tornado
