Skip to content

Set hermes release version #1791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
coado wants to merge 1 commit into
base: static_h
Choose a base branch
from
+58 −2
Open

Set hermes release version #1791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ endif()
# - npm/package.json
# - hermes-engine.podspec
project(Hermes
VERSION 0.12.0
VERSION 1.0.0
LANGUAGES C CXX)

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/")
Expand Down
33 changes: 33 additions & 0 deletions ...rc/main/kotlin/com/facebook/hermes/helpers/internal/SerializeHermesCompilerPackageJson.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

package com.facebook.hermes.helpers.internal

import groovy.json.JsonSlurper
import java.io.File
import org.gradle.api.Project

data class PackageJson(val version: String)

class SerializeHermesCompilerPackageJson(project: Project) {
private val serializedPackageJson = run {
val packageJsonFile = File(project.rootDir.parentFile, "npm/hermes-compiler/package.json")
if (!packageJsonFile.exists()) {
throw IllegalStateException("package.json file not found at $packageJsonFile")
}

val jsonSlurper = JsonSlurper().parseText(packageJsonFile.readText()) as Map<String, Any>
val version =
jsonSlurper["version"] as? String
?: throw IllegalStateException(
"Expected version to be a string in package.json, but got ${jsonSlurper["version"]}"
)
PackageJson(version)
}

val hermesReleaseVersion = serializedPackageJson.version
}
5 changes: 4 additions & 1 deletion android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* LICENSE file in the root directory of this source tree.
*/

import com.facebook.hermes.helpers.internal.SerializeHermesCompilerPackageJson
import com.facebook.hermes.tasks.internal.CustomExecTask
import org.apache.tools.ant.taskdefs.condition.Os

Expand All @@ -21,6 +22,8 @@ group = "com.facebook.hermes"

version = project.findProperty("VERSION_NAME")?.toString()!!

val hermesReleaseVersion = SerializeHermesCompilerPackageJson(project).hermesReleaseVersion

val cmakeVersion = System.getenv("CMAKE_VERSION") ?: libs.versions.cmake.get()
val cmakePath = "${getSDKPath()}/cmake/$cmakeVersion"
val cmakeBinaryPath = "${cmakePath}/bin/cmake"
Expand Down Expand Up @@ -222,7 +225,7 @@ android {
"-DIMPORT_HOST_COMPILERS=${File(hermesBuildDir, "ImportHostCompilers.cmake").toString()}",
"-DJSI_DIR=${jsiDir}",
"-DHERMES_BUILD_SHARED_JSI=True",
// "-DHERMES_RELEASE_VERSION=for RN ${version}",
"-DHERMES_RELEASE_VERSION=${hermesReleaseVersion}",
"-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=True",
// We intentionally build Hermes with Intl support only. This is to simplify
// the build setup and to avoid overcomplicating the build-type matrix.
Expand Down
20 changes: 20 additions & 0 deletions utils/build-apple-framework-rn.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ IMPORT_HERMESC_PATH=${HERMES_OVERRIDE_HERMESC_PATH:-$PWD/build_host_hermesc/Impo
BUILD_TYPE=${BUILD_TYPE:-Debug}

HERMES_PATH="$CURR_SCRIPT_DIR/.."
HERMES_COMPILER_PACKAGE_PATH="$HERMES_PATH/npm/hermes-compiler"

NUM_CORES=$(sysctl -n hw.ncpu)

Expand Down Expand Up @@ -43,6 +44,24 @@ function get_mac_deployment_target {
use_env_var "${MAC_DEPLOYMENT_TARGET}" "MAC_DEPLOYMENT_TARGET"
}

function get_release_version {
local package_json_path="$HERMES_COMPILER_PACKAGE_PATH/package.json"
if [[ -f "$package_json_path" ]]; then
local version
version=$(node -e "console.log(JSON.parse(require('fs').readFileSync('$package_json_path', 'utf8')).version)" 2>/dev/null)
if [[ -n "$version" ]]; then
echo "$version"
return
else
echo >&2 "Error: Failed to read version from $package_json_path"
exit 1
fi
else
echo >&2 "Error: Package file not found at $package_json_path"
exit 1
fi
}

# Build host hermes compiler for internal bytecode
function build_host_hermesc {
echo "Building hermesc"
Expand Down Expand Up @@ -98,6 +117,7 @@ function configure_apple_framework {
-DCMAKE_C_FLAGS:STRING="-gdwarf" \
-DIMPORT_HOST_COMPILERS:PATH="$IMPORT_HERMESC_PATH" \
-DJSI_DIR="$JSI_PATH" \
-DHERMES_RELEASE_VERSION="$(get_release_version)" \
-DCMAKE_BUILD_TYPE="$cmake_build_type" \
$boost_context_flag
popd > /dev/null || exit 1
Expand Down
Loading