Revert D34784966: Consider relative to pwd installation root when looking for files in rn module via cocoapods
Differential Revision: D34784966 (2f813f873a
) Original commit changeset: d6d5e71bc2fc Original Phabricator Diff: D34784966 (2f813f873a
) fbshipit-source-id: edaf38cb26187f0bd08e1efb7fc086233cf094c8
This commit is contained in:
Родитель
145fd041c7
Коммит
06f504b8b2
|
@ -278,9 +278,8 @@ def modify_flags_for_new_architecture(installer, cpp_flags)
|
|||
end
|
||||
|
||||
def build_codegen!(react_native_path)
|
||||
relative_installation_root = Pod::Config.instance.installation_root.relative_path_from(Pathname.pwd)
|
||||
codegen_repo_path = "#{relative_installation_root}/#{react_native_path}/packages/react-native-codegen";
|
||||
codegen_npm_path = "#{relative_installation_root}/#{react_native_path}/../react-native-codegen";
|
||||
codegen_repo_path = "#{react_native_path}/packages/react-native-codegen";
|
||||
codegen_npm_path = "#{react_native_path}/../react-native-codegen";
|
||||
codegen_cli_path = ""
|
||||
if Dir.exist?(codegen_repo_path)
|
||||
codegen_cli_path = codegen_repo_path
|
||||
|
@ -321,7 +320,7 @@ def checkAndGenerateEmptyThirdPartyProvider!(react_native_path)
|
|||
Pod::Executable.execute_command(
|
||||
'node',
|
||||
[
|
||||
"#{relative_installation_root}/#{react_native_path}/scripts/generate-provider-cli.js",
|
||||
"#{react_native_path}/scripts/generate-provider-cli.js",
|
||||
"--platform", 'ios',
|
||||
"--schemaListPath", temp_schema_list_path,
|
||||
"--outputDir", "#{output_dir}"
|
||||
|
@ -511,7 +510,6 @@ def use_react_native_codegen_discovery!(options={})
|
|||
app_path = options[:app_path]
|
||||
fabric_enabled = options[:fabric_enabled] ||= false
|
||||
config_file_dir = options[:config_file_dir] ||= ''
|
||||
relative_installation_root = Pod::Config.instance.installation_root.relative_path_from(Pathname.pwd)
|
||||
|
||||
if !app_path
|
||||
Pod::UI.warn '[Codegen] Error: app_path is required for use_react_native_codegen_discovery.'
|
||||
|
@ -527,7 +525,7 @@ def use_react_native_codegen_discovery!(options={})
|
|||
out = Pod::Executable.execute_command(
|
||||
'node',
|
||||
[
|
||||
"#{relative_installation_root}/#{react_native_path}/scripts/generate-artifacts.js",
|
||||
"#{react_native_path}/scripts/generate-artifacts.js",
|
||||
"-p", "#{app_path}",
|
||||
"-o", Pod::Config.instance.installation_root,
|
||||
"-e", "#{fabric_enabled}",
|
||||
|
|
|
@ -15,8 +15,8 @@ target 'HelloWorld' do
|
|||
# to enable hermes on iOS, change `false` to `true` and then install pods
|
||||
:hermes_enabled => flags[:hermes_enabled],
|
||||
:fabric_enabled => flags[:fabric_enabled],
|
||||
# An absolute path to your application root.
|
||||
:app_path => "#{Pod::Config.instance.installation_root}/.."
|
||||
# An abosolute path to your application root.
|
||||
:app_path => "#{Dir.pwd}/.."
|
||||
)
|
||||
|
||||
target 'HelloWorldTests' do
|
||||
|
|
Загрузка…
Ссылка в новой задаче