Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Process Info.plists in Bazel #768

Merged
merged 1 commit into from
Jul 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
132 changes: 71 additions & 61 deletions examples/ios_app/test/fixtures/bwb.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$(GEN_DIR)/applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/Example/Example-intermediates/Info.plist
$(GEN_DIR)/applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/ExampleObjcTests/ExampleObjcTests.__internal__.__test_bundle-intermediates/Info.plist
$(GEN_DIR)/applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/ExampleTests/ExampleTests.__internal__.__test_bundle-intermediates/Info.plist
$(GEN_DIR)/applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/ExampleUITests/ExampleUITests.__internal__.__test_bundle-intermediates/Info.plist
$(GEN_DIR)/applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/Example/rules_xcodeproj/Example/Info.plist
$(GEN_DIR)/applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/ExampleObjcTests/rules_xcodeproj/ExampleObjcTests.__internal__.__test_bundle/Info.plist
$(GEN_DIR)/applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/ExampleTests/rules_xcodeproj/ExampleTests.__internal__.__test_bundle/Info.plist
$(GEN_DIR)/applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/ExampleUITests/rules_xcodeproj/ExampleUITests.__internal__.__test_bundle/Info.plist
$(GEN_DIR)/ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/CoreUtilsObjC/CoreUtilsObjC.swift.modulemap
$(GEN_DIR)/ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/ExampleResources/bucket/deps.txt
$(GEN_DIR)/ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/TestingUtils/TestingUtils.swift
Expand Down

This file was deleted.

This file was deleted.

16 changes: 8 additions & 8 deletions examples/ios_app/test/fixtures/bwb_spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
},
"Example/Info.plist",
{
"_": "applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/Example/Example-intermediates/Info.plist",
"_": "applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/Example/rules_xcodeproj/Example/Info.plist",
"t": "g"
},
{
Expand Down Expand Up @@ -92,7 +92,7 @@
"t": "e"
},
{
"_": "applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/ExampleTests/ExampleTests.__internal__.__test_bundle-intermediates/Info.plist",
"_": "applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/ExampleTests/rules_xcodeproj/ExampleTests.__internal__.__test_bundle/Info.plist",
"t": "g"
},
"OnlyStructuredResources/BUILD",
Expand All @@ -104,7 +104,7 @@
"g": true
},
{
"_": "applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/ExampleObjcTests/ExampleObjcTests.__internal__.__test_bundle-intermediates/Info.plist",
"_": "applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/ExampleObjcTests/rules_xcodeproj/ExampleObjcTests.__internal__.__test_bundle/Info.plist",
"t": "g"
},
{
Expand All @@ -123,7 +123,7 @@
"t": "e"
},
{
"_": "applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/ExampleUITests/ExampleUITests.__internal__.__test_bundle-intermediates/Info.plist",
"_": "applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/ExampleUITests/rules_xcodeproj/ExampleUITests.__internal__.__test_bundle/Info.plist",
"t": "g"
},
"test/fixtures/BUILD"
Expand Down Expand Up @@ -305,7 +305,7 @@
],
"extensions": [],
"info_plist": {
"_": "applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/Example/Example-intermediates/Info.plist",
"_": "applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/Example/rules_xcodeproj/Example/Info.plist",
"t": "g"
},
"inputs": {
Expand Down Expand Up @@ -513,7 +513,7 @@
],
"extensions": [],
"info_plist": {
"_": "applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/ExampleObjcTests/ExampleObjcTests.__internal__.__test_bundle-intermediates/Info.plist",
"_": "applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/ExampleObjcTests/rules_xcodeproj/ExampleObjcTests.__internal__.__test_bundle/Info.plist",
"t": "g"
},
"inputs": {},
Expand Down Expand Up @@ -750,7 +750,7 @@
],
"extensions": [],
"info_plist": {
"_": "applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/ExampleTests/ExampleTests.__internal__.__test_bundle-intermediates/Info.plist",
"_": "applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/ExampleTests/rules_xcodeproj/ExampleTests.__internal__.__test_bundle/Info.plist",
"t": "g"
},
"inputs": {},
Expand Down Expand Up @@ -965,7 +965,7 @@
],
"extensions": [],
"info_plist": {
"_": "applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/ExampleUITests/ExampleUITests.__internal__.__test_bundle-intermediates/Info.plist",
"_": "applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/ExampleUITests/rules_xcodeproj/ExampleUITests.__internal__.__test_bundle/Info.plist",
"t": "g"
},
"inputs": {},
Expand Down
142 changes: 76 additions & 66 deletions examples/ios_app/test/fixtures/bwx.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$(GEN_DIR)/applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/Example/Example-intermediates/Info.plist
$(GEN_DIR)/applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/ExampleObjcTests/ExampleObjcTests.__internal__.__test_bundle-intermediates/Info.plist
$(GEN_DIR)/applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/ExampleTests/ExampleTests.__internal__.__test_bundle-intermediates/Info.plist
$(GEN_DIR)/applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/ExampleUITests/ExampleUITests.__internal__.__test_bundle-intermediates/Info.plist
$(GEN_DIR)/applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/Example/rules_xcodeproj/Example/Info.plist
$(GEN_DIR)/applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/ExampleObjcTests/rules_xcodeproj/ExampleObjcTests.__internal__.__test_bundle/Info.plist
$(GEN_DIR)/applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/ExampleTests/rules_xcodeproj/ExampleTests.__internal__.__test_bundle/Info.plist
$(GEN_DIR)/applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/ExampleUITests/rules_xcodeproj/ExampleUITests.__internal__.__test_bundle/Info.plist
$(GEN_DIR)/ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/CoreUtilsObjC/CoreUtilsObjC.swift.modulemap
$(GEN_DIR)/ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/ExampleResources/bucket/deps.txt
$(GEN_DIR)/ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/TestingUtils/TestingUtils.swift
Expand Down

