-
Notifications
You must be signed in to change notification settings - Fork 25.1k
[ios][precompile] add support for clang virtual file system #54842
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
Conversation
Job Summary for GradleTest All :: run_fantom_tests
|
Job Summary for GradleTest All :: run_fantom_tests
|
3e2aec1 to
ed64fda
Compare
Job Summary for GradleTest All :: run_fantom_tests
|
cipolleschi
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It makes sense. I trust that you tested it out!
d0c3305 to
b1fdfaf
Compare
ba99f11 to
2ddcbd1
Compare
|
@cipolleschi has imported this pull request. If you are a Meta employee, you can view this in D90674493. |
cortinico
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review automatically exported from Phabricator review in Meta.
|
|
||
| require_relative './utils.rb' | ||
|
|
||
| ### Adds ReactNativeCore-prebuilt as a dependency to the given podspec if we're not |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
from @cortinico
is this stale?
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.
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
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.
…te targets when installing This one uses installer.pod_targets.each to do this. Added helper function to avoid code ducplication.
2ddcbd1 to
7fea6c5
Compare
Summary: 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. Prev PR: #54840 Next PR: #54842 bypass-github-export-checks ## Changelog: [IOS] [FIXED] - refactored header files generator for prebuilt React framework Pull Request resolved: #54841 Test Plan: Run RNTester with prebuilt Reviewed By: cortinico Differential Revision: D90674355 Pulled By: cipolleschi fbshipit-source-id: 66ec997a8731b6bf91a8f3c2ab42a94e7b0601e8
|
@cipolleschi merged this pull request in f0422ab. |
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 installationPrev PR: #54841
Changelog:
[IOS] [FIXED] - added support for clang virtual file system in React.XCFramework
Test Plan:
Run RNTester with prebuilt