diff --git a/hermes-engine.podspec b/hermes-engine.podspec index 50c3a903cbc..16804b0b731 100644 --- a/hermes-engine.podspec +++ b/hermes-engine.podspec @@ -30,10 +30,10 @@ Pod::Spec.new do |spec| spec.source_files = "destroot/include/**/*.h" spec.header_mappings_dir = "destroot/include" - spec.ios.vendored_frameworks = "destroot/Library/Frameworks/universal/hermes.xcframework" - spec.visionos.vendored_frameworks = "destroot/Library/Frameworks/universal/hermes.xcframework" - spec.tvos.vendored_frameworks = "destroot/Library/Frameworks/universal/hermes.xcframework" - spec.osx.vendored_frameworks = "destroot/Library/Frameworks/macosx/hermes.framework" + spec.ios.vendored_frameworks = "destroot/Library/Frameworks/universal/hermesvm.xcframework" + spec.visionos.vendored_frameworks = "destroot/Library/Frameworks/universal/hermesvm.xcframework" + spec.tvos.vendored_frameworks = "destroot/Library/Frameworks/universal/hermesvm.xcframework" + spec.osx.vendored_frameworks = "destroot/Library/Frameworks/macosx/hermesvm.framework" spec.xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", "CLANG_CXX_LIBRARY" => "compiler-default", "GCC_PREPROCESSOR_DEFINITIONS" => "HERMES_ENABLE_DEBUGGER=1" } diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index c28d30378f5..692abf77771 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -170,7 +170,6 @@ add_library(hermesvmlean SHARED dummy.cpp) # Do not build a framework for the test suite. if(HERMES_BUILD_APPLE_FRAMEWORK) if(APPLE) - set_target_properties(hermesvm PROPERTIES OUTPUT_NAME hermes) set_target_properties(hermesvm PROPERTIES FRAMEWORK TRUE diff --git a/utils/build-apple-framework.sh b/utils/build-apple-framework.sh index 707007c4f8a..104019f8977 100755 --- a/utils/build-apple-framework.sh +++ b/utils/build-apple-framework.sh @@ -48,7 +48,7 @@ function get_mac_deployment_target { # Build host hermes compiler for internal bytecode function build_host_hermesc { cmake -S . -B build_host_hermesc - cmake --build ./build_host_hermesc --target hermesc + cmake --build ./build_host_hermesc } # Utility function to configure an Apple framework @@ -117,11 +117,11 @@ function create_universal_framework { echo "Creating universal framework for platforms: ${platforms[*]}" for i in "${!platforms[@]}"; do - args+="-framework ${platforms[$i]}/hermes.framework " + args+="-framework ${platforms[$i]}/hermesvm.framework " done mkdir universal - xcodebuild -create-xcframework $args -output "universal/hermes.xcframework" + xcodebuild -create-xcframework $args -output "universal/hermesvm.xcframework" for platform in $@; do rm -r "$platform" diff --git a/utils/build-mac-framework.sh b/utils/build-mac-framework.sh index 79040c2d0ba..98eb983fb1a 100755 --- a/utils/build-mac-framework.sh +++ b/utils/build-mac-framework.sh @@ -5,7 +5,7 @@ # LICENSE file in the root directory of this source tree. . ./utils/build-apple-framework.sh -if [ ! -d destroot/Library/Frameworks/macosx/hermes.framework ]; then +if [ ! -d destroot/Library/Frameworks/macosx/hermesvm.framework ]; then mac_deployment_target=$(get_mac_deployment_target) build_apple_framework "macosx" "x86_64;arm64" "$mac_deployment_target"