Skip to content

Commit 7ac0661

Browse files
committed
Generate SwiftGRPC.xcodeproj in the top-level Makefile.
Generated projects were found to contain absolute paths, which caused builds to fail when they were checked out in other locations.
1 parent b844878 commit 7ac0661

File tree

11 files changed

+19
-4218
lines changed

11 files changed

+19
-4218
lines changed

Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,16 @@ CFLAGS = -Xcc -ISources/BoringSSL/include
33

44
LDFLAGS = -Xlinker -lz
55

6+
all:
7+
swift package generate-xcodeproj
8+
swift build -v $(CFLAGS) $(LDFLAGS)
9+
10+
611
test:
712
swift build -v $(CFLAGS) $(LDFLAGS)
813
swift test -v $(CFLAGS) $(LDFLAGS)
914

10-
clean :
15+
clean:
1116
rm -rf Packages
1217
rm -rf .build
18+
rm -rf SwiftGRPC.xcodeproj

README.md

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,19 @@ systems. Please see [DOCKER.md](DOCKER.md) and
3030
## gRPC dependencies are vendored
3131

3232
Swift gRPC now includes vendored copies of the gRPC core
33-
library and "BoringSSL", an OpenSSL fork that is used by
33+
library and **BoringSSL**, an OpenSSL fork that is used by
3434
the gRPC Core. These are built automatically in Swift Package
35-
Manager builds. The repository also includes SwiftGRPC.xcodeproj,
36-
an Xcode project which is automatically-generated by the Swift
37-
Package Manager.
35+
Manager builds.
36+
37+
## Building with Xcode
38+
39+
The top-level Makefile uses the Swift Package Manager to generate
40+
an Xcode project for the SwiftGRPC package. Due to present limitations
41+
in Package Manager configuration, the libz dependency is not included
42+
in the generated Xcode project. If you get build errors about missing
43+
symbols such as `_deflate`, `_deflateEnd`, etc., you can fix them by
44+
adding `libz.tbd` to the **Link Binary With Libraries** build step of
45+
the **CgRPC** target.
3846

3947
## Having build problems?
4048

SwiftGRPC.xcodeproj/BoringSSL_Info.plist

Lines changed: 0 additions & 25 deletions
This file was deleted.

SwiftGRPC.xcodeproj/CgRPC_Info.plist

Lines changed: 0 additions & 25 deletions
This file was deleted.

SwiftGRPC.xcodeproj/GeneratedModuleMap/BoringSSL/module.modulemap

Lines changed: 0 additions & 5 deletions
This file was deleted.

SwiftGRPC.xcodeproj/GeneratedModuleMap/CgRPC/module.modulemap

Lines changed: 0 additions & 5 deletions
This file was deleted.

SwiftGRPC.xcodeproj/gRPCTests_Info.plist

Lines changed: 0 additions & 25 deletions
This file was deleted.

SwiftGRPC.xcodeproj/gRPC_Info.plist

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)