Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(iOS): move boost compiler flags and folly dep name to centralized config (#46513)

Browse Source 
Summary:
This PR does some further cleanup on the flags passed to cocoapods.

I've moved `boost_compiler_flags` and `folly_dep_name` to `helpers.rb` file.

## Changelog:

[INTERNAL] [FIXED] -  move boost compiler flags and folly dep name to centralized config

Pull Request resolved: https://github.com/facebook/react-native/pull/46513

Test Plan: CI Green

Reviewed By: cortinico

Differential Revision: D62846105

Pulled By: cipolleschi

fbshipit-source-id: dff07ddb49f1f4b559125f2ed8508b32f08d4975
This commit is contained in:
Oskar Kwaśniewski
2024-09-17 04:57:36 -07:00
committed by Facebook GitHub Bot
parent e82743cf66
commit 3c17beafe3
23 changed files with 61 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-native/React-Core.podspec
+2 -1
View File
@@ -23,7 +23,8 @@ folly_version = folly_config[:version]
socket_rocket_config = get_socket_rocket_config()
socket_rocket_version = socket_rocket_config[:version]
boost_compiler_flags = '-Wno-documentation'
boost_config = get_boost_config()
boost_compiler_flags = boost_config[:compiler_flags]
use_hermes = ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == '1'
use_hermes_flag = use_hermes ? "-DUSE_HERMES=1" : ""
packages/react-native/React/React-RCTFabric.podspec
+2 -1
View File
@@ -19,7 +19,8 @@ end
folly_config = get_folly_config()
folly_compiler_flags = folly_config[:compiler_flags]
folly_version = folly_config[:version]
boost_compiler_flags = '-Wno-documentation'
boost_config = get_boost_config()
boost_compiler_flags = boost_config[:compiler_flags]
new_arch_flags = ENV['RCT_NEW_ARCH_ENABLED'] == '1' ? ' -DRCT_NEW_ARCH_ENABLED=1' : ''
header_search_paths = [
packages/react-native/ReactCommon/React-Fabric.podspec
+3 -2
View File
@@ -19,9 +19,10 @@ end
folly_config = get_folly_config()
folly_compiler_flags = folly_config[:compiler_flags]
folly_version = folly_config[:version]
folly_dep_name = folly_config[:dep_name]
folly_dep_name = 'RCT-Folly/Fabric'
boost_compiler_flags = '-Wno-documentation'
boost_config = get_boost_config()
boost_compiler_flags = boost_config[:compiler_flags]
react_native_path = ".."
Pod::Spec.new do |s|
packages/react-native/ReactCommon/React-FabricComponents.podspec
+3 -2
View File
@@ -19,9 +19,10 @@ end
folly_config = get_folly_config()
folly_compiler_flags = folly_config[:compiler_flags]
folly_version = folly_config[:version]
folly_dep_name = folly_config[:dep_name]
folly_dep_name = 'RCT-Folly/Fabric'
boost_compiler_flags = '-Wno-documentation'
boost_config = get_boost_config()
boost_compiler_flags = boost_config[:compiler_flags]
react_native_path = ".."
Pod::Spec.new do |s|
packages/react-native/ReactCommon/React-FabricImage.podspec
+3 -2
View File
@@ -19,9 +19,10 @@ end
folly_config = get_folly_config()
folly_compiler_flags = folly_config[:compiler_flags]
folly_version = folly_config[:version]
folly_dep_name = folly_config[:dep_name]
folly_dep_name = 'RCT-Folly/Fabric'
boost_compiler_flags = '-Wno-documentation'
boost_config = get_boost_config()
boost_compiler_flags = boost_config[:compiler_flags]
react_native_path = ".."
header_search_path = [
packages/react-native/ReactCommon/ReactCommon.podspec
+3 -2
View File
@@ -19,9 +19,10 @@ end
folly_config = get_folly_config()
folly_compiler_flags = folly_config[:compiler_flags]
folly_version = folly_config[:version]
boost_compiler_flags = '-Wno-documentation'
boost_config = get_boost_config()
boost_compiler_flags = boost_config[:compiler_flags]
using_hermes = ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == "1"
Pod::Spec.new do |s|
s.name = "ReactCommon"
s.module_name = "ReactCommon"
packages/react-native/ReactCommon/callinvoker/React-callinvoker.podspec
-6
View File
@@ -16,12 +16,6 @@ else
source[:tag] = "v#{version}"
end
folly_config = get_folly_config()
folly_compiler_flags = folly_config[:compiler_flags]
folly_version = folly_config[:version]
boost_compiler_flags = '-Wno-documentation'
Pod::Spec.new do |s|
s.name = "React-callinvoker"
s.version = version
packages/react-native/ReactCommon/cxxreact/React-cxxreact.podspec
+2 -1
View File
@@ -20,7 +20,8 @@ end
folly_config = get_folly_config()
folly_compiler_flags = folly_config[:compiler_flags]
folly_version = folly_config[:version]
boost_compiler_flags = '-Wno-documentation'
boost_config = get_boost_config()
boost_compiler_flags = boost_config[:compiler_flags]
Pod::Spec.new do |s|
s.name = "React-cxxreact"
packages/react-native/ReactCommon/hermes/React-hermes.podspec
+2 -1
View File
@@ -20,7 +20,8 @@ end
folly_config = get_folly_config()
folly_compiler_flags = folly_config[:compiler_flags]
folly_version = folly_config[:version]
boost_compiler_flags = '-Wno-documentation'
boost_config = get_boost_config()
boost_compiler_flags = boost_config[:compiler_flags]
Pod::Spec.new do |s|
s.name = "React-hermes"
packages/react-native/ReactCommon/jserrorhandler/React-jserrorhandler.podspec
+4 -2
View File
@@ -19,8 +19,10 @@ end
folly_config = get_folly_config()
folly_compiler_flags = folly_config[:compiler_flags]
folly_version = folly_config[:version]
folly_dep_name = 'RCT-Folly/Fabric'
boost_compiler_flags = '-Wno-documentation'
folly_dep_name = folly_config[:dep_name]
boost_config = get_boost_config()
boost_compiler_flags = boost_config[:compiler_flags]
react_native_path = ".."
Pod::Spec.new do |s|
packages/react-native/ReactCommon/jsi/React-jsi.podspec
+2 -1
View File
@@ -23,7 +23,8 @@ end
folly_config = get_folly_config()
folly_compiler_flags = folly_config[:compiler_flags]
folly_version = folly_config[:version]
boost_compiler_flags = '-Wno-documentation'
boost_config = get_boost_config()
boost_compiler_flags = boost_config[:compiler_flags]
Pod::Spec.new do |s|
s.name = "React-jsi"
packages/react-native/ReactCommon/jsiexecutor/React-jsiexecutor.podspec
+2 -1
View File
@@ -19,7 +19,8 @@ end
folly_config = get_folly_config()
folly_compiler_flags = folly_config[:compiler_flags]
folly_version = folly_config[:version]
boost_compiler_flags = '-Wno-documentation'
boost_config = get_boost_config()
boost_compiler_flags = boost_config[:compiler_flags]
Pod::Spec.new do |s|
s.name = "React-jsiexecutor"
packages/react-native/ReactCommon/logger/React-logger.podspec
+2 -1
View File
@@ -20,7 +20,8 @@ end
folly_config = get_folly_config()
folly_compiler_flags = folly_config[:compiler_flags]
folly_version = folly_config[:version]
boost_compiler_flags = '-Wno-documentation'
boost_config = get_boost_config()
boost_compiler_flags = boost_config[:compiler_flags]
Pod::Spec.new do |s|
s.name = "React-logger"
packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/React-NativeModulesApple.podspec
+4 -1
View File
@@ -20,8 +20,11 @@ folly_config = get_folly_config()
folly_compiler_flags = folly_config[:compiler_flags]
folly_version = folly_config[:version]
boost_compiler_flags = '-Wno-documentation'
boost_config = get_boost_config()
boost_compiler_flags = boost_config[:compiler_flags]
using_hermes = ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == "1"
Pod::Spec.new do |s|
s.name = "React-NativeModulesApple"
s.module_name = "React_NativeModulesApple"
packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec
+2 -1
View File
@@ -20,7 +20,8 @@ folly_config = get_folly_config()
folly_compiler_flags = folly_config[:compiler_flags]
folly_version = folly_config[:version]
boost_compiler_flags = '-Wno-documentation'
boost_config = get_boost_config()
boost_compiler_flags = boost_config[:compiler_flags]
using_hermes = ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == "1"
header_search_paths = [
packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec
+2 -1
View File
@@ -20,7 +20,8 @@ folly_config = get_folly_config()
folly_compiler_flags = folly_config[:compiler_flags]
folly_version = folly_config[:version]
boost_compiler_flags = '-Wno-documentation'
boost_config = get_boost_config()
boost_compiler_flags = boost_config[:compiler_flags]
Pod::Spec.new do |s|
source_files = "**/*.{m,mm,cpp,h}"
packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/React-ImageManager.podspec
+4 -2
View File
@@ -16,8 +16,10 @@ else
source[:tag] = "v#{version}"
end
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_CFG_NO_COROUTINES=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -Wno-comma -Wno-shorten-64-to-32'
boost_compiler_flags = '-Wno-documentation'
folly_config = get_folly_config()
folly_compiler_flags = folly_config[:compiler_flags]
boost_config = get_boost_config()
boost_compiler_flags = boost_config[:compiler_flags]
Pod::Spec.new do |s|
source_files = "**/*.{m,mm,cpp,h}"
packages/react-native/ReactCommon/react/runtime/React-RuntimeCore.podspec
+3 -2
View File
@@ -19,9 +19,10 @@ end
folly_config = get_folly_config()
folly_compiler_flags = folly_config[:compiler_flags]
folly_version = folly_config[:version]
folly_dep_name = folly_config[:dep_name]
folly_dep_name = 'RCT-Folly/Fabric'
boost_compiler_flags = '-Wno-documentation'
boost_config = get_boost_config()
boost_compiler_flags = boost_config[:compiler_flags]
Pod::Spec.new do |s|
s.name = "React-RuntimeCore"
packages/react-native/ReactCommon/react/runtime/React-RuntimeHermes.podspec
+4 -2
View File
@@ -19,8 +19,10 @@ end
folly_config = get_folly_config()
folly_compiler_flags = folly_config[:compiler_flags]
folly_version = folly_config[:version]
folly_dep_name = 'RCT-Folly/Fabric'
boost_compiler_flags = '-Wno-documentation'
folly_dep_name = folly_config[:dep_name]
boost_config = get_boost_config()
boost_compiler_flags = boost_config[:compiler_flags]
Pod::Spec.new do |s|
s.name = "React-RuntimeHermes"
packages/react-native/ReactCommon/react/runtime/platform/ios/React-RuntimeApple.podspec
+4 -2
View File
@@ -19,8 +19,10 @@ end
folly_config = get_folly_config()
folly_compiler_flags = folly_config[:compiler_flags]
folly_version = folly_config[:version]
folly_dep_name = 'RCT-Folly/Fabric'
boost_compiler_flags = '-Wno-documentation'
folly_dep_name = folly_config[:dep_name]
boost_config = get_boost_config()
boost_compiler_flags = boost_config[:compiler_flags]
header_search_paths = [
"$(PODS_ROOT)/boost",
packages/react-native/ReactCommon/runtimeexecutor/React-runtimeexecutor.podspec
+2 -1
View File
@@ -19,7 +19,8 @@ end
folly_config = get_folly_config()
folly_compiler_flags = folly_config[:compiler_flags]
folly_version = folly_config[:version]
boost_compiler_flags = '-Wno-documentation'
boost_config = get_boost_config()
boost_compiler_flags = boost_config[:compiler_flags]
Pod::Spec.new do |s|
s.name = "React-runtimeexecutor"
packages/react-native/scripts/cocoapods/codegen_utils.rb
+3 -2
View File
@@ -73,8 +73,9 @@ class CodegenUtils
package = JSON.parse(file_manager.read(package_json_file))
version = package['version']
use_frameworks = ENV['USE_FRAMEWORKS'] != nil
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_CFG_NO_COROUTINES=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -Wno-comma -Wno-shorten-64-to-32'
boost_compiler_flags = '-Wno-documentation'
folly_compiler_flags = get_folly_config()[:compiler_flags]
boost_compiler_flags = get_boost_config()[:compiler_flags]
header_search_paths = [
"\"$(PODS_ROOT)/boost\"",
packages/react-native/scripts/cocoapods/helpers.rb
+3 -1
View File
@@ -39,6 +39,7 @@ module Helpers
class Constants
@@boost_config = {
:git => "https://github.com/react-native-community/boost-for-react-native",
:compiler_flags => '-Wno-documentation'
}
@@socket_rocket_config = {
@@ -48,7 +49,8 @@ module Helpers
@@folly_config = {
:version => '2024.01.01.00',
:git => 'https://github.com/facebook/folly.git',
:compiler_flags => '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_CFG_NO_COROUTINES=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -Wno-comma -Wno-shorten-64-to-32'
:compiler_flags => '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_CFG_NO_COROUTINES=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -Wno-comma -Wno-shorten-64-to-32',
:dep_name => 'RCT-Folly/Fabric'
}
@@fmt_config = {