Skip to content

Commit 23a0ebd

Browse files
timburkstimburks
authored
Merge pull request #311 from ishkawa/replace-absolute-path-in-generated-code
Replace absolute path in generated xcodeproj
2 parents 0faf1d6 + 6cc5371 commit 23a0ebd

File tree

4 files changed

+36
-34
lines changed

4 files changed

+36
-34
lines changed

‎Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ project:
1616

1717
project-carthage:
1818
swift package generate-xcodeproj --output SwiftGRPC-Carthage.xcodeproj
19+
@sed -i '' -e "s|$(PWD)|..|g" SwiftGRPC-Carthage.xcodeproj/project.pbxproj
20+
@sed -i '' -e "s|$(PWD)|../../..|g" SwiftGRPC-Carthage.xcodeproj/GeneratedModuleMap/BoringSSL/module.modulemap
1921
@ruby fix-project-settings.rb SwiftGRPC-Carthage.xcodeproj || echo "xcodeproj ('sudo gem install xcodeproj') is required in order to generate the Carthage-compatible project!"
2022
@ruby patch-carthage-project.rb SwiftGRPC-Carthage.xcodeproj || echo "xcodeproj ('sudo gem install xcodeproj') is required in order to generate the Carthage-compatible project!"
2123

‎SwiftGRPC-Carthage.xcodeproj/GeneratedModuleMap/BoringSSL/module.modulemap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
module BoringSSL {
2-
umbrella "/private/tmp/PR/grpc-swift/Sources/BoringSSL/include"
2+
umbrella "../../../Sources/BoringSSL/include"
33
export *
44
}

