From 7c7a5e05ba5dd7ddb30b2787da7ec52f3b9e8f6f Mon Sep 17 00:00:00 2001 From: Jake Farrell Date: Thu, 11 Oct 2012 00:29:11 +0000 Subject: Thrift-1721:Dist broken due to 0.8.0 to 0.9.0 changes Client: build Patch: Jake Farrell Fix dist build to create the 0.9.0 release git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1396880 13f79535-47bb-0310-9956-ffa450edef68 --- compiler/cpp/Makefile.am | 1 + lib/Makefile.am | 1 + lib/cpp/test/Makefile.am | 4 +++- lib/d/Makefile.am | 2 ++ lib/php/Makefile.am | 6 +++++- lib/php/test/Makefile.am | 2 ++ test/Makefile.am | 2 ++ 7 files changed, 16 insertions(+), 2 deletions(-) diff --git a/compiler/cpp/Makefile.am b/compiler/cpp/Makefile.am index 391f35ddf..f47b15f05 100644 --- a/compiler/cpp/Makefile.am +++ b/compiler/cpp/Makefile.am @@ -60,6 +60,7 @@ thrift_SOURCES = src/main.cc \ src/parse/parse.cc \ src/generate/t_generator.h \ src/generate/t_oop_generator.h \ + src/generate/t_html_generator.h \ src/windows/config.h \ src/windows/version.h diff --git a/lib/Makefile.am b/lib/Makefile.am index f95428f7e..d26752b5f 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -71,6 +71,7 @@ endif EXTRA_DIST = \ as3 \ cocoa \ + d \ delphi \ go \ javame \ diff --git a/lib/cpp/test/Makefile.am b/lib/cpp/test/Makefile.am index f2ffa4550..05ee9cc2f 100755 --- a/lib/cpp/test/Makefile.am +++ b/lib/cpp/test/Makefile.am @@ -231,4 +231,6 @@ clean-local: EXTRA_DIST = \ DenseProtoTest.cpp \ ThriftTest_extras.cpp \ - DebugProtoTest_extras.cpp + DebugProtoTest_extras.cpp \ + concurrency \ + processor diff --git a/lib/d/Makefile.am b/lib/d/Makefile.am index d76a07eff..36a758ca7 100644 --- a/lib/d/Makefile.am +++ b/lib/d/Makefile.am @@ -178,4 +178,6 @@ TESTS = $(addprefix unittest/debug/, $(d_test_modules)) \ EXTRA_DIST = \ + src \ + test \ README diff --git a/lib/php/Makefile.am b/lib/php/Makefile.am index 5c4d0f404..d374cbce9 100755 --- a/lib/php/Makefile.am +++ b/lib/php/Makefile.am @@ -91,6 +91,10 @@ phptype_DATA = \ lib/Thrift/Type/TMessageType.php \ lib/Thrift/Type/TType.php -EXTRA_DIST = src thrift_protocol.ini README.apache +EXTRA_DIST = \ + src \ + lib \ + thrift_protocol.ini \ + README.apache MAINTAINERCLEANFILES = Makefile Makefile.in diff --git a/lib/php/test/Makefile.am b/lib/php/test/Makefile.am index 3ad7781ee..2fd7f81e3 100755 --- a/lib/php/test/Makefile.am +++ b/lib/php/test/Makefile.am @@ -31,3 +31,5 @@ endif clean-local: $(RM) -r ./packages +EXTRA_DIST = Test + diff --git a/test/Makefile.am b/test/Makefile.am index e9d02e2e0..aaa497faf 100755 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -51,6 +51,7 @@ check-local: $(top_builddir)/compiler/cpp/thrift --gen html -r $(top_srcdir)/test/ThriftTest.thrift EXTRA_DIST = \ + test.sh \ cpp \ csharp \ hs \ @@ -69,6 +70,7 @@ EXTRA_DIST = \ DenseLinkingTest.thrift \ DocTest.thrift \ JavaBeansTest.thrift \ + ManyOptionals.thrift \ ManyTypedefs.thrift \ OptionalRequiredTest.thrift \ SmallTest.thrift \ -- cgit v1.2.1