Browse Source

Make the extension for generated files be ".grpc.swift"

Tim Burks 8 năm trước cách đây
mục cha
commit
9ca08f873a

+ 0 - 0
Examples/Echo/Generated/echo.rpc.swift → Examples/Echo/Generated/echo.grpc.swift


+ 0 - 1
Examples/Echo/PackageManager/Sources/echo.rpc.swift

@@ -1 +0,0 @@
-../../Generated/echo.rpc.swift

+ 4 - 4
Examples/Echo/Xcode/Echo.xcodeproj/project.pbxproj

@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		D35358201E219963007FA223 /* echo.rpc.swift in Sources */ = {isa = PBXBuildFile; fileRef = D353581D1E219963007FA223 /* echo.rpc.swift */; };
+		D35358201E219963007FA223 /* echo.grpc.swift in Sources */ = {isa = PBXBuildFile; fileRef = D353581D1E219963007FA223 /* echo.grpc.swift */; };
 		D35358211E219963007FA223 /* echo.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = D353581E1E219963007FA223 /* echo.pb.swift */; };
 		D35358251E219980007FA223 /* EchoProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = D35358241E219980007FA223 /* EchoProvider.swift */; };
 		D35C9FAC1D74B079000443CD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D35C9FAB1D74B079000443CD /* AppDelegate.swift */; };
@@ -84,7 +84,7 @@
 
 /* Begin PBXFileReference section */
 		D315DEDF1EE8B29A007670CE /* SwiftProtobuf.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SwiftProtobuf.xcodeproj; path = "../../../third_party/swift-protobuf/SwiftProtobuf.xcodeproj"; sourceTree = "<group>"; };
-		D353581D1E219963007FA223 /* echo.rpc.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = echo.rpc.swift; path = ../Generated/echo.rpc.swift; sourceTree = "<group>"; };
+		D353581D1E219963007FA223 /* echo.grpc.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = echo.grpc.swift; path = ../Generated/echo.grpc.swift; sourceTree = "<group>"; };
 		D353581E1E219963007FA223 /* echo.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = echo.pb.swift; path = ../Generated/echo.pb.swift; sourceTree = "<group>"; };
 		D35358241E219980007FA223 /* EchoProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EchoProvider.swift; path = ../EchoProvider.swift; sourceTree = "<group>"; };
 		D35C9FA81D74B079000443CD /* Echo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Echo.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -130,7 +130,7 @@
 		D35358231E219971007FA223 /* Generated */ = {
 			isa = PBXGroup;
 			children = (
-				D353581D1E219963007FA223 /* echo.rpc.swift */,
+				D353581D1E219963007FA223 /* echo.grpc.swift */,
 				D353581E1E219963007FA223 /* echo.pb.swift */,
 			);
 			name = Generated;
@@ -329,7 +329,7 @@
 				D35C9FC81D74B0C1000443CD /* EchoViewController.swift in Sources */,
 				D35C9FAC1D74B079000443CD /* AppDelegate.swift in Sources */,
 				D35358251E219980007FA223 /* EchoProvider.swift in Sources */,
-				D35358201E219963007FA223 /* echo.rpc.swift in Sources */,
+				D35358201E219963007FA223 /* echo.grpc.swift in Sources */,
 				D35358211E219963007FA223 /* echo.pb.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

+ 1 - 1
Examples/Echo2/Makefile

@@ -8,5 +8,5 @@ project:
 
 clean :
 	rm -rf Packages googleapis .build
-	rm -f Package.pins Echo Sources/*.pb.swift Sources/*.rpc.swift google.json
+	rm -f Package.pins Echo Sources/*.pb.swift Sources/*.grpc.swift google.json
 	rm -rf Package.resolved Echo.xcodeproj

+ 1 - 1
Examples/Google/Datastore/Makefile

@@ -5,5 +5,5 @@ all:
 
 clean :
 	rm -rf Packages googleapis .build
-	rm -f Package.pins Datastore Sources/*.pb.swift Sources/*.rpc.swift google.json
+	rm -f Package.pins Datastore Sources/*.pb.swift Sources/*.grpc.swift google.json
 	rm -rf Package.resolved

+ 1 - 1
Examples/Google/NaturalLanguage/Makefile

@@ -5,5 +5,5 @@ all:
 
 clean :
 	rm -rf Packages googleapis .build
-	rm -f Package.pins NaturalLanguage Sources/*.pb.swift Sources/*.rpc.swift google.json
+	rm -f Package.pins NaturalLanguage Sources/*.pb.swift Sources/*.grpc.swift google.json
 	rm -rf Package.resolved

+ 1 - 1
Examples/Google/Spanner/Makefile

@@ -5,5 +5,5 @@ all:
 
 clean :
 	rm -rf Packages googleapis .build
-	rm -f Package.pins Spanner Sources/*.pb.swift Sources/*.rpc.swift google.json
+	rm -f Package.pins Spanner Sources/*.pb.swift Sources/*.grpc.swift google.json
 	rm -rf Package.resolved

+ 3 - 3
Plugin/Makefile

@@ -10,13 +10,13 @@ build:  clear
 
 test:	build
 	protoc ../Examples/Echo/echo.proto --proto_path=../Examples/Echo --plugin=./protoc-gen-swiftgrpc --swiftgrpc_out=. --swift_out=.
-	diff echo.rpc.swift ../Examples/Echo/Generated/echo.rpc.swift
+	diff echo.grpc.swift ../Examples/Echo/Generated/echo.grpc.swift
 
 deploy:
-	cp echo.rpc.swift ../Examples/Echo/Generated/echo.rpc.swift 
+	cp echo.grpc.swift ../Examples/Echo/Generated/echo.grpc.swift 
 
 clear : 
-	rm -f *.pb.swift *.rpc.swift
+	rm -f *.pb.swift *.grpc.swift
 
 clean : clear
 	rm -rf protoc-gen-swiftgrpc Packages .build protoc-gen-swift Package.pins

+ 1 - 1
Plugin/Sources/protoc-gen-swiftgrpc/main.swift

@@ -151,7 +151,7 @@ func main() throws {
 
       do {
 
-        let grpcFileName = uniqueOutputFileName(component:"rpc", fileDescriptor:fileDescriptor)
+        let grpcFileName = uniqueOutputFileName(component:"grpc", fileDescriptor:fileDescriptor)
         let grpcCode = try templateEnvironment.renderTemplate(name:"main.swift", context: context)
         var grpcFile = Google_Protobuf_Compiler_CodeGeneratorResponse.File()
         grpcFile.name = grpcFileName