Skip to content

Commit f7e4c07

Browse files
sota000facebook-github-bot
authored andcommitted
Move codegen output out of node_modules
Summary: In this diff, it moves the codegen output location out of node_modules and to build/generated/ios folder. A temp pod spec will be created so that those files will be included in the Xcode project. Changelog: [Internal] Reviewed By: hramos, cortinico Differential Revision: D31809012 fbshipit-source-id: ba1c884c8024306ba0fd2102837b7dbebc6e18ac
1 parent 1b30dd0 commit f7e4c07

File tree

17 files changed

+98
-94
lines changed

17 files changed

+98
-94
lines changed

Libraries/Blob/React-RCTBlob.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ Pod::Spec.new do |s|
3535
s.pod_target_xcconfig = {
3636
"USE_HEADERMAP" => "YES",
3737
"CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
38-
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\""
38+
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\""
3939
}
4040

4141
s.dependency "RCT-Folly", folly_version
42-
s.dependency "FBReactNativeSpec", version
42+
s.dependency "React-Codegen", version
4343
s.dependency "ReactCommon/turbomodule/core", version
4444
s.dependency "React-jsi", version
4545
s.dependency "React-Core/RCTBlobHeaders", version

Libraries/Image/React-RCTImage.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ Pod::Spec.new do |s|
3636
s.pod_target_xcconfig = {
3737
"USE_HEADERMAP" => "YES",
3838
"CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
39-
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\""
39+
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\""
4040
}
4141

4242
s.dependency "RCT-Folly", folly_version
43-
s.dependency "FBReactNativeSpec", version
43+
s.dependency "React-Codegen", version
4444
s.dependency "RCTTypeSafety", version
4545
s.dependency "ReactCommon/turbomodule/core", version
4646
s.dependency "React-jsi", version

Libraries/LinkingIOS/React-RCTLinking.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ Pod::Spec.new do |s|
3636
s.pod_target_xcconfig = {
3737
"USE_HEADERMAP" => "YES",
3838
"CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
39-
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\""
39+
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\""
4040
}
4141

42-
s.dependency "FBReactNativeSpec", version
42+
s.dependency "React-Codegen", version
4343
s.dependency "React-Core/RCTLinkingHeaders", version
4444
s.dependency "ReactCommon/turbomodule/core", version
4545
s.dependency "React-jsi", version

Libraries/NativeAnimation/React-RCTAnimation.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ Pod::Spec.new do |s|
3535
s.pod_target_xcconfig = {
3636
"USE_HEADERMAP" => "YES",
3737
"CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
38-
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\""
38+
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\""
3939
}
4040

4141
s.dependency "RCT-Folly", folly_version
42-
s.dependency "FBReactNativeSpec", version
42+
s.dependency "React-Codegen", version
4343
s.dependency "RCTTypeSafety", version
4444
s.dependency "ReactCommon/turbomodule/core", version
4545
s.dependency "React-jsi", version

Libraries/Network/React-RCTNetwork.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ Pod::Spec.new do |s|
3535
s.pod_target_xcconfig = {
3636
"USE_HEADERMAP" => "YES",
3737
"CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
38-
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\""
38+
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\""
3939
}
4040
s.frameworks = "MobileCoreServices"
4141

4242
s.dependency "RCT-Folly", folly_version
43-
s.dependency "FBReactNativeSpec", version
43+
s.dependency "React-Codegen", version
4444
s.dependency "RCTTypeSafety", version
4545
s.dependency "ReactCommon/turbomodule/core", version
4646
s.dependency "React-jsi", version

Libraries/PushNotificationIOS/React-RCTPushNotification.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ Pod::Spec.new do |s|
3636
s.pod_target_xcconfig = {
3737
"USE_HEADERMAP" => "YES",
3838
"CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
39-
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\""
39+
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\""
4040
}
4141
s.framework = "UserNotifications"
4242

43-
s.dependency "FBReactNativeSpec", version
43+
s.dependency "React-Codegen", version
4444
s.dependency "RCTTypeSafety", version
4545
s.dependency "React-Core/RCTPushNotificationHeaders", version
4646
s.dependency "ReactCommon/turbomodule/core", version

Libraries/Settings/React-RCTSettings.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ Pod::Spec.new do |s|
3636
s.pod_target_xcconfig = {
3737
"USE_HEADERMAP" => "YES",
3838
"CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
39-
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\""
39+
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\""
4040
}
4141

4242
s.dependency "RCT-Folly", folly_version
43-
s.dependency "FBReactNativeSpec", version
43+
s.dependency "React-Codegen", version
4444
s.dependency "RCTTypeSafety", version
4545
s.dependency "ReactCommon/turbomodule/core", version
4646
s.dependency "React-jsi", version

Libraries/Vibration/React-RCTVibration.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ Pod::Spec.new do |s|
3636
s.pod_target_xcconfig = {
3737
"USE_HEADERMAP" => "YES",
3838
"CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
39-
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\""
39+
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\""
4040
}
4141
s.frameworks = "AudioToolbox"
4242

4343
s.dependency "RCT-Folly", folly_version
44-
s.dependency "FBReactNativeSpec", version
44+
s.dependency "React-Codegen", version
4545
s.dependency "ReactCommon/turbomodule/core", version
4646
s.dependency "React-jsi", version
4747
s.dependency "React-Core/RCTVibrationHeaders", version

React/CoreModules/React-CoreModules.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ Pod::Spec.new do |s|
3434
s.pod_target_xcconfig = {
3535
"USE_HEADERMAP" => "YES",
3636
"CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
37-
"HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/React/CoreModules\" \"$(PODS_ROOT)/RCT-Folly\""
37+
"HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/React/CoreModules\" \"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\""
3838
}
3939

40-
s.dependency "FBReactNativeSpec", version
40+
s.dependency "React-Codegen", version
4141
s.dependency "RCT-Folly", folly_version
4242
s.dependency "RCTTypeSafety", version
4343
s.dependency "React-Core/CoreModulesHeaders", version

React/FBReactNativeSpec/FBReactNativeSpec.podspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Pod::Spec.new do |s|
3838
s.pod_target_xcconfig = {
3939
"USE_HEADERMAP" => "YES",
4040
"CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
41-
"HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/React/FBReactNativeSpec\" \"$(PODS_ROOT)/RCT-Folly\""
41+
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\""
4242
}
4343

4444
s.dependency "RCT-Folly", folly_version
@@ -53,6 +53,5 @@ Pod::Spec.new do |s|
5353
:js_srcs_dir => "#{react_native_path}/Libraries",
5454
:library_name => "FBReactNativeSpec",
5555
:library_type => "modules",
56-
:output_dir => "#{react_native_path}/React/FBReactNativeSpec/FBReactNativeSpec"
5756
})
5857
end

0 commit comments

Comments
 (0)