Reorganize vendored gRPC core code, moving it into CgRPC.

Examples/Echo/Swift/SwiftPM/Makefile

@@ -1,8 +1,14 @@
-LIBDIR = /usr/local/lib
-INCDIR = /usr/local/include
+
+CFLAGS = \
+-Xcc -DOPENSSL_NO_ASM \
+-Xcc -IPackages/SwiftGRPC-0.1.4/Sources/BoringSSL/include \
+-Xcc -IPackages/SwiftGRPC-0.1.4/Sources/CgRPC \
+-Xcc -IPackages/SwiftGRPC-0.1.4/Sources/CgRPC/include
+
+LDFLAGS = -Xlinker -lz 
 
 all:
-	swift build -Xlinker -L$(LIBDIR) -Xlinker -lgrpc -Xcc -I$(INCDIR)
+	swift build -v $(CFLAGS) $(LDFLAGS)
 
 clean :
 	rm -rf Packages

Examples/Echo/Swift/SwiftPM/Package.swift

@@ -34,7 +34,7 @@ import PackageDescription
 let package = Package (
     name: "Echo",
     dependencies: [
-        .Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,1,3)),
+        .Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,1,4)),
         .Package(url: "https://github.com/apple/swift-protobuf.git", Version(0,9,24)),
     ]
 )

Examples/Echo/Swift/SwiftPM/Sources/main.swift

@@ -32,6 +32,7 @@
  */
 import Foundation
 import gRPC
+import CgRPC
 import Dispatch
 
 print("\(CommandLine.arguments)")

Makefile

@@ -2,14 +2,13 @@
 CFLAGS = \
 -Xcc -DOPENSSL_NO_ASM \
 -Xcc -ISources/BoringSSL/include \
--Xcc -ISources/gRPC_Core \
--Xcc -ISources/gRPC_Core/include
+-Xcc -ISources/CgRPC 
 
 LDFLAGS = -Xlinker -lz 
 
 test:
 	swift build $(CFLAGS) $(LDFLAGS)
-	swift test $(CFLAGS) $(LDFLAGS) -Xlinker -lgRPC_Core
+	swift test $(CFLAGS) $(LDFLAGS) 
 
 clean :
 	rm -rf Packages

Package.swift

@@ -38,8 +38,6 @@ let package = Package(
     Target(name: "gRPC",
            dependencies: ["CgRPC"]),
     Target(name: "CgRPC",
-           dependencies: ["gRPC_Core"]),
-    Target(name: "gRPC_Core",
            dependencies: ["BoringSSL"]),
   ]
 )

Sources/CgRPC/README.md

@@ -0,0 +1,12 @@
+# CgRPC source files
+
+This directory contains source code for CgRPC, the C support library for gRPC.
+It includes a custom "shim" (in the shim directory) and vendored code from 
+the gRPC Core library.
+
+| README.md   | this file                                                              |
+| shim        | custom code created to simplify the Swift gRPC interface to gRPC Core. |
+| include     | headers for the CgRPC module                                           |
+| grpc        | headers for gRPC core (internal)                                       |
+| src         | source code for gRPC core (internal)                                   |
+| third_party | third-party source code used by gRPC core (internal)                   |