Parcourir la source

Move Google samples under a common directory + minor cleanup of Makefile.

Tim Burks il y a 8 ans
Parent
commit
3cfc04a783
24 fichiers modifiés avec 11 ajouts et 9 suppressions
  1. 0 0
      Examples/Google/Datastore/Makefile
  2. 0 0
      Examples/Google/Datastore/Package.swift
  3. 0 0
      Examples/Google/Datastore/README.md
  4. 0 0
      Examples/Google/Datastore/RUNME
  5. 0 0
      Examples/Google/Datastore/Sources/main.swift
  6. 0 0
      Examples/Google/NaturalLanguage/Makefile
  7. 0 0
      Examples/Google/NaturalLanguage/Package.swift
  8. 0 0
      Examples/Google/NaturalLanguage/README.md
  9. 0 0
      Examples/Google/NaturalLanguage/RUNME
  10. 0 0
      Examples/Google/NaturalLanguage/Sources/main.swift
  11. 0 0
      Examples/Google/NaturalLanguage/protoc/include/google/protobuf/any.proto
  12. 0 0
      Examples/Google/NaturalLanguage/protoc/include/google/protobuf/api.proto
  13. 0 0
      Examples/Google/NaturalLanguage/protoc/include/google/protobuf/compiler/plugin.proto
  14. 0 0
      Examples/Google/NaturalLanguage/protoc/include/google/protobuf/descriptor.proto
  15. 0 0
      Examples/Google/NaturalLanguage/protoc/include/google/protobuf/duration.proto
  16. 0 0
      Examples/Google/NaturalLanguage/protoc/include/google/protobuf/empty.proto
  17. 0 0
      Examples/Google/NaturalLanguage/protoc/include/google/protobuf/field_mask.proto
  18. 0 0
      Examples/Google/NaturalLanguage/protoc/include/google/protobuf/source_context.proto
  19. 0 0
      Examples/Google/NaturalLanguage/protoc/include/google/protobuf/struct.proto
  20. 0 0
      Examples/Google/NaturalLanguage/protoc/include/google/protobuf/timestamp.proto
  21. 0 0
      Examples/Google/NaturalLanguage/protoc/include/google/protobuf/type.proto
  22. 0 0
      Examples/Google/NaturalLanguage/protoc/include/google/protobuf/wrappers.proto
  23. 8 4
      Examples/README.md
  24. 3 5
      Makefile

+ 0 - 0
Examples/Datastore/PackageManager/Makefile → Examples/Google/Datastore/Makefile


+ 0 - 0
Examples/Datastore/PackageManager/Package.swift → Examples/Google/Datastore/Package.swift


+ 0 - 0
Examples/Datastore/PackageManager/README.md → Examples/Google/Datastore/README.md


+ 0 - 0
Examples/Datastore/PackageManager/RUNME → Examples/Google/Datastore/RUNME


+ 0 - 0
Examples/Datastore/PackageManager/Sources/main.swift → Examples/Google/Datastore/Sources/main.swift


+ 0 - 0
Examples/NaturalLanguage/PackageManager/Makefile → Examples/Google/NaturalLanguage/Makefile


+ 0 - 0
Examples/NaturalLanguage/PackageManager/Package.swift → Examples/Google/NaturalLanguage/Package.swift


+ 0 - 0
Examples/NaturalLanguage/PackageManager/README.md → Examples/Google/NaturalLanguage/README.md


+ 0 - 0
Examples/NaturalLanguage/PackageManager/RUNME → Examples/Google/NaturalLanguage/RUNME


+ 0 - 0
Examples/NaturalLanguage/PackageManager/Sources/main.swift → Examples/Google/NaturalLanguage/Sources/main.swift


+ 0 - 0
Examples/NaturalLanguage/PackageManager/protoc/include/google/protobuf/any.proto → Examples/Google/NaturalLanguage/protoc/include/google/protobuf/any.proto


+ 0 - 0
Examples/NaturalLanguage/PackageManager/protoc/include/google/protobuf/api.proto → Examples/Google/NaturalLanguage/protoc/include/google/protobuf/api.proto


