This repository has been archived by the owner on Mar 4, 2024. It is now read-only.
Sync with upstream #18
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
External BuildLabels were keeping their // halfway through their path, leading to projects xcode would refuse to load. As an example: @google_toolbox_for_mac//Foundation:BUILD was going to external//Foundation/BUILD, not external/Foundation/BUILD. This lead the pbjproj to assign the file the path //Foundation/BUILD, which Xcode refuses to load, along with groups named '/' and the omission of other associated source files.
…le Execroot (#255) * Fix breaking of external workspaces after builds Previously, paths to files in external workspaces went through execroot. Execroot is reconfigured on every rebuild to contain only the external workspaces (and top-level packages) required by that build. Therefore, executing a build that used a subset of the project's external workspaces broke the file references and include paths for the other external workspaces. Bad times. This commit points to external workspaces through the stable external subdirectory of output_base instead of the unstable external subdir of execroot. This requires a new tulsi symlink for output base; Xcode doesn't properly resolve ../ paths through symlinks for file references. Plus, we should probably try to move away from linking through a temporary build sandbox anyway; it'll just keep leading to subtle bugs. This should close bazelbuild/tulsi#164 This patches bazelbuild/tulsi#227 and bazelbuild/tulsi#229. This commit also contains a fix for an (I think unreported) bug I noticed while editing ProjectPatcher. In trying to fix paths for files not on disk, it was unintentionally setting their paths to (an incorrect) path that was group relative, but meant to be project relative. It also created inconsistent state in the PBGroup hierarchy. Since this fixes the paths for generated Info.plists in most projects, it leads to many of the file ref path changes in the tests. The code now does what the author clearly intended, and I've added some defence against future issues into PBXObjects. * Make execroot symlink's names reflect what it is tulsi-workspace -> tulsi-execution-root TULSI_BWRS -> TULSI_EXECUTION_ROOT * Re-add legacy names for execroot build setting and symlink for backwards compatibility Fixes bazelbuild/tulsi#164.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
sync changes from upstream:
other changes: