Skip to content

Commit 88155fd

Browse files
cipolleschifacebook-github-bot
authored andcommitted
Avoid generating <appname>, folders when running pod install (facebook#50100)
Summary: Pull Request resolved: facebook#50100 While moving the generation of `ReactCodegen.podspec` from Cocoapods to Codegen, we wrongly copied some parts of the script and now it is generating folders with a `,` as a suffix. This change fixes the problem and prevent the generation of such folders. ## Changelog: [Internal] - Avoid generating `ios,` folders Reviewed By: fabriziocucci Differential Revision: D71395049 fbshipit-source-id: 1e6024af6e24834a682865792e64d056fb94e027
1 parent a00963d commit 88155fd

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

packages/react-native/scripts/codegen/__tests__/__snapshots__/generate-artifacts-executor-test.js.snap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -434,9 +434,9 @@ RCT_SCRIPT_POD_INSTALLATION_ROOT=$(pwd)
434434
popd >/dev/null
435435
436436
export RCT_SCRIPT_RN_DIR=\\"$RCT_SCRIPT_POD_INSTALLATION_ROOT/../../../../..\\"
437-
export RCT_SCRIPT_APP_PATH=\\"$RCT_SCRIPT_POD_INSTALLATION_ROOT/..\\",
438-
export RCT_SCRIPT_OUTPUT_DIR=\\"$RCT_SCRIPT_POD_INSTALLATION_ROOT\\",
439-
export RCT_SCRIPT_TYPE=\\"withCodegenDiscovery\\",
437+
export RCT_SCRIPT_APP_PATH=\\"$RCT_SCRIPT_POD_INSTALLATION_ROOT/..\\"
438+
export RCT_SCRIPT_OUTPUT_DIR=\\"$RCT_SCRIPT_POD_INSTALLATION_ROOT\\"
439+
export RCT_SCRIPT_TYPE=\\"withCodegenDiscovery\\"
440440
441441
SCRIPT_PHASES_SCRIPT=\\"$RCT_SCRIPT_RN_DIR/scripts/react_native_pods_utils/script_phases.sh\\"
442442
WITH_ENVIRONMENT=\\"$RCT_SCRIPT_RN_DIR/scripts/xcode/with-environment.sh\\"

packages/react-native/scripts/codegen/generate-artifacts-executor/generateReactCodegenPodspec.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ RCT_SCRIPT_POD_INSTALLATION_ROOT=$(pwd)
7878
popd >/dev/null
7979
8080
export RCT_SCRIPT_RN_DIR="$RCT_SCRIPT_POD_INSTALLATION_ROOT/${path.relative(outputPath, REACT_NATIVE_PACKAGE_ROOT_FOLDER)}"
81-
export RCT_SCRIPT_APP_PATH="$RCT_SCRIPT_POD_INSTALLATION_ROOT/${relativeAppPath.length === 0 ? '.' : relativeAppPath}",
82-
export RCT_SCRIPT_OUTPUT_DIR="$RCT_SCRIPT_POD_INSTALLATION_ROOT",
83-
export RCT_SCRIPT_TYPE="withCodegenDiscovery",
81+
export RCT_SCRIPT_APP_PATH="$RCT_SCRIPT_POD_INSTALLATION_ROOT/${relativeAppPath.length === 0 ? '.' : relativeAppPath}"
82+
export RCT_SCRIPT_OUTPUT_DIR="$RCT_SCRIPT_POD_INSTALLATION_ROOT"
83+
export RCT_SCRIPT_TYPE="withCodegenDiscovery"
8484
8585
SCRIPT_PHASES_SCRIPT="$RCT_SCRIPT_RN_DIR/scripts/react_native_pods_utils/script_phases.sh"
8686
WITH_ENVIRONMENT="$RCT_SCRIPT_RN_DIR/scripts/xcode/with-environment.sh"

0 commit comments

Comments
 (0)