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.

Sign up for GitHub

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

Jump to bottom

Fix search paths for non-merged top-level targets #725

Merged
merged 1 commit into from
Jul 12, 2022
Merged

Fix search paths for non-merged top-level targets #725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
73 changes: 69 additions & 4 deletions examples/ios_app/test/fixtures/bwb_spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,26 @@
"type": "com.apple.product-type.application"
},
"resource_bundle_dependencies": [],
"search_paths": {},
"search_paths": {
"includes": [
"CoreUtilsObjC",
{
"_": "ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/CoreUtilsObjC",
"t": "g"
}
],
"quote_includes": [
".",
{
"_": "ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin",
"t": "g"
},
{
"_": "applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin",
"t": "g"
}
]
},
"swiftmodules": [],
"test_host": null,
"watch_application": null
Expand Down Expand Up @@ -539,7 +558,26 @@
"type": "com.apple.product-type.bundle.unit-test"
},
"resource_bundle_dependencies": [],
"search_paths": {},
"search_paths": {
"includes": [
"CoreUtilsObjC",
{
"_": "ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/CoreUtilsObjC",
"t": "g"
}
],
"quote_includes": [
".",
{
"_": "ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin",
"t": "g"
},
{
"_": "applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin",
"t": "g"
}
]
},
"swiftmodules": [],
"test_host": "//Example:Example applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217",
"watch_application": null
Expand Down Expand Up @@ -754,7 +792,26 @@
"type": "com.apple.product-type.bundle.unit-test"
},
"resource_bundle_dependencies": [],
"search_paths": {},
"search_paths": {
"includes": [
"CoreUtilsObjC",
{
"_": "ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin/CoreUtilsObjC",
"t": "g"
}
],
"quote_includes": [
".",
{
"_": "ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin",
"t": "g"
},
{
"_": "applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin",
"t": "g"
}
]
},
"swiftmodules": [],
"test_host": "//Example:Example applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217",
"watch_application": null
Expand Down Expand Up @@ -939,7 +996,15 @@
"type": "com.apple.product-type.bundle.ui-testing"
},
"resource_bundle_dependencies": [],
"search_paths": {},
"search_paths": {
"quote_includes": [
".",
{
"_": "applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin",
"t": "g"
}
]
},
"swiftmodules": [],
"test_host": "//Example:Example applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217",
"watch_application": null
Expand Down
73 changes: 69 additions & 4 deletions examples/ios_app/test/fixtures/bwx_spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,26 @@
"//ExampleResources:ExampleResources ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-8100579b5c54",
"//ExampleNestedResources:ExampleNestedResources ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-8100579b5c54"
],
"search_paths": {},
"search_paths": {
"includes": [
"CoreUtilsObjC",
{
"_": "ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/CoreUtilsObjC",
"t": "g"
}
],
"quote_includes": [
".",
{
"_": "ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin",
"t": "g"
},
{
"_": "applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin",
"t": "g"
}
]
},
"swiftmodules": [],
"test_host": null,
"watch_application": null
Expand Down Expand Up @@ -551,7 +570,26 @@
"resource_bundle_dependencies": [
"//OnlyStructuredResources:OnlyStructuredResources ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-8100579b5c54"
],
"search_paths": {},
"search_paths": {
"includes": [
"CoreUtilsObjC",
{
"_": "ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/CoreUtilsObjC",
"t": "g"
}
],
"quote_includes": [
".",
{
"_": "ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin",
"t": "g"
},
{
"_": "applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin",
"t": "g"
}
]
},
"swiftmodules": [],
"test_host": "//Example:Example applebin_ios-ios_x86_64-dbg-ST-8100579b5c54",
"watch_application": null
Expand Down Expand Up @@ -830,7 +868,26 @@
"resource_bundle_dependencies": [
"//ExampleResources:ExampleResources ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-8100579b5c54"
],
"search_paths": {},
"search_paths": {
"includes": [
"CoreUtilsObjC",
{
"_": "ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin/CoreUtilsObjC",
"t": "g"
}
],
"quote_includes": [
".",
{
"_": "ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin",
"t": "g"
},
{
"_": "applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin",
"t": "g"
}
]
},
"swiftmodules": [],
"test_host": "//Example:Example applebin_ios-ios_x86_64-dbg-ST-8100579b5c54",
"watch_application": null
Expand Down Expand Up @@ -997,7 +1054,15 @@
"resource_bundle_dependencies": [
"@examples_ios_app_external//:ExternalResources ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-8100579b5c54"
],
"search_paths": {},
"search_paths": {
"quote_includes": [
".",
{
"_": "applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin",
"t": "g"
}
]
},
"swiftmodules": [],
"test_host": "//Example:Example applebin_ios-ios_x86_64-dbg-ST-8100579b5c54",
"watch_application": null
Expand Down
2 changes: 0 additions & 2 deletions test/fixtures/cc/bwb.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,8 +685,6 @@
"$(BUILD_DIR)/bazel-out/darwin_x86_64-dbg-ST-5534cb307cb8/bin",
"$(BAZEL_EXTERNAL)/examples_cc_external",
"$(BUILD_DIR)/bazel-out/darwin_x86_64-dbg-ST-5534cb307cb8/bin/external/examples_cc_external",
"$(BAZEL_EXTERNAL)/bazel_tools",
"$(BUILD_DIR)/bazel-out/darwin_x86_64-dbg-ST-5534cb307cb8/bin/external/bazel_tools",
);
};
name = Debug;
Expand Down
8 changes: 0 additions & 8 deletions test/fixtures/cc/bwb_spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,14 +334,6 @@
{
"_": "darwin_x86_64-dbg-ST-5534cb307cb8/bin/external/examples_cc_external",
"t": "g"
},
{
"_": "bazel_tools",
"t": "e"
},
{
"_": "darwin_x86_64-dbg-ST-5534cb307cb8/bin/external/bazel_tools",
"t": "g"
}
],
"system_includes": [
Expand Down
2 changes: 0 additions & 2 deletions test/fixtures/cc/bwx.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,8 +702,6 @@
"$(BUILD_DIR)/bazel-out/darwin_x86_64-dbg-ST-ccd9595da841/bin",
"$(BAZEL_EXTERNAL)/examples_cc_external",
"$(BUILD_DIR)/bazel-out/darwin_x86_64-dbg-ST-ccd9595da841/bin/external/examples_cc_external",
"$(BAZEL_EXTERNAL)/bazel_tools",
"$(BUILD_DIR)/bazel-out/darwin_x86_64-dbg-ST-ccd9595da841/bin/external/bazel_tools",
);
};
name = Debug;
Expand Down
8 changes: 0 additions & 8 deletions test/fixtures/cc/bwx_spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,14 +329,6 @@
{
"_": "darwin_x86_64-dbg-ST-ccd9595da841/bin/external/examples_cc_external",
"t": "g"
},
{
"_": "bazel_tools",
"t": "e"
},
{
"_": "darwin_x86_64-dbg-ST-ccd9595da841/bin/external/bazel_tools",
"t": "g"
}
],
"system_includes": [
Expand Down
68 changes: 66 additions & 2 deletions test/fixtures/command_line/bwb_spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,33 @@
"type": "com.apple.product-type.bundle.unit-test"
},
"resource_bundle_dependencies": [],
"search_paths": {},
"search_paths": {
"framework_includes": [
{
"_": "examples_command_line_external",
"t": "e"
}
],
"quote_includes": [
".",
{
"_": "macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-0139d977e630/bin",
"t": "g"
},
{
"_": "examples_command_line_external",
"t": "e"
},
{
"_": "macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-0139d977e630/bin/external/examples_command_line_external",
"t": "g"
},
{
"_": "applebin_macos-darwin_x86_64-dbg-ST-0139d977e630/bin",
"t": "g"
}
]
},
"swiftmodules": [],
"test_host": null,
"watch_application": null
Expand Down Expand Up @@ -806,7 +832,45 @@
"type": "com.apple.product-type.tool"
},
"resource_bundle_dependencies": [],
"search_paths": {},
"search_paths": {
"framework_includes": [
{
"_": "examples_command_line_external",
"t": "e"
}
],
"includes": [
"examples/command_line/lib/dir with space",
{
"_": "macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-0139d977e630/bin/examples/command_line/lib/dir with space",
"t": "g"
},
"examples/command_line/lib/private",
{
"_": "macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-0139d977e630/bin/examples/command_line/lib/private",
"t": "g"
}
],
"quote_includes": [
".",
{
"_": "macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-0139d977e630/bin",
"t": "g"
},
{
"_": "examples_command_line_external",
"t": "e"
},
{
"_": "macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-0139d977e630/bin/external/examples_command_line_external",
"t": "g"
},
{
"_": "applebin_macos-darwin_x86_64-dbg-ST-0139d977e630/bin",
"t": "g"
}
]
},
"swiftmodules": [],
"test_host": null,
"watch_application": null
Expand Down
Loading