[ios][precompile] add support for clang virtual file system #54842
+1,526
−382
Conversation
This file contains hidden or 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
To be able to change the target xcconfig from within `add_rn_core`, we need to make sure it is not overwritten by the line that sets the config. This commit fixes this by moving it after the line: `spec.pod_target_xcconfig = current_config`
A small cleanup to make the directory structure of the header file template when building xcframeworks. Umbrella and module map templates are now moved into templates folder.
To make the later VFS overlays work, our React umbrella header needs to use angled import syntax instead of quoted". This is so that the compiler will look up by module and not only by path.
Replace the regex-based approach for parsing podspec files with a declarative configuration system for header file collection: Add headers-config.js with explicit podspec configurations defining header patterns, directories, and subspecs - Add vfs.js to generate VFS overlay YAML files for Clang virtual file system support - Refactor headers.js to use the new configuration-based approach with support for nested subspecs and path preservation - Update xcframework.js to handle the new header mapping structure with source/target paths - This provides more reliable and maintainable header file collection for XCFramework builds by avoiding fragile regex parsing of Ruby podspec files.
meta-cla
bot
added
the
CLA Signed
facebook-github-bot
added
p: Expo
Job Summary for GradleTest All :: run_fantom_tests
|
Job Summary for GradleTest All :: run_fantom_tests
|
Now it reads from podspec files, except for some special cases that we have in the config file. Updated RCTSwiftUIWrapper.podspec to use podspec_sources (which we use to detect source) I tested this against the header files I got with the previous iteration, and also with the ones installed by Cocoapods.
To solve our problem with header files from the React.XCFramework not being consumable due to the legacy Cocoapods headers, we used to point all header search / resolving into the Pods/Headers folder when building even with the framework installed. This is a problem since an xcframework expects a modular header structure that can be consumed from within the headers folder of the framework. The headers are used for both Objective-c compiling and for creating clang modules that can be consumed by Swift in our setup. This commit fixes the above issues and makes a modular clang virtual file system from the header files we distribute. This vfs-overlay file will then be used by the `rncore.rb` script when installing the 'React-Core-prebuilt' pod and map the header files requested in the source code to the actual location on disk where the React.xcframework headers are installed. Here are the changes: - Added vfs.js with types for creating clang virtual file system overlays - Added resolving the paths in the vfs file to the actual install path - Added installing the vfs overlay with the switch `-ivfsoverlay <path>` to compiler settings for both obj-c and swift on pod installation - Add vfs targets to the app target on post install
chrfalch
force-pushed
the
chrfalch/react-precompile-add-vfs-support
branch
from
3e2aec1 to
ed64fda
Compare
Job Summary for GradleTest All :: run_fantom_tests
|
Had some podspecs with header_dir set to a variable that wasn't emitted correctly in the VFS file. This commit fixes this by adding explicit reading of header-dir as well as exceptions for the specs that had variables. - Tested comparing the output from a regular pod install with the generated header files. - Tested with RNTester - Tested in BareExpo with prebuild Expo modules and full compile.
Tried to build some smartness in last comitt - not working in a generic way so I reverted it. This is handled by the exception in header-config.js instead.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary:
To solve our problem with header files from the React.XCFramework not being consumable due to the legacy Cocoapods headers, we used to point all header search / resolving into the Pods/Headers folder when building even with the framework installed.
This is a problem since an xcframework expects a modular header structure that can be consumed from within the headers folder of the framework.
The headers are used for both Objective-c compiling and for creating clang modules that can be consumed by Swift in our setup.
This commit fixes the above issues and makes a modular clang virtual file system from the header files we distribute. This vfs-overlay file will then be used by the
rncore.rbscript when installing the 'React-Core-prebuilt' pod and map the header files requested in the source code to the actual location on disk where the React.xcframework headers are installed.Here are the changes:
-ivfsoverlay <path>to compiler settings for both obj-c and swift on pod installationChangelog:
[IOS] [FIXED] - added support for clang virtual file system in React.XCFramework
Test Plan:
Run RNTester with prebuilt