This file was deleted.

This file was deleted.

16 changes: 8 additions & 8 deletions examples/ios_app/test/fixtures/bwx_spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
},
"Example/Info.plist",
{
"_": "applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/Example/Example-intermediates/Info.plist",
"_": "applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/Example/rules_xcodeproj/Example/Info.plist",
"t": "g"
},
{
Expand All @@ -52,14 +52,14 @@
"t": "e"
},
{
"_": "applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/ExampleTests/ExampleTests.__internal__.__test_bundle-intermediates/Info.plist",
"_": "applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/ExampleTests/rules_xcodeproj/ExampleTests.__internal__.__test_bundle/Info.plist",
"t": "g"
},
"OnlyStructuredResources/BUILD",
"OnlyStructuredResources/Info.plist",
"ExampleObjcTests/BUILD",
{
"_": "applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/ExampleObjcTests/ExampleObjcTests.__internal__.__test_bundle-intermediates/Info.plist",
"_": "applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/ExampleObjcTests/rules_xcodeproj/ExampleObjcTests.__internal__.__test_bundle/Info.plist",
"t": "g"
},
{
Expand All @@ -68,7 +68,7 @@
},
"ExampleUITests/BUILD",
{
"_": "applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/ExampleUITests/ExampleUITests.__internal__.__test_bundle-intermediates/Info.plist",
"_": "applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/ExampleUITests/rules_xcodeproj/ExampleUITests.__internal__.__test_bundle/Info.plist",
"t": "g"
},
"test/fixtures/BUILD"
Expand Down Expand Up @@ -250,7 +250,7 @@
],
"extensions": [],
"info_plist": {
"_": "applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/Example/Example-intermediates/Info.plist",
"_": "applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/Example/rules_xcodeproj/Example/Info.plist",
"t": "g"
},
"inputs": {
Expand Down Expand Up @@ -541,7 +541,7 @@
],
"extensions": [],
"info_plist": {
"_": "applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/ExampleObjcTests/ExampleObjcTests.__internal__.__test_bundle-intermediates/Info.plist",
"_": "applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/ExampleObjcTests/rules_xcodeproj/ExampleObjcTests.__internal__.__test_bundle/Info.plist",
"t": "g"
},
"inputs": {
Expand Down Expand Up @@ -849,7 +849,7 @@
],
"extensions": [],
"info_plist": {
"_": "applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/ExampleTests/ExampleTests.__internal__.__test_bundle-intermediates/Info.plist",
"_": "applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/ExampleTests/rules_xcodeproj/ExampleTests.__internal__.__test_bundle/Info.plist",
"t": "g"
},
"inputs": {
Expand Down Expand Up @@ -1075,7 +1075,7 @@
],
"extensions": [],
"info_plist": {
"_": "applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/ExampleUITests/ExampleUITests.__internal__.__test_bundle-intermediates/Info.plist",
"_": "applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/ExampleUITests/rules_xcodeproj/ExampleUITests.__internal__.__test_bundle/Info.plist",
"t": "g"
},
"inputs": {},
Expand Down
52 changes: 19 additions & 33 deletions test/fixtures/command_line/bwb.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
buildConfigurationList = 914277EC9F57B808A8817CF5 /* Build configuration list for PBXAggregateTarget "BazelDependencies" */;
buildPhases = (
9A630CF63C380FAE522825A9 /* Bazel Build */,
FC6E45C2D1E2FBCFC2D1471E /* Fix Info.plists */,
);
dependencies = (
);
Expand Down Expand Up @@ -128,6 +127,7 @@
331147AAE77477BF2E210C00 /* c_lib.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = c_lib.c; sourceTree = "<group>"; };
391FE6BAD634D0EBEDCB1127 /* libc_lib.a */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; name = libc_lib.a; path = "bazel-out/macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-0139d977e630/bin/examples/command_line/swift_c_module/libc_lib.a"; sourceTree = BUILT_PRODUCTS_DIR; };
3FEB5348BF9F16CDB97FB486 /* liblib_impl.a */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; name = liblib_impl.a; path = "bazel-out/macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-0139d977e630/bin/examples/command_line/lib/liblib_impl.a"; sourceTree = BUILT_PRODUCTS_DIR; };
4085087B6A24C9330B27D834 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
4476EF7C707FF85B9BCC90DD /* libImportableLibrary.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libImportableLibrary.a; sourceTree = "<group>"; };
4F18976D8538975B332CAC08 /* private_lib.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = private_lib.c; sourceTree = "<group>"; };
537B806ECAA55F19DAFDF318 /* BUILD */ = {isa = PBXFileReference; explicitFileType = text.script.python; path = BUILD; sourceTree = "<group>"; };
Expand All @@ -150,7 +150,6 @@
E61C1B860E7015FBB3750A95 /* _BazelForcedCompile_.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = _BazelForcedCompile_.swift; sourceTree = DERIVED_FILE_DIR; };
F5B8CDF37038F1DAA6B0A624 /* private_lib.swift.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = private_lib.swift.modulemap; sourceTree = "<group>"; };
F93835BAA75A671D6D3361A9 /* liblib_swift.a */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; name = liblib_swift.a; path = "bazel-out/macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-0139d977e630/bin/examples/command_line/lib/liblib_swift.a"; sourceTree = BUILT_PRODUCTS_DIR; };
FBCE39FCE2639759A7946083 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -231,6 +230,14 @@
path = examples_command_line_external;
sourceTree = "<group>";
};
26DE6FCD4EF2912A05554330 /* LibSwiftTests.__internal__.__test_bundle */ = {
isa = PBXGroup;
children = (
4085087B6A24C9330B27D834 /* Info.plist */,
);
path = LibSwiftTests.__internal__.__test_bundle;
sourceTree = "<group>";
};
2E6D9E4BA36A87B56922910C /* fixtures */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -337,6 +344,14 @@
path = bin;
sourceTree = "<group>";
};
8C089A0312BC8D0673FDE4D1 /* rules_xcodeproj */ = {
isa = PBXGroup;
children = (
26DE6FCD4EF2912A05554330 /* LibSwiftTests.__internal__.__test_bundle */,
);
path = rules_xcodeproj;
sourceTree = "<group>";
};
936244BBF22D78803D3F9055 /* lib */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -397,19 +412,11 @@
A26D921EF2C79FCEAD39BBD7 /* Tests */ = {
isa = PBXGroup;
children = (
B4B94A239D1E4F8A212F1C46 /* LibSwiftTests.__internal__.__test_bundle-intermediates */,
8C089A0312BC8D0673FDE4D1 /* rules_xcodeproj */,
);
path = Tests;
sourceTree = "<group>";
};
B4B94A239D1E4F8A212F1C46 /* LibSwiftTests.__internal__.__test_bundle-intermediates */ = {
isa = PBXGroup;
children = (
FBCE39FCE2639759A7946083 /* Info.plist */,
);
path = "LibSwiftTests.__internal__.__test_bundle-intermediates";
sourceTree = "<group>";
};
B90C93321F57509ADC051F9E /* testing */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -792,27 +799,6 @@
shellScript = "set -euo pipefail\n\n\"$BAZEL_INTEGRATION_DIR/copy_outputs.sh\" \\\n \"_BazelForcedCompile_.swift\" \\\n \"tool\" \\\n \"\"\n";
showEnvVarsInLog = 0;
};
FC6E45C2D1E2FBCFC2D1471E /* Fix Info.plists */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"$(INTERNAL_DIR)/infoplists.xcfilelist",
);
inputPaths = (
);
name = "Fix Info.plists";
outputFileListPaths = (
"$(INTERNAL_DIR)/infoplists.fixed.xcfilelist",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "set -euo pipefail\n\nif [ \"$ACTION\" == \"indexbuild\" ]; then\n # Info.plist file paths are `GEN_DIR` based, so this isn't needed during\n # Index Build\n exit\nfi\n\nwhile IFS= read -r input; do\n output=\"${input%.plist}.xcode.plist\"\n cp \"$input\" \"$output\"\n plutil -remove UIDeviceFamily \"$output\" > /dev/null 2>&1 || true\ndone < \"$SCRIPT_INPUT_FILE_LIST_0\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand Down Expand Up @@ -1173,7 +1159,7 @@
ENABLE_TESTABILITY = YES;
FRAMEWORK_SEARCH_PATHS = "$(BAZEL_EXTERNAL)/examples_command_line_external";
GCC_OPTIMIZATION_LEVEL = 0;
INFOPLIST_FILE = "$(GEN_DIR)/applebin_macos-darwin_x86_64-dbg-ST-0139d977e630/bin/examples/command_line/Tests/LibSwiftTests.__internal__.__test_bundle-intermediates/Info.xcode.plist";
INFOPLIST_FILE = "$(GEN_DIR)/applebin_macos-darwin_x86_64-dbg-ST-0139d977e630/bin/examples/command_line/Tests/rules_xcodeproj/LibSwiftTests.__internal__.__test_bundle/Info.plist";
LINK_PARAMS_FILE = "$(INTERNAL_DIR)/targets/macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-0139d977e630/examples/command_line/Tests/LibSwiftTests.__internal__.__test_bundle.link.params";
MACOSX_DEPLOYMENT_TARGET = 11.0;
OTHER_LDFLAGS = "@$(DERIVED_FILE_DIR)/link.params";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$(GEN_DIR)/applebin_macos-darwin_x86_64-dbg-ST-0139d977e630/bin/examples/command_line/Tests/LibSwiftTests.__internal__.__test_bundle-intermediates/Info.plist
$(GEN_DIR)/applebin_macos-darwin_x86_64-dbg-ST-0139d977e630/bin/examples/command_line/Tests/rules_xcodeproj/LibSwiftTests.__internal__.__test_bundle/Info.plist
$(GEN_DIR)/macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-0139d977e630/bin/examples/command_line/lib/lib_impl.swift.modulemap
$(GEN_DIR)/macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-0139d977e630/bin/examples/command_line/lib/lib_swift.swift.modulemap
$(GEN_DIR)/macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-0139d977e630/bin/examples/command_line/lib/private_lib.swift.modulemap
Expand Down

This file was deleted.

This file was deleted.

4 changes: 2 additions & 2 deletions test/fixtures/command_line/bwb_spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"t": "e"
},
{
"_": "applebin_macos-darwin_x86_64-dbg-ST-0139d977e630/bin/examples/command_line/Tests/LibSwiftTests.__internal__.__test_bundle-intermediates/Info.plist",
"_": "applebin_macos-darwin_x86_64-dbg-ST-0139d977e630/bin/examples/command_line/Tests/rules_xcodeproj/LibSwiftTests.__internal__.__test_bundle/Info.plist",
"t": "g"
},
"test/fixtures/command_line/BUILD"
Expand Down Expand Up @@ -95,7 +95,7 @@
],
"extensions": [],
"info_plist": {
"_": "applebin_macos-darwin_x86_64-dbg-ST-0139d977e630/bin/examples/command_line/Tests/LibSwiftTests.__internal__.__test_bundle-intermediates/Info.plist",
"_": "applebin_macos-darwin_x86_64-dbg-ST-0139d977e630/bin/examples/command_line/Tests/rules_xcodeproj/LibSwiftTests.__internal__.__test_bundle/Info.plist",
"t": "g"
},
"inputs": {},
Expand Down
Loading