‎SwiftGRPC-Carthage.xcodeproj/project.pbxproj

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
243F0A96FFF39FE679036411 /* cgrpc.h in Headers */ = {isa = PBXBuildFile; fileRef = OBJ_941 /* cgrpc.h */; settings = {ATTRIBUTES = (Public, ); }; };
10+
9E97487A2A4BB35F3393777B /* cgrpc.h in Headers */ = {isa = PBXBuildFile; fileRef = OBJ_941 /* cgrpc.h */; settings = {ATTRIBUTES = (Public, ); }; };
1111
OBJ_1177 /* a_bitstr.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_11 /* a_bitstr.c */; };
1212
OBJ_1178 /* a_bool.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_12 /* a_bool.c */; };
1313
OBJ_1179 /* a_d2i_fp.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_13 /* a_d2i_fp.c */; };
@@ -930,7 +930,7 @@
930930
OBJ_1038 /* Error.swift */ = {isa = PBXFileReference; path = Error.swift; sourceTree = "<group>"; };
931931
OBJ_1039 /* Group.swift */ = {isa = PBXFileReference; path = Group.swift; sourceTree = "<group>"; };
932932
OBJ_104 /* ecdh.c */ = {isa = PBXFileReference; path = ecdh.c; sourceTree = "<group>"; };
933-
OBJ_1040 /* Package.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; name = Package.swift; path = "/Users/ishkawa/dev/src/github.com/grpc/grpc-swift/.build/checkouts/Commander.git-8842944228949165507/Package.swift"; sourceTree = "<group>"; };
933+
OBJ_1040 /* Package.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; name = Package.swift; path = "../.build/checkouts/Commander.git-8842944228949165507/Package.swift"; sourceTree = "<group>"; };
934934
OBJ_1044 /* CommandLine+Extensions.swift */ = {isa = PBXFileReference; path = "CommandLine+Extensions.swift"; sourceTree = "<group>"; };
935935
OBJ_1045 /* Descriptor+Extensions.swift */ = {isa = PBXFileReference; path = "Descriptor+Extensions.swift"; sourceTree = "<group>"; };
936936
OBJ_1046 /* EnumGenerator.swift */ = {isa = PBXFileReference; path = EnumGenerator.swift; sourceTree = "<group>"; };
@@ -1051,7 +1051,7 @@
10511051
OBJ_1155 /* timestamp.pb.swift */ = {isa = PBXFileReference; path = timestamp.pb.swift; sourceTree = "<group>"; };
10521052
OBJ_1156 /* type.pb.swift */ = {isa = PBXFileReference; path = type.pb.swift; sourceTree = "<group>"; };
10531053
OBJ_1157 /* wrappers.pb.swift */ = {isa = PBXFileReference; path = wrappers.pb.swift; sourceTree = "<group>"; };
1054-
OBJ_1158 /* Package.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; name = Package.swift; path = "/Users/ishkawa/dev/src/github.com/grpc/grpc-swift/.build/checkouts/swift-protobuf.git--7219529775138357838/Package.swift"; sourceTree = "<group>"; };
1054+
OBJ_1158 /* Package.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; name = Package.swift; path = "../.build/checkouts/swift-protobuf.git--7219529775138357838/Package.swift"; sourceTree = "<group>"; };
10551055
OBJ_116 /* evp_ctx.c */ = {isa = PBXFileReference; path = evp_ctx.c; sourceTree = "<group>"; };
10561056
OBJ_117 /* p_dsa_asn1.c */ = {isa = PBXFileReference; path = p_dsa_asn1.c; sourceTree = "<group>"; };
10571057
OBJ_118 /* p_ec.c */ = {isa = PBXFileReference; path = p_ec.c; sourceTree = "<group>"; };
@@ -1385,7 +1385,7 @@
13851385
OBJ_449 /* ex_data.h */ = {isa = PBXFileReference; path = ex_data.h; sourceTree = "<group>"; };
13861386
OBJ_45 /* bio_mem.c */ = {isa = PBXFileReference; path = bio_mem.c; sourceTree = "<group>"; };
13871387
OBJ_450 /* base.h */ = {isa = PBXFileReference; path = base.h; sourceTree = "<group>"; };
1388-
OBJ_451 /* module.modulemap */ = {isa = PBXFileReference; name = module.modulemap; path = "/Users/ishkawa/dev/src/github.com/grpc/grpc-swift/SwiftGRPC-Carthage.xcodeproj/GeneratedModuleMap/BoringSSL/module.modulemap"; sourceTree = "<group>"; };
1388+
OBJ_451 /* module.modulemap */ = {isa = PBXFileReference; name = module.modulemap; path = "../SwiftGRPC-Carthage.xcodeproj/GeneratedModuleMap/BoringSSL/module.modulemap"; sourceTree = "<group>"; };
13891389
OBJ_453 /* EchoProvider.swift */ = {isa = PBXFileReference; path = EchoProvider.swift; sourceTree = "<group>"; };
13901390
OBJ_455 /* echo.grpc.swift */ = {isa = PBXFileReference; path = echo.grpc.swift; sourceTree = "<group>"; };
13911391
OBJ_456 /* echo.pb.swift */ = {isa = PBXFileReference; path = echo.pb.swift; sourceTree = "<group>"; };
@@ -1882,7 +1882,7 @@
18821882
OBJ_995 /* byte_buffer.h */ = {isa = PBXFileReference; path = byte_buffer.h; sourceTree = "<group>"; };
18831883
OBJ_996 /* connectivity_state.h */ = {isa = PBXFileReference; path = connectivity_state.h; sourceTree = "<group>"; };
18841884
OBJ_997 /* sync_windows.h */ = {isa = PBXFileReference; path = sync_windows.h; sourceTree = "<group>"; };
1885-
OBJ_998 /* module.modulemap */ = {isa = PBXFileReference; name = module.modulemap; path = "/Users/ishkawa/dev/src/github.com/grpc/grpc-swift/Sources/CgRPC/include/module.modulemap"; sourceTree = "<group>"; };
1885+
OBJ_998 /* module.modulemap */ = {isa = PBXFileReference; name = module.modulemap; path = ../Sources/CgRPC/include/module.modulemap; sourceTree = "<group>"; };
18861886
SwiftGRPC::BoringSSL::Product /* BoringSSL.framework */ = {isa = PBXFileReference; path = BoringSSL.framework; sourceTree = BUILT_PRODUCTS_DIR; };
18871887
SwiftGRPC::CgRPC::Product /* CgRPC.framework */ = {isa = PBXFileReference; path = CgRPC.framework; sourceTree = BUILT_PRODUCTS_DIR; };
18881888
SwiftGRPC::Echo::Product /* Echo */ = {isa = PBXFileReference; path = Echo; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -2020,7 +2020,7 @@
20202020
isa = PBXGroup;
20212021
children = (
20222022
OBJ_1029 /* Commander 0.8.0 */,
2023-
OBJ_1041 /* SwiftProtobuf 1.1.1 */,
2023+
OBJ_1041 /* SwiftProtobuf 1.1.2 */,
20242024
);
20252025
name = Dependencies;
20262026
path = "";
@@ -2062,7 +2062,7 @@
20622062
path = ".build/checkouts/Commander.git-8842944228949165507/Sources/Commander";
20632063
sourceTree = SOURCE_ROOT;
20642064
};
2065-
OBJ_1041 /* SwiftProtobuf 1.1.1 */ = {
2065+
OBJ_1041 /* SwiftProtobuf 1.1.2 */ = {
20662066
isa = PBXGroup;
20672067
children = (
20682068
OBJ_1042 /* Conformance */,
@@ -2071,7 +2071,7 @@
20712071
OBJ_1081 /* SwiftProtobuf */,
20722072
OBJ_1158 /* Package.swift */,
20732073
);
2074-
name = "SwiftProtobuf 1.1.1";
2074+
name = "SwiftProtobuf 1.1.2";
20752075
path = "";
20762076
sourceTree = SOURCE_ROOT;
20772077
};
@@ -2273,18 +2273,18 @@
22732273
OBJ_1159 /* Products */ = {
22742274
isa = PBXGroup;
22752275
children = (
2276-
SwiftGRPC::CgRPC::Product /* CgRPC.framework */,
2277-
SwiftGRPC::protoc-gen-swiftgrpc::Product /* protoc-gen-swiftgrpc */,
2278-
Commander::Commander::Product /* Commander.framework */,
22792276
SwiftGRPC::Echo::Product /* Echo */,
2280-
SwiftGRPC::Simple::Product /* Simple */,
2281-
SwiftProtobuf::SwiftProtobuf::Product /* SwiftProtobuf.framework */,
2282-
SwiftGRPC::SwiftGRPC::Product /* SwiftGRPC.framework */,
22832277
SwiftGRPC::SwiftGRPCTests::Product /* SwiftGRPCTests.xctest */,
2284-
SwiftGRPC::RootsEncoder::Product /* RootsEncoder */,
22852278
SwiftGRPC::BoringSSL::Product /* BoringSSL.framework */,
2279+
Commander::Commander::Product /* Commander.framework */,
22862280
SwiftProtobuf::protoc-gen-swift::Product /* protoc-gen-swift */,
2281+
SwiftGRPC::SwiftGRPC::Product /* SwiftGRPC.framework */,
22872282
SwiftProtobuf::SwiftProtobufPluginLibrary::Product /* SwiftProtobufPluginLibrary.framework */,
2283+
SwiftGRPC::Simple::Product /* Simple */,
2284+
SwiftGRPC::protoc-gen-swiftgrpc::Product /* protoc-gen-swiftgrpc */,
2285+
SwiftProtobuf::SwiftProtobuf::Product /* SwiftProtobuf.framework */,
2286+
SwiftGRPC::RootsEncoder::Product /* RootsEncoder */,
2287+
SwiftGRPC::CgRPC::Product /* CgRPC.framework */,
22882288
);
22892289
name = Products;
22902290
path = "";
@@ -4415,11 +4415,11 @@
44154415
/* End PBXGroup section */
44164416

44174417
/* Begin PBXHeadersBuildPhase section */
4418-
10849E183BE988F5235E68BC /* Headers */ = {
4418+
DADE5CA5290EA19B3D7E0E8D /* Headers */ = {
44194419
isa = PBXHeadersBuildPhase;
44204420
buildActionMask = 2147483647;
44214421
files = (
4422-
243F0A96FFF39FE679036411 /* cgrpc.h in Headers */,
4422+
9E97487A2A4BB35F3393777B /* cgrpc.h in Headers */,
44234423
);
44244424
runOnlyForDeploymentPostprocessing = 0;
44254425
};
@@ -4448,7 +4448,7 @@
44484448
buildPhases = (
44494449
OBJ_1496 /* Sources */,
44504450
OBJ_1851 /* Frameworks */,
4451-
10849E183BE988F5235E68BC /* Headers */,
4451+
DADE5CA5290EA19B3D7E0E8D /* Headers */,
44524452
);
44534453
buildRules = (
44544454
);
@@ -4483,7 +4483,7 @@
44834483
isa = PBXNativeTarget;
44844484
buildConfigurationList = OBJ_2008 /* Build configuration list for PBXNativeTarget "SwiftProtobuf" */;
44854485
buildPhases = (
4486-
EBF0157C9D75769E894ADA12 /* ShellScript */,
4486+
8F5047B9D41AF0E8110B4F53 /* ShellScript */,
44874487
OBJ_2011 /* Sources */,
44884488
OBJ_2088 /* Frameworks */,
44894489
);
@@ -4524,7 +4524,7 @@
45244524
/* End PBXProject section */
45254525

45264526
/* Begin PBXShellScriptBuildPhase section */
4527-
EBF0157C9D75769E894ADA12 /* ShellScript */ = {
4527+
8F5047B9D41AF0E8110B4F53 /* ShellScript */ = {
45284528
isa = PBXShellScriptBuildPhase;
45294529
buildActionMask = 2147483647;
45304530
files = (

‎SwiftGRPC-Carthage.xcodeproj/xcshareddata/xcschemes/SwiftGRPC-Carthage-Package.xcscheme

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<BuildableReference
77
BuildableIdentifier = "primary"
88
BuildableName = "'$(TARGET_NAME)'"
9-
BlueprintName = "protoc-gen-swiftgrpc"
9+
BlueprintName = "Echo"
1010
ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
1111
</BuildableReference>
1212
</BuildActionEntry>
@@ -21,40 +21,40 @@
2121
<BuildActionEntry buildForTesting = "YES" buildForRunning = "YES" buildForProfiling = "YES" buildForArchiving = "YES" buildForAnalyzing = "YES">
2222
<BuildableReference
2323
BuildableIdentifier = "primary"
24-
BuildableName = "'$(TARGET_NAME)'"
25-
BlueprintName = "protoc-gen-swift"
24+
BuildableName = "'lib$(TARGET_NAME)'"
25+
BlueprintName = "CgRPC"
2626
ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
2727
</BuildableReference>
2828
</BuildActionEntry>
2929
<BuildActionEntry buildForTesting = "YES" buildForRunning = "YES" buildForProfiling = "YES" buildForArchiving = "YES" buildForAnalyzing = "YES">
3030
<BuildableReference
3131
BuildableIdentifier = "primary"
3232
BuildableName = "'lib$(TARGET_NAME)'"
33-
BlueprintName = "SwiftProtobufPluginLibrary"
33+
BlueprintName = "BoringSSL"
3434
ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
3535
</BuildableReference>
3636
</BuildActionEntry>
3737
<BuildActionEntry buildForTesting = "YES" buildForRunning = "YES" buildForProfiling = "YES" buildForArchiving = "YES" buildForAnalyzing = "YES">
3838
<BuildableReference
3939
BuildableIdentifier = "primary"
40-
BuildableName = "'lib$(TARGET_NAME)'"
41-
BlueprintName = "CgRPC"
40+
BuildableName = "'$(TARGET_NAME)'"
41+
BlueprintName = "protoc-gen-swift"
4242
ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
4343
</BuildableReference>
4444
</BuildActionEntry>
4545
<BuildActionEntry buildForTesting = "YES" buildForRunning = "YES" buildForProfiling = "YES" buildForArchiving = "YES" buildForAnalyzing = "YES">
4646
<BuildableReference
4747
BuildableIdentifier = "primary"
4848
BuildableName = "'lib$(TARGET_NAME)'"
49-
BlueprintName = "Commander"
49+
BlueprintName = "SwiftGRPC"
5050
ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
5151
</BuildableReference>
5252
</BuildActionEntry>
5353
<BuildActionEntry buildForTesting = "YES" buildForRunning = "YES" buildForProfiling = "YES" buildForArchiving = "YES" buildForAnalyzing = "YES">
5454
<BuildableReference
5555
BuildableIdentifier = "primary"
56-
BuildableName = "'$(TARGET_NAME)'"
57-
BlueprintName = "Echo"
56+
BuildableName = "'lib$(TARGET_NAME)'"
57+
BlueprintName = "SwiftProtobufPluginLibrary"
5858
ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
5959
</BuildableReference>
6060
</BuildActionEntry>
@@ -69,24 +69,24 @@
6969
<BuildActionEntry buildForTesting = "YES" buildForRunning = "YES" buildForProfiling = "YES" buildForArchiving = "YES" buildForAnalyzing = "YES">
7070
<BuildableReference
7171
BuildableIdentifier = "primary"
72-
BuildableName = "'lib$(TARGET_NAME)'"
73-
BlueprintName = "SwiftProtobuf"
72+
BuildableName = "'$(TARGET_NAME)'"
73+
BlueprintName = "protoc-gen-swiftgrpc"
7474
ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
7575
</BuildableReference>
7676
</BuildActionEntry>
7777
<BuildActionEntry buildForTesting = "YES" buildForRunning = "YES" buildForProfiling = "YES" buildForArchiving = "YES" buildForAnalyzing = "YES">
7878
<BuildableReference
7979
BuildableIdentifier = "primary"
8080
BuildableName = "'lib$(TARGET_NAME)'"
81-
BlueprintName = "SwiftGRPC"
81+
BlueprintName = "SwiftProtobuf"
8282
ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
8383
</BuildableReference>
8484
</BuildActionEntry>
8585
<BuildActionEntry buildForTesting = "YES" buildForRunning = "YES" buildForProfiling = "YES" buildForArchiving = "YES" buildForAnalyzing = "YES">
8686
<BuildableReference
8787
BuildableIdentifier = "primary"
8888
BuildableName = "'lib$(TARGET_NAME)'"
89-
BlueprintName = "BoringSSL"
89+
BlueprintName = "Commander"
9090
ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
9191
</BuildableReference>
9292
</BuildActionEntry>

0 commit comments

Comments
 (0)