THRIFT-4434: fixes to delegate all dependency responsibility from make to the dotnet build

Client: dotnet

This closes #1469
This commit is contained in:
James E. King III 2018-01-13 11:29:14 -05:00
parent 54993296c4
commit b56fc700d6
3 changed files with 30 additions and 44 deletions

View File

@ -19,26 +19,23 @@
SUBDIRS = .
THRIFTCODE = \
Thrift/Thrift.csproj
all-local: \
Thrift.dll
Thrift.dll: $(THRIFTCODE)
# $(MKDIR_P) $(GENDIR)
# $(THRIFT) -gen netcore:wcf -r -out $(GENDIR) $(TESTDIR)/CassandraTest.thrift
# $(THRIFT) -gen netcore:wcf -r -out $(GENDIR) $(top_srcdir)/test/ThriftTest.thrift
# $(THRIFT) -gen netcore:wcf -r -out $(GENDIR) $(top_srcdir)/contrib/fb303/if/fb303.thrift
all-local:
$(DOTNETCORE) build
check-local:
$(DOTNETCORE) test Tests/Thrift.Tests/Thrift.Tests.csproj
${DOTNETCORE} test Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj
clean-local:
$(RM) -r Thrift/bin
$(RM) -r Thrift/obj
EXTRA_DIST = \
Thrift \
Thrift.sln \
Tests \
README.md
README.md \
Tests \
Thrift \
Thrift.sln \
build.cmd \
build.sh \
runtests.cmd \
runtests.sh

View File

@ -19,17 +19,11 @@
SUBDIRS = .
THRIFTCODE = \
ThriftTest.sln
all-local: \
ThriftTest/stage/binaries
ThriftTest/stage/binaries: $(THRIFTCODE)
all-local:
$(DOTNETCORE) build
precross: \
ThriftTest/stage/binaries
precross:
$(DOTNETCORE) build
clean-local:
$(RM) -r Client/bin
@ -39,8 +33,9 @@ clean-local:
$(RM) -r ThriftTest/ThriftTest
EXTRA_DIST = \
ThriftTest.sln \
Server \
Client \
README.md
Client \
README.md \
Server \
ThriftTest.sln \
build.cmd \
build.sh

View File

@ -19,13 +19,7 @@
SUBDIRS = .
THRIFTCODE = \
Tutorial.sln
all-local: \
Client.exe
Client.exe: $(THRIFTCODE)
all-local:
$(DOTNETCORE) build
clean-local:
@ -38,11 +32,11 @@ clean-local:
$(RM) -r Interfaces/obj
EXTRA_DIST = \
Tutorial.sln \
Interfaces \
Client \
Server \
build.cmd \
build.sh \
README.md
Client \
Interfaces \
README.md \
Server \
Tutorial.sln \
build.cmd \
build.sh