Update package makefiles and fixed errors to get EchoServer and EchoClient working on Linux.

Packages/EchoClient/Makefile

@@ -1,4 +1,4 @@
-TARGET=Server
+TARGET=EchoClient
 all:
 	swift build
 

Packages/EchoClient/Package.swift

@@ -32,8 +32,9 @@
  */
 import PackageDescription
 let package = Package (
-    name: "Server",
+    name: "EchoClient",
     dependencies: [
+        .Package(url: "../CgRPC", majorVersion:1),
         .Package(url: "../gRPC", majorVersion:1),
         .Package(url: "../QuickProto", majorVersion:1),
     ]

Packages/EchoClient/main.swift

@@ -30,14 +30,19 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
+import Foundation
+import CgRPC
 import gRPC
+import QuickProto
 
 gRPC.initialize()
 let fileDescriptorSetProto = NSData(contentsOfFile:"echo.out")
-let fileDescriptorSet = FileDescriptorSet(proto:fileDescriptorSetProto)
+let fileDescriptorSet = FileDescriptorSet(proto:fileDescriptorSetProto!)
+
+let address = "localhost:8080"
 
 if let requestMessage = fileDescriptorSet.createMessage(name:"EchoRequest") {
-  requestMessage.addField(name:"text", value:"hello")
+  requestMessage.addField(name:"text", value:"hello, swifty!")
 
   let requestHost = "foo.test.google.fr"
   let requestMethod = "/echo.Echo/Get"

Packages/EchoServer/Makefile

@@ -1,4 +1,4 @@
-TARGET=Server
+TARGET=EchoServer
 all:
 	swift build
 

Packages/EchoServer/Package.swift

@@ -32,8 +32,9 @@
  */
 import PackageDescription
 let package = Package (
-    name: "Server",
+    name: "EchoServer",
     dependencies: [
+        .Package(url: "../CgRPC", majorVersion:1),
         .Package(url: "../gRPC", majorVersion:1),
         .Package(url: "../QuickProto", majorVersion:1),
     ]

Packages/EchoServer/main.swift

@@ -30,15 +30,20 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
+import Foundation
+import CgRPC
 import gRPC
+import QuickProto
 
 gRPC.initialize()
 let fileDescriptorSetProto = NSData(contentsOfFile:"echo.out")
-let fileDescriptorSet = FileDescriptorSet(proto:fileDescriptorSetProto)
+let fileDescriptorSet = FileDescriptorSet(proto:fileDescriptorSetProto!)
+
+let address = "localhost:8080"
 
 do {
-  self.log("Server Starting")
-  self.log("GRPC version " + gRPC.version())
+  print("Server Starting")
+  print("GRPC version " + gRPC.version())
 
   let server = gRPC.Server(address:address)
   server.start()
@@ -46,11 +51,11 @@ do {
   while(true) {
     let (callError, completionType, requestHandler) = server.getNextRequest(timeout:1.0)
     if (callError != GRPC_CALL_OK) {
-      self.log("Call error \(callError)")
-      self.log("------------------------------")
+      print("Call error \(callError)")
+      print("------------------------------")
     } else if (completionType == GRPC_OP_COMPLETE) {
       if let requestHandler = requestHandler {
-        self.log("Received request to " + requestHandler.host()
+        print("Received request to " + requestHandler.host()
           + " calling " + requestHandler.method()
           + " from " + requestHandler.caller())
 

Packages/Makefile

@@ -5,8 +5,10 @@ demo:
 	cd Server; make clean; make; make; make install; cd ..
 	cd Client; make clean; make; make; make install; cd ..
 	cd QuickProto; make clean; make; make; make install; cd ..
-	Server/Server &
-	Client/Client 
+	cd EchoServer; make clean; make; make; make install; cd ..
+	cd EchoClient; make clean; make; make; make install; cd ..
+	EchoServer/EchoServer &
+	EchoClient/EchoClient 
 
 clean:  
 	cd CgRPC; make clean; cd ..
@@ -14,3 +16,5 @@ clean:
 	cd Server; make clean; cd ..
 	cd Client; make clean; cd ..
 	cd QuickProto; make clean; cd ..
+	cd EchoServer; make clean; cd ..
+	cd EchoClient; make clean; cd ..