Skip to content

Commit

Permalink
update to match what's going on in latest commits
Browse files Browse the repository at this point in the history
  • Loading branch information
kelset committed Nov 2, 2022
1 parent 34c9a3c commit f4d70e9
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
12 changes: 9 additions & 3 deletions scripts/release-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,21 +98,26 @@ function publishAndroidArtifactsToMaven(releaseVersion, isNightly) {

function generateiOSArtifacts(
jsiFolder,
hermesUtilsFolder,
hermesEngineFolder,
hermesCoreSourceFolder,
buildType,
releaseVersion,
targetFolder,
) {
pushd(`${hermesCoreSourceFolder}`);

//Need to generate hermesc
exec(
`${hermesUtilsFolder}/utils/build-hermesc-xcode.sh ${hermesEngineFolder}/build_host_hermesc`,
);

//Generating iOS Artifacts
exec(
`JSI_PATH=${jsiFolder} BUILD_TYPE=${buildType} ${hermesUtilsFolder}/build-mac-framework.sh`,
`JSI_PATH=${jsiFolder} BUILD_TYPE=${buildType} ${hermesEngineFolder}/utils/build-mac-framework.sh`,
);

exec(
`JSI_PATH=${jsiFolder} BUILD_TYPE=${buildType} ${hermesUtilsFolder}/build-ios-framework.sh`,
`JSI_PATH=${jsiFolder} BUILD_TYPE=${buildType} ${hermesEngineFolder}/utils/build-ios-framework.sh`,
);

popd();
Expand All @@ -122,6 +127,7 @@ function generateiOSArtifacts(
buildType,
releaseVersion,
targetFolder,
true, // this is excludeDebugSymbols, we keep it as the default
);

return tarballOutputPath;
Expand Down
4 changes: 2 additions & 2 deletions scripts/test-e2e-local.js
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ if (argv.target === 'RNTester') {
// Setting up generating native iOS (will be done later)
const repoRoot = pwd();
const jsiFolder = `${repoRoot}/ReactCommon/jsi`;
const hermesUtilsFolder = `${repoRoot}/sdks/hermes-engine/utils`;
const hermesEngineFolder = `${repoRoot}/sdks/hermes-engine`;
const hermesCoreSourceFolder = `${repoRoot}/sdks/hermes`;

if (!fs.existsSync(hermesCoreSourceFolder)) {
Expand All @@ -191,7 +191,7 @@ if (argv.target === 'RNTester') {
// Generate native files for iOS
const tarballOutputPath = generateiOSArtifacts(
jsiFolder,
hermesUtilsFolder,
hermesEngineFolder,
hermesCoreSourceFolder,
buildType,
releaseVersion,
Expand Down

0 comments on commit f4d70e9

Please sign in to comment.