THRIFT-4434: fixes to delegate all dependency responsibility from make to the dotnet build
Client: dotnet
This closes #1469
diff --git a/lib/netcore/Makefile.am b/lib/netcore/Makefile.am
index 992558b..caf3f34 100644
--- a/lib/netcore/Makefile.am
+++ b/lib/netcore/Makefile.am
@@ -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
diff --git a/test/netcore/Makefile.am b/test/netcore/Makefile.am
index 65833b9..376ffb7 100644
--- a/test/netcore/Makefile.am
+++ b/test/netcore/Makefile.am
@@ -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 @@
$(RM) -r ThriftTest/ThriftTest
EXTRA_DIST = \
- ThriftTest.sln \
- Server \
- Client \
- README.md
-
+ Client \
+ README.md \
+ Server \
+ ThriftTest.sln \
+ build.cmd \
+ build.sh
diff --git a/tutorial/netcore/Makefile.am b/tutorial/netcore/Makefile.am
index d1d788f..e305556 100644
--- a/tutorial/netcore/Makefile.am
+++ b/tutorial/netcore/Makefile.am
@@ -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 @@
$(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