Updated Branches: refs/heads/master a7da48805 -> 7757ce7ae
THRIFT-2090 Go generator, fix including of other thrift files Patch: Emir Habul Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/7757ce7a Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/7757ce7a Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/7757ce7a Branch: refs/heads/master Commit: 7757ce7aeb774294018e5515e5f5e93261e6dd3d Parents: a7da488 Author: Jens Geyer <[email protected]> Authored: Thu Jul 18 22:48:40 2013 +0200 Committer: Jens Geyer <[email protected]> Committed: Thu Jul 18 22:48:40 2013 +0200 ---------------------------------------------------------------------- lib/go/Makefile.am | 27 ++++++++++++++++++++++-- lib/go/test/IncludesTest.thrift | 41 ++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/7757ce7a/lib/go/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/go/Makefile.am b/lib/go/Makefile.am index 7c82467..1a83e58 100644 --- a/lib/go/Makefile.am +++ b/lib/go/Makefile.am @@ -1,12 +1,35 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +if WITH_TESTS +SUBDIRS = test +endif + install: @echo '##############################################################' @echo '##############################################################' - @echo 'The Go client library should be insalled via "go get", please see /lib/go/README' + @echo 'The Go client library should be installed via "go get", please see /lib/go/README' @echo '##############################################################' @echo '##############################################################' check-local: - go test ./thrift + $(GO) test ./thrift all-local: check-local http://git-wip-us.apache.org/repos/asf/thrift/blob/7757ce7a/lib/go/test/IncludesTest.thrift ---------------------------------------------------------------------- diff --git a/lib/go/test/IncludesTest.thrift b/lib/go/test/IncludesTest.thrift new file mode 100644 index 0000000..4416c09 --- /dev/null +++ b/lib/go/test/IncludesTest.thrift @@ -0,0 +1,41 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +include "ThriftTest.thrift" + +struct testStruct { + 1: list<ThriftTest.Numberz> listNumbers +} + +struct TestStruct2 { + 1: testStruct blah, +} + +service testService extends ThriftTest.SecondService { + ThriftTest.CrazyNesting getCrazyNesting( + 1: ThriftTest.StructA a, + 2: ThriftTest.Numberz numbers + ) throws(1: ThriftTest.Xception err1), + + void getSomeValue_DO_NOT_CALL(), +} + +service ExtendedService extends testService { + void extendedMethod(), +}
