Move CgRPC, gRPC, and QuickProto to "Sources" directory and add new top-level Package.swift.

Author: timburks

.gitmodules

@@ -1,6 +0,0 @@
-[submodule "third_party/grpc"]
-	path = third_party/grpc
-	url = https://github.com/grpc/grpc
-[submodule "third_party/swift-protobuf"]
-	path = third_party/swift-protobuf
-	url = https://github.com/apple/swift-protobuf

Packages/CgRPC/Package.swift renamed to Package.swift

@@ -33,5 +33,10 @@
 import PackageDescription
 
 let package = Package(
-    name: "CgRPC"
+  name: "SwiftGRPC",
+  targets: [
+    Target(name: "gRPC",
+           dependencies: ["CgRPC"]),
+    Target(name: "QuickProto"),
+  ]
 )

Packages/CgRPC/Makefile

@@ -27,6 +27,20 @@ Other examples include [Sessions](Examples/Sessions),
 Swift Package Manager builds are demonstrated on Linux using 
 the instructions in the [Packages](Packages) directory.
 
+## Getting started
+
+After cloning this repository, `cd third_party; RUNME.sh` to
+download its dependencies (we don't use git submodules to keep
+this repository lean for imports with the Swift Package Manager).
+
+## Building grpc
+
+Swift gRPC currently requires a separate build of the grpc core
+library. To do this, enter the grpc directory and run 
+`git submodule update --init` and then `make install`. 
+If you get build errors, edit the Makefile and remove 
+"-Werror" from the line that begins with "CPPFLAGS +=".
+
 ## Can't find something?
 
 To make it easier for the Swift Package manager to find,

Packages/Client/Makefile

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+cd SimpleServer; make clean; cd ..
+cd SimpleClient; make clean; cd ..
+cd EchoServer; make clean; cd ..
+cd EchoClient; make clean; cd ..

Packages/EchoClient/Makefile

@@ -0,0 +1,9 @@
+LIBDIR = /usr/local/lib
+INCDIR = /usr/local/include
+
+all:
+	swift build -Xlinker -L$(LIBDIR) -Xlinker -lgrpc -Xcc -I$(INCDIR)
+
+clean :
+	rm -rf Packages
+	rm -rf .build

Packages/EchoClient/Package.swift

@@ -32,8 +32,8 @@
  */
 import PackageDescription
 let package = Package (
-    name: "gRPC",
+    name: "EchoClient",
     dependencies: [
-        .Package(url: "../CgRPC", majorVersion:1),
+        .Package(url: "https://github.com/timburks/grpc-swift.git", Version(0,1,0)),
     ]
 )