Prechádzať zdrojové kódy

Update Packages Makefile for QuickProto + disable one unsupportable API

Tim Burks 9 rokov pred
rodič
commit
515bfdf822

+ 2 - 0
Packages/Makefile

@@ -4,6 +4,7 @@ demo:
 	cd gRPC; make clean; make; cd ..
 	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 
 
@@ -12,3 +13,4 @@ clean:
 	cd gRPC; make clean; cd ..
 	cd Server; make clean; cd ..
 	cd Client; make clean; cd ..
+	cd QuickProto; make clean; cd ..

+ 2 - 0
Packages/QuickProto/Sources/FileDescriptorSet.swift

@@ -51,12 +51,14 @@ public class FileDescriptorSet {
     }
   }
 
+#if !SWIFT_PACKAGE
   convenience public init(filename:String) {
     let path = Bundle.main.resourcePath!.appending("/").appending(filename)
     let fileDescriptorSetProto = NSData(contentsOfFile:path)
     assert(fileDescriptorSetProto != nil) // the file to be loaded must be in the resource bundle
     self.init(proto:fileDescriptorSetProto!)
   }
+#endif
 
   init(message:Message) {
     message.forEachField(path:["file"]) { (field) in