Skip to content

Remove bad INFOPLIST_FILE in fixtures #717

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

Closed
thiagohmcruz wants to merge 6 commits into from
Closed

Remove bad INFOPLIST_FILE in fixtures #717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7e1eb1c
Remove bad INFOPLIST_FILE in fixtures
thiagohmcruz May 9, 2023
05e45a7
test product_type conditional for static fmw
thiagohmcruz May 9, 2023
8d4d0b8
Update expected custom output path diff
thiagohmcruz May 9, 2023
f3696ab
what if
thiagohmcruz May 9, 2023
dfd4035
Fix diff fixture again
thiagohmcruz May 10, 2023
c915aed
typo
thiagohmcruz May 10, 2023
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
5 changes: 3 additions & 2 deletions rules/legacy_xcodeproj.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,11 +879,12 @@ def _populate_xcodeproj_targets_and_schemes(ctx, targets, src_dot_dots, all_tran

target_settings["BAZEL_LLDB_INIT_FILE"] = lldbinit_file

if product_type == "application" or product_type == "app-extension":
if product_type == "application" or product_type == "app-extension" or product_type == "framework.static":
# Prevent XcodeGen from inferring a plist path on its own from target source files.
# See PRs #593 and #601 for more context.
target_settings["INFOPLIST_FILE"] = ""
target_settings["PRODUCT_BUNDLE_IDENTIFIER"] = target_info.bundle_id
if product_type != "framework.static":
target_settings["PRODUCT_BUNDLE_IDENTIFIER"] = target_info.bundle_id

if product_type == "bundle.unit-test":
target_settings["SUPPORTS_MACCATALYST"] = False
Expand Down
4 changes: 0 additions & 4 deletions tests/ios/xcodeproj/Test-Mixed-Dynamic-App-Project.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,6 @@
FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/c/c\"";
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/b/b_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\"";
INFOPLIST_FILE = ../../../tests/ios/frameworks/dynamic/b/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MACH_O_TYPE = "$(inherited)";
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -445,7 +444,6 @@
FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/c/c\"";
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/a/a_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\"";
INFOPLIST_FILE = ../../../tests/ios/frameworks/dynamic/a/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MACH_O_TYPE = "$(inherited)";
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -493,7 +491,6 @@
FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/c/c\"";
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/a/a_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\"";
INFOPLIST_FILE = ../../../tests/ios/frameworks/dynamic/a/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MACH_O_TYPE = "$(inherited)";
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -552,7 +549,6 @@
FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/c/c\"";
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/b/b_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\"";
INFOPLIST_FILE = ../../../tests/ios/frameworks/dynamic/b/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MACH_O_TYPE = "$(inherited)";
ONLY_ACTIVE_ARCH = YES;
Expand Down
4 changes: 2 additions & 2 deletions tests/ios/xcodeproj/fixtures/test_custom_output_path_expected_diff.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ diff -r ./tests/ios/xcodeproj/Test-LLDB-Logs-Project.xcodeproj/project.pbxproj .
< path = ../../..;
---
> path = ../../../..;
211c211
212c212
< BAZEL_WORKSPACE_ROOT = $SRCROOT/../../..;
---
> BAZEL_WORKSPACE_ROOT = $SRCROOT/../../../..;
269c269
271c271
< BAZEL_WORKSPACE_ROOT = $SRCROOT/../../..;
---
> BAZEL_WORKSPACE_ROOT = $SRCROOT/../../../..;
Expand Down