diff options
author | Jens Geyer <jensg@apache.org> | 2022-06-13 23:37:25 +0200 |
---|---|---|
committer | Jens Geyer <jensg@apache.org> | 2022-09-05 22:04:22 +0200 |
commit | f066d84ffb7fe2eb0dc3b7e7cd0d0417a1ae7963 (patch) | |
tree | d47baa7d0dea62a354eb0ededf77715d6cf7aa33 /lib | |
parent | 3f4fa2947dc6e049e0f4748bdb6142b0c4673164 (diff) | |
download | thrift-f066d84ffb7fe2eb0dc3b7e7cd0d0417a1ae7963.tar.gz |
Replace ThriftTest.thrift with v0.16/ThriftTest.thrift to allow for merging the partially completed uuid implementation to master
Diffstat (limited to 'lib')
-rw-r--r-- | lib/c_glib/test/CMakeLists.txt | 6 | ||||
-rw-r--r-- | lib/c_glib/test/Makefile.am | 6 | ||||
-rw-r--r-- | lib/cpp/test/CMakeLists.txt | 4 | ||||
-rw-r--r-- | lib/cpp/test/Makefile.am | 4 | ||||
-rw-r--r-- | lib/d/test/Makefile.am | 4 | ||||
-rw-r--r-- | lib/erl/Makefile.am | 4 | ||||
-rw-r--r-- | lib/go/test/Makefile.am | 2 | ||||
-rw-r--r-- | lib/js/Gruntfile.js | 12 | ||||
-rw-r--r-- | lib/js/test/build.xml | 4 | ||||
-rw-r--r-- | lib/json/schema.json | 5 | ||||
-rw-r--r-- | lib/json/test/build.xml | 2 | ||||
-rw-r--r-- | lib/nodejs/Makefile.am | 4 | ||||
-rwxr-xr-x | lib/nodejs/test/testAll.sh | 4 | ||||
-rw-r--r-- | lib/nodets/Makefile.am | 4 | ||||
-rwxr-xr-x | lib/nodets/test/runClient.sh | 4 | ||||
-rwxr-xr-x | lib/nodets/test/runServer.sh | 4 | ||||
-rwxr-xr-x | lib/nodets/test/testAll.sh | 4 | ||||
-rw-r--r-- | lib/perl/Makefile.am | 2 | ||||
-rw-r--r-- | lib/php/test/Makefile.am | 4 | ||||
-rw-r--r-- | lib/php/test/TestValidators.thrift | 2 | ||||
-rw-r--r-- | lib/rb/Rakefile | 2 | ||||
-rw-r--r-- | lib/ts/Gruntfile.js | 4 | ||||
-rw-r--r-- | lib/ts/test/build.xml | 4 |
23 files changed, 48 insertions, 47 deletions
diff --git a/lib/c_glib/test/CMakeLists.txt b/lib/c_glib/test/CMakeLists.txt index 85c6dd0f4..4d3092fb8 100644 --- a/lib/c_glib/test/CMakeLists.txt +++ b/lib/c_glib/test/CMakeLists.txt @@ -197,7 +197,7 @@ add_custom_command(OUTPUT 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 - COMMAND ${THRIFT_COMPILER} --gen c_glib ${PROJECT_SOURCE_DIR}/test/DebugProtoTest.thrift + COMMAND ${THRIFT_COMPILER} --gen c_glib ${PROJECT_SOURCE_DIR}/test/v0.16/DebugProtoTest.thrift ) add_custom_command(OUTPUT @@ -221,7 +221,7 @@ add_custom_command(OUTPUT 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 - COMMAND ${THRIFT_COMPILER} --gen c_glib ${PROJECT_SOURCE_DIR}/test/ThriftTest.thrift + COMMAND ${THRIFT_COMPILER} --gen c_glib ${PROJECT_SOURCE_DIR}/test/v0.16/ThriftTest.thrift ) add_custom_command(OUTPUT @@ -231,7 +231,7 @@ add_custom_command(OUTPUT gen-cpp/ThriftTest.h gen-cpp/ThriftTest_constants.h gen-cpp/ThriftTest_types.h - COMMAND ${THRIFT_COMPILER} --gen cpp ${PROJECT_SOURCE_DIR}/test/ThriftTest.thrift + COMMAND ${THRIFT_COMPILER} --gen cpp ${PROJECT_SOURCE_DIR}/test/v0.16/ThriftTest.thrift ) # TODO: Add memory checks using ctest_memcheck or similar diff --git a/lib/c_glib/test/Makefile.am b/lib/c_glib/test/Makefile.am index 023165adb..f3a0c30df 100644 --- a/lib/c_glib/test/Makefile.am +++ b/lib/c_glib/test/Makefile.am @@ -323,7 +323,7 @@ libtestgencpp_la_CPPFLAGS = -I../../cpp/src $(BOOST_CPPFLAGS) -I./gen-cpp gen-c_glib/t_test_container_test_types.c gen-c_glib/t_test_container_test_types.h gen-c_glib/t_test_container_service.c gen-c_glib/t_test_container_service.h: ContainerTest.thrift $(THRIFT) $(THRIFT) --gen c_glib $< -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/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/v0.16/DebugProtoTest.thrift $(THRIFT) $(THRIFT) --gen c_glib $< gen-c_glib/t_test_enum_test_types.c gen-c_glib/t_test_enum_test_types.h gen-c_glib/t_test_enum_test_service.c gen-c_glib/t_test_enum_test_service.h : ../../../test/EnumTest.thrift $(THRIFT) @@ -332,10 +332,10 @@ gen-c_glib/t_test_enum_test_types.c gen-c_glib/t_test_enum_test_types.h gen-c_gl gen-c_glib/t_test_optional_required_test_types.c gen-c_glib/t_test_optional_required_test_types.h: ../../../test/OptionalRequiredTest.thrift $(THRIFT) $(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/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/v0.16/ThriftTest.thrift $(THRIFT) $(THRIFT) --gen c_glib $< -gen-cpp/ThriftTest.cpp gen-cpp/ThriftTest_constants.cpp gen-cpp/ThriftTest_types.cpp: ../../../test/ThriftTest.thrift $(THRIFT) +gen-cpp/ThriftTest.cpp gen-cpp/ThriftTest_constants.cpp gen-cpp/ThriftTest_types.cpp: ../../../test/v0.16/ThriftTest.thrift $(THRIFT) $(THRIFT) --gen cpp $< TESTS = \ diff --git a/lib/cpp/test/CMakeLists.txt b/lib/cpp/test/CMakeLists.txt index 19854e1a3..f9eee38e2 100644 --- a/lib/cpp/test/CMakeLists.txt +++ b/lib/cpp/test/CMakeLists.txt @@ -360,7 +360,7 @@ add_custom_command(OUTPUT gen-cpp/AnnotationTest_constants.cpp ) add_custom_command(OUTPUT gen-cpp/DebugProtoTest_types.cpp gen-cpp/DebugProtoTest_types.h gen-cpp/EmptyService.cpp gen-cpp/EmptyService.h - COMMAND ${THRIFT_COMPILER} --gen cpp ${PROJECT_SOURCE_DIR}/test/DebugProtoTest.thrift + COMMAND ${THRIFT_COMPILER} --gen cpp ${PROJECT_SOURCE_DIR}/test/v0.16/DebugProtoTest.thrift ) add_custom_command(OUTPUT gen-cpp/EnumTest_types.cpp gen-cpp/EnumTest_types.h @@ -384,7 +384,7 @@ add_custom_command(OUTPUT gen-cpp/Service.cpp gen-cpp/StressTest_types.cpp ) add_custom_command(OUTPUT gen-cpp/SecondService.cpp gen-cpp/ThriftTest_constants.cpp gen-cpp/ThriftTest.cpp gen-cpp/ThriftTest_types.cpp gen-cpp/ThriftTest_types.h - COMMAND ${THRIFT_COMPILER} --gen cpp ${PROJECT_SOURCE_DIR}/test/ThriftTest.thrift + COMMAND ${THRIFT_COMPILER} --gen cpp ${PROJECT_SOURCE_DIR}/test/v0.16/ThriftTest.thrift ) add_custom_command(OUTPUT gen-cpp/OneWayService.cpp gen-cpp/OneWayTest_types.h gen-cpp/OneWayService.h diff --git a/lib/cpp/test/Makefile.am b/lib/cpp/test/Makefile.am index 7f630db10..cd401c0f3 100644 --- a/lib/cpp/test/Makefile.am +++ b/lib/cpp/test/Makefile.am @@ -386,7 +386,7 @@ OpenSSLManualInitTest_LDADD = \ gen-cpp/AnnotationTest_constants.cpp gen-cpp/AnnotationTest_constants.h gen-cpp/AnnotationTest_types.cpp gen-cpp/AnnotationTest_types.h: $(top_srcdir)/test/AnnotationTest.thrift $(THRIFT) --gen cpp $< -gen-cpp/DebugProtoTest_types.cpp gen-cpp/DebugProtoTest_types.h gen-cpp/EmptyService.cpp gen-cpp/EmptyService.h: $(top_srcdir)/test/DebugProtoTest.thrift +gen-cpp/DebugProtoTest_types.cpp gen-cpp/DebugProtoTest_types.h gen-cpp/EmptyService.cpp gen-cpp/EmptyService.h: $(top_srcdir)/test/v0.16/DebugProtoTest.thrift $(THRIFT) --gen cpp $< gen-cpp/DoubleConstantsTest_constants.cpp gen-cpp/DoubleConstantsTest_constants.h: $(top_srcdir)/test/DoubleConstantsTest.thrift @@ -408,7 +408,7 @@ gen-cpp/Recursive_types.cpp gen-cpp/Recursive_types.h: $(top_srcdir)/test/Recurs gen-cpp/Service.cpp gen-cpp/StressTest_types.cpp: $(top_srcdir)/test/StressTest.thrift $(THRIFT) --gen cpp $< -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 +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/v0.16/ThriftTest.thrift $(THRIFT) --gen cpp $< gen-cpp/OneWayService.cpp gen-cpp/OneWayTest_types.h gen-cpp/OneWayService.h: OneWayTest.thrift diff --git a/lib/d/test/Makefile.am b/lib/d/test/Makefile.am index 5ec8255bb..44364f9d9 100644 --- a/lib/d/test/Makefile.am +++ b/lib/d/test/Makefile.am @@ -23,7 +23,7 @@ AUTOMAKE_OPTIONS = serial-tests debug_proto_gen = $(addprefix gen-d/, DebugProtoTest_types.d) -$(debug_proto_gen): $(top_srcdir)/test/DebugProtoTest.thrift +$(debug_proto_gen): $(top_srcdir)/test/v0.16/DebugProtoTest.thrift $(THRIFT) --gen d -nowarn $< stress_test_gen = $(addprefix gen-d/thrift/test/stress/, Service.d \ @@ -35,7 +35,7 @@ $(stress_test_gen): $(top_srcdir)/test/StressTest.thrift thrift_test_gen = $(addprefix gen-d/thrift/test/, SecondService.d \ ThriftTest.d ThriftTest_constants.d ThriftTest_types.d) -$(thrift_test_gen): $(top_srcdir)/test/ThriftTest.thrift +$(thrift_test_gen): $(top_srcdir)/test/v0.16/ThriftTest.thrift $(THRIFT) --gen d $< diff --git a/lib/erl/Makefile.am b/lib/erl/Makefile.am index bf7abd549..35dad4f08 100644 --- a/lib/erl/Makefile.am +++ b/lib/erl/Makefile.am @@ -21,10 +21,10 @@ THRIFT = ../../compiler/cpp/thrift THRIFT_OMIT_FILE = test/Thrift_omit_without.thrift THRIFT_FILES = $(wildcard test/*.thrift) \ $(THRIFT_OMIT_FILE) \ - ../../test/ConstantsDemo.thrift \ + ../../test/v0.16/ConstantsDemo.thrift \ ../../test/NameConflictTest.thrift \ ../../test/DoubleConstantsTest.thrift \ - ../../test/ThriftTest.thrift + ../../test/v0.16/ThriftTest.thrift ERL_FLAG = erl ERL_FLAG_LEGACY = erl:legacynames diff --git a/lib/go/test/Makefile.am b/lib/go/test/Makefile.am index d938449a1..992a84357 100644 --- a/lib/go/test/Makefile.am +++ b/lib/go/test/Makefile.am @@ -26,7 +26,7 @@ endif THRIFT_GO_ARGS_BASE = thrift_import=github.com/apache/thrift/lib/go/thrift,package_prefix=github.com/apache/thrift/lib/go/test/gopath/src/ THRIFTARGS = -out gopath/src/ --gen go:$(THRIFT_GO_ARGS_BASE)$(COMPILER_EXTRAFLAG) -THRIFTTEST = $(top_srcdir)/test/ThriftTest.thrift +THRIFTTEST = $(top_srcdir)/test/v0.16/ThriftTest.thrift THRIFTARGS_SKIP_REMOTE = -out gopath/src/ --gen go:skip_remote,$(THRIFT_GO_ARGS_BASE)$(COMPILER_EXTRAFLAG) diff --git a/lib/js/Gruntfile.js b/lib/js/Gruntfile.js index 4421f0cb4..97713140a 100644 --- a/lib/js/Gruntfile.js +++ b/lib/js/Gruntfile.js @@ -49,16 +49,16 @@ module.exports = function(grunt) { }, ThriftGen: { command: [ - '"../../compiler/cpp/thrift" -gen js --out test/gen-js ../../test/ThriftTest.thrift', + '"../../compiler/cpp/thrift" -gen js --out test/gen-js ../../test/v0.16/ThriftTest.thrift', '"../../compiler/cpp/thrift" -gen js --out test/gen-js ../../test/JsDeepConstructorTest.thrift', - '"../../compiler/cpp/thrift" -gen js:jquery --out test/gen-js-jquery ../../test/ThriftTest.thrift', - '"../../compiler/cpp/thrift" -gen js:node --out test/gen-nodejs ../../test/ThriftTest.thrift', - '"../../compiler/cpp/thrift" -gen js:es6 --out test/gen-js-es6 ../../test/ThriftTest.thrift', - '"../../compiler/cpp/thrift" -gen js:node,es6 --out ./test/gen-nodejs-es6 ../../test/ThriftTest.thrift', + '"../../compiler/cpp/thrift" -gen js:jquery --out test/gen-js-jquery ../../test/v0.16/ThriftTest.thrift', + '"../../compiler/cpp/thrift" -gen js:node --out test/gen-nodejs ../../test/v0.16/ThriftTest.thrift', + '"../../compiler/cpp/thrift" -gen js:es6 --out test/gen-js-es6 ../../test/v0.16/ThriftTest.thrift', + '"../../compiler/cpp/thrift" -gen js:node,es6 --out ./test/gen-nodejs-es6 ../../test/v0.16/ThriftTest.thrift', ].join(' && ') }, ThriftGenJQ: { - command: '../../compiler/cpp/thrift -gen js:jquery -gen js:node -o test ../../test/ThriftTest.thrift' + command: '../../compiler/cpp/thrift -gen js:jquery -gen js:node -o test ../../test/v0.16/ThriftTest.thrift' }, ThriftGenDeepConstructor: { command: '../../compiler/cpp/thrift -gen js -o test ../../test/JsDeepConstructorTest.thrift' diff --git a/lib/js/test/build.xml b/lib/js/test/build.xml index db8501229..e02c1543c 100644 --- a/lib/js/test/build.xml +++ b/lib/js/test/build.xml @@ -162,10 +162,10 @@ <target name="generate"> <exec executable="${thrift.compiler}" failonerror="true"> - <arg line="--gen java ${thrift.dir}/test/ThriftTest.thrift" /> + <arg line="--gen java ${thrift.dir}/test/v0.16/ThriftTest.thrift" /> </exec> <exec executable="${thrift.compiler}" failonerror="true"> - <arg line="--gen js:jquery ${thrift.dir}/test/ThriftTest.thrift" /> + <arg line="--gen js:jquery ${thrift.dir}/test/v0.16/ThriftTest.thrift" /> </exec> <exec executable="${thrift.compiler}" failonerror="true"> <arg line="--gen js:jquery ${thrift.dir}/test/DoubleConstantsTest.thrift" /> diff --git a/lib/json/schema.json b/lib/json/schema.json index d058a7c1a..90bb7a59d 100644 --- a/lib/json/schema.json +++ b/lib/json/schema.json @@ -22,7 +22,8 @@ "map", "union", "struct", - "binary" + "binary", + "uuid" ] }, "base-type": { @@ -30,7 +31,7 @@ "type": "object", "properties": { "typeId": { - "enum": ["void", "string", "bool", "byte", "i8", "i16", "i32", "i64", "double", "binary" ] + "enum": ["void", "string", "bool", "byte", "i8", "i16", "i32", "i64", "double", "binary", "uuid" ] } }, "required": [ "typeId" ] diff --git a/lib/json/test/build.xml b/lib/json/test/build.xml index eb39c4f28..a1f41f12a 100644 --- a/lib/json/test/build.xml +++ b/lib/json/test/build.xml @@ -70,7 +70,7 @@ <exec executable="${thrift.compiler}" failonerror="true"> <arg line="--gen json"/> <arg line="-out ${gen.json.dir}"/> - <arg line="${thrift.test.dir}/ThriftTest.thrift"/> + <arg line="${thrift.test.dir}/v0.16/ThriftTest.thrift"/> </exec> <exec executable="${thrift.compiler}" failonerror="true"> <arg line="--gen json:merge"/> diff --git a/lib/nodejs/Makefile.am b/lib/nodejs/Makefile.am index 67f6ff6a9..669157962 100644 --- a/lib/nodejs/Makefile.am +++ b/lib/nodejs/Makefile.am @@ -17,8 +17,8 @@ # We call npm twice to work around npm issues -stubs: $(top_srcdir)/test/ThriftTest.thrift - $(THRIFT) --gen js:node -o test/ $(top_srcdir)/test/ThriftTest.thrift +stubs: $(top_srcdir)/test/v0.16/ThriftTest.thrift + $(THRIFT) --gen js:node -o test/ $(top_srcdir)/test/v0.16/ThriftTest.thrift deps: $(top_srcdir)/package.json $(NPM) install $(top_srcdir)/ || $(NPM) install $(top_srcdir)/ diff --git a/lib/nodejs/test/testAll.sh b/lib/nodejs/test/testAll.sh index 3ae88b369..37b6b438d 100755 --- a/lib/nodejs/test/testAll.sh +++ b/lib/nodejs/test/testAll.sh @@ -87,11 +87,11 @@ TESTOK=0 # generating Thrift code -${THRIFT_COMPILER} -o ${DIR} --gen js:node ${THRIFT_FILES_DIR}/ThriftTest.thrift +${THRIFT_COMPILER} -o ${DIR} --gen js:node ${THRIFT_FILES_DIR}/v0.16/ThriftTest.thrift ${THRIFT_COMPILER} -o ${DIR} --gen js:node ${THRIFT_FILES_DIR}/JsDeepConstructorTest.thrift ${THRIFT_COMPILER} -o ${DIR} --gen js:node ${THRIFT_FILES_DIR}/Int64Test.thrift mkdir ${DIR}/gen-nodejs-es6 -${THRIFT_COMPILER} -out ${DIR}/gen-nodejs-es6 --gen js:node,es6 ${THRIFT_FILES_DIR}/ThriftTest.thrift +${THRIFT_COMPILER} -out ${DIR}/gen-nodejs-es6 --gen js:node,es6 ${THRIFT_FILES_DIR}/v0.16/ThriftTest.thrift ${THRIFT_COMPILER} -out ${DIR}/gen-nodejs-es6 --gen js:node,es6 ${THRIFT_FILES_DIR}/JsDeepConstructorTest.thrift ${THRIFT_COMPILER} -out ${DIR}/gen-nodejs-es6 --gen js:node,es6 ${THRIFT_FILES_DIR}/Int64Test.thrift diff --git a/lib/nodets/Makefile.am b/lib/nodets/Makefile.am index 939dff2a5..02d0c11fe 100644 --- a/lib/nodets/Makefile.am +++ b/lib/nodets/Makefile.am @@ -17,9 +17,9 @@ # We call npm twice to work around npm issues -stubs: $(top_srcdir)/test/ThriftTest.thrift +stubs: $(top_srcdir)/test/v0.16/ThriftTest.thrift mkdir -p test-compiled - $(THRIFT) --gen js:node,ts -o test/ $(top_srcdir)/test/ThriftTest.thrift && $(THRIFT) --gen js:node,ts -o test-compiled $(top_srcdir)/test/ThriftTest.thrift + $(THRIFT) --gen js:node,ts -o test/ $(top_srcdir)/test/v0.16/ThriftTest.thrift && $(THRIFT) --gen js:node,ts -o test-compiled $(top_srcdir)/test/v0.16/ThriftTest.thrift $(THRIFT) --gen js:node,ts -o test/ $(top_srcdir)/test/Int64Test.thrift && $(THRIFT) --gen js:node,ts -o test-compiled $(top_srcdir)/test/Int64Test.thrift ts-compile: stubs diff --git a/lib/nodets/test/runClient.sh b/lib/nodets/test/runClient.sh index 8d5e9a33f..9497da388 100755 --- a/lib/nodets/test/runClient.sh +++ b/lib/nodets/test/runClient.sh @@ -10,8 +10,8 @@ export NODE_PATH="${DIR}:${DIR}/../../nodejs/lib:${NODE_PATH}" compile() { #generating thrift code - ${DIR}/../../../compiler/cpp/thrift -o ${DIR} --gen js:node,ts ${DIR}/../../../test/ThriftTest.thrift - ${DIR}/../../../compiler/cpp/thrift -o ${COMPILEDDIR} --gen js:node,ts ${DIR}/../../../test/ThriftTest.thrift + ${DIR}/../../../compiler/cpp/thrift -o ${DIR} --gen js:node,ts ${DIR}/../../../test/v0.16/ThriftTest.thrift + ${DIR}/../../../compiler/cpp/thrift -o ${COMPILEDDIR} --gen js:node,ts ${DIR}/../../../test/v0.16/ThriftTest.thrift } compile diff --git a/lib/nodets/test/runServer.sh b/lib/nodets/test/runServer.sh index 4eee92717..ec26513d1 100755 --- a/lib/nodets/test/runServer.sh +++ b/lib/nodets/test/runServer.sh @@ -10,8 +10,8 @@ export NODE_PATH="${DIR}:${DIR}/../../nodejs/lib:${NODE_PATH}" compile() { #generating thrift code - ${DIR}/../../../compiler/cpp/thrift -o ${DIR} --gen js:node,ts ${DIR}/../../../test/ThriftTest.thrift - ${DIR}/../../../compiler/cpp/thrift -o ${COMPILEDDIR} --gen js:node,ts ${DIR}/../../../test/ThriftTest.thrift + ${DIR}/../../../compiler/cpp/thrift -o ${DIR} --gen js:node,ts ${DIR}/../../../test/v0.16/ThriftTest.thrift + ${DIR}/../../../compiler/cpp/thrift -o ${COMPILEDDIR} --gen js:node,ts ${DIR}/../../../test/v0.16/ThriftTest.thrift } compile diff --git a/lib/nodets/test/testAll.sh b/lib/nodets/test/testAll.sh index 3be12c362..8180e2a1a 100755 --- a/lib/nodets/test/testAll.sh +++ b/lib/nodets/test/testAll.sh @@ -10,9 +10,9 @@ export NODE_PATH="${DIR}:${DIR}/../../nodejs/lib:${NODE_PATH}" compile() { #generating thrift code - ${DIR}/../../../compiler/cpp/thrift -o ${DIR} --gen js:node,ts ${DIR}/../../../test/ThriftTest.thrift + ${DIR}/../../../compiler/cpp/thrift -o ${DIR} --gen js:node,ts ${DIR}/../../../test/v0.16/ThriftTest.thrift ${DIR}/../../../compiler/cpp/thrift -o ${DIR} --gen js:node,ts ${DIR}/../../../test/Int64Test.thrift - ${DIR}/../../../compiler/cpp/thrift -o ${COMPILEDDIR} --gen js:node,ts ${DIR}/../../../test/ThriftTest.thrift + ${DIR}/../../../compiler/cpp/thrift -o ${COMPILEDDIR} --gen js:node,ts ${DIR}/../../../test/v0.16/ThriftTest.thrift ${DIR}/../../../compiler/cpp/thrift -o ${COMPILEDDIR} --gen js:node,ts ${DIR}/../../../test/Int64Test.thrift tsc --outDir $COMPILEDDIR --project $DIR/tsconfig.json diff --git a/lib/perl/Makefile.am b/lib/perl/Makefile.am index 84009bd16..8b72436c5 100644 --- a/lib/perl/Makefile.am +++ b/lib/perl/Makefile.am @@ -68,7 +68,7 @@ EXTRA_DIST = \ README.md THRIFT = @top_builddir@/compiler/cpp/thrift -THRIFT_IF = @top_srcdir@/test/ThriftTest.thrift +THRIFT_IF = @top_srcdir@/test/v0.16/ThriftTest.thrift NAME_BENCHMARKSERVICE = @top_srcdir@/lib/rb/benchmark/Benchmark.thrift NAME_AGGR = @top_srcdir@/contrib/async-test/aggr.thrift diff --git a/lib/php/test/Makefile.am b/lib/php/test/Makefile.am index 6f4e50a50..30765c344 100644 --- a/lib/php/test/Makefile.am +++ b/lib/php/test/Makefile.am @@ -19,9 +19,9 @@ PHPUNIT=php $(top_srcdir)/vendor/bin/phpunit -stubs: ../../../test/ThriftTest.thrift TestValidators.thrift +stubs: ../../../test/v0.16/ThriftTest.thrift TestValidators.thrift mkdir -p ./packages/php - $(THRIFT) --gen php -r --out ./packages/php ../../../test/ThriftTest.thrift + $(THRIFT) --gen php -r --out ./packages/php ../../../test/v0.16/ThriftTest.thrift mkdir -p ./packages/phpv mkdir -p ./packages/phpvo mkdir -p ./packages/phpjs diff --git a/lib/php/test/TestValidators.thrift b/lib/php/test/TestValidators.thrift index 9c38d92af..a9804704c 100644 --- a/lib/php/test/TestValidators.thrift +++ b/lib/php/test/TestValidators.thrift @@ -19,7 +19,7 @@ namespace php TestValidators -include "../../../test/ThriftTest.thrift" +include "../../../test/v0.16/ThriftTest.thrift" union UnionOfStrings { 1: string aa; diff --git a/lib/rb/Rakefile b/lib/rb/Rakefile index b50928163..c6b650eae 100644 --- a/lib/rb/Rakefile +++ b/lib/rb/Rakefile @@ -65,7 +65,7 @@ namespace :'gen-rb' do task :'debug_proto' do sh "mkdir", "-p", "test/debug_proto" - sh THRIFT, '--gen', 'rb', "-o", "test/debug_proto", "../../test/DebugProtoTest.thrift" + sh THRIFT, '--gen', 'rb', "-o", "test/debug_proto", "../../test/v0.16/DebugProtoTest.thrift" end end diff --git a/lib/ts/Gruntfile.js b/lib/ts/Gruntfile.js index fcd79f8e5..61ab58274 100644 --- a/lib/ts/Gruntfile.js +++ b/lib/ts/Gruntfile.js @@ -32,9 +32,9 @@ module.exports = function(grunt) { ThriftGen: { command: [ 'mkdir -p test/gen-js', - '../../compiler/cpp/thrift -gen js:ts --out test/gen-js ../../test/ThriftTest.thrift', + '../../compiler/cpp/thrift -gen js:ts --out test/gen-js ../../test/v0.16/ThriftTest.thrift', 'mkdir -p test/gen-nodejs', - '../../compiler/cpp/thrift -gen js:node,ts --out test/gen-nodejs ../../test/ThriftTest.thrift', + '../../compiler/cpp/thrift -gen js:node,ts --out test/gen-nodejs ../../test/v0.16/ThriftTest.thrift', ].join(' && ') }, ThriftBrowserifyNodeInt64: { diff --git a/lib/ts/test/build.xml b/lib/ts/test/build.xml index 5c3a4a87b..a53335b1d 100644 --- a/lib/ts/test/build.xml +++ b/lib/ts/test/build.xml @@ -167,10 +167,10 @@ <target name="generate"> <exec executable="${thrift.compiler}" failonerror="true"> - <arg line="--gen java ${thrift.dir}/test/ThriftTest.thrift" /> + <arg line="--gen java ${thrift.dir}/test/v0.16/ThriftTest.thrift" /> </exec> <exec executable="${thrift.compiler}" failonerror="true"> - <arg line="--gen js:jquery ${thrift.dir}/test/ThriftTest.thrift" /> + <arg line="--gen js:jquery ${thrift.dir}/test/v0.16/ThriftTest.thrift" /> </exec> <exec executable="${thrift.compiler}" failonerror="true"> <arg line="--gen js:jquery ${thrift.dir}/test/DoubleConstantsTest.thrift" /> |