+ 0 - 0
Examples/NaturalLanguage/PackageManager/protoc/include/google/protobuf/compiler/plugin.proto → Examples/Google/NaturalLanguage/protoc/include/google/protobuf/compiler/plugin.proto


+ 0 - 0
Examples/NaturalLanguage/PackageManager/protoc/include/google/protobuf/descriptor.proto → Examples/Google/NaturalLanguage/protoc/include/google/protobuf/descriptor.proto


+ 0 - 0
Examples/NaturalLanguage/PackageManager/protoc/include/google/protobuf/duration.proto → Examples/Google/NaturalLanguage/protoc/include/google/protobuf/duration.proto


+ 0 - 0
Examples/NaturalLanguage/PackageManager/protoc/include/google/protobuf/empty.proto → Examples/Google/NaturalLanguage/protoc/include/google/protobuf/empty.proto


+ 0 - 0
Examples/NaturalLanguage/PackageManager/protoc/include/google/protobuf/field_mask.proto → Examples/Google/NaturalLanguage/protoc/include/google/protobuf/field_mask.proto


+ 0 - 0
Examples/NaturalLanguage/PackageManager/protoc/include/google/protobuf/source_context.proto → Examples/Google/NaturalLanguage/protoc/include/google/protobuf/source_context.proto


+ 0 - 0
Examples/NaturalLanguage/PackageManager/protoc/include/google/protobuf/struct.proto → Examples/Google/NaturalLanguage/protoc/include/google/protobuf/struct.proto


+ 0 - 0
Examples/NaturalLanguage/PackageManager/protoc/include/google/protobuf/timestamp.proto → Examples/Google/NaturalLanguage/protoc/include/google/protobuf/timestamp.proto


+ 0 - 0
Examples/NaturalLanguage/PackageManager/protoc/include/google/protobuf/type.proto → Examples/Google/NaturalLanguage/protoc/include/google/protobuf/type.proto


+ 0 - 0
Examples/NaturalLanguage/PackageManager/protoc/include/google/protobuf/wrappers.proto → Examples/Google/NaturalLanguage/protoc/include/google/protobuf/wrappers.proto


+ 8 - 4
Examples/README.md

@@ -11,17 +11,21 @@ To build the Xcode examples, make sure required third party libraries
 ## Swift gRPC generated code examples
 
 [Echo](Echo)
-This sample demonstrates a simple echo service with nonstreaming and streaming APIS.
+The Echo sample demonstrates a simple echo service with nonstreaming and streaming APIS.
 It can be run with or without TLS. Swift clients and servers are built in a Mac app 
 and in a command-line tool that is built with the Swift Package Manager. An 
-interoperable client and server is in the [Echo/Go] directory. 
+interoperable client and server is in the [Echo/Go](Echo/Go) directory. 
 
-This sample uses a client and server interface generated by the Swift gRPC plugin
+The Echo sample uses a client and server interface generated by the Swift gRPC plugin
 for protoc.
 
+## Google API examples
+
+Samples that call Google gRPC APIs are in the [Google](Google) directory.
+
 ## Low-level demonstrations
 
 [Simple](Simple)
-This sample demonstrates the low-level gRPC APIs with clients and servers
+The Simple sample demonstrates the low-level gRPC APIs with clients and servers
 that can be built with Xcode or the Swift Package Manager.
  

+ 3 - 5
Makefile

@@ -1,15 +1,13 @@
 
 CFLAGS = -Xcc -ISources/BoringSSL/include
 
-#LDFLAGS = -Xlinker -lz 
-
 all:
 	swift package generate-xcodeproj
-	swift build -v $(CFLAGS) $(LDFLAGS)
+	swift build -v $(CFLAGS)
 	
 test:
-	swift build -v $(CFLAGS) $(LDFLAGS)
-	swift test -v $(CFLAGS) $(LDFLAGS) 
+	swift build -v $(CFLAGS)
+	swift test -v $(CFLAGS)
 
 clean:
 	rm -rf Packages