Skip to content

Commit

Permalink
Remove rename
Browse files Browse the repository at this point in the history
  • Loading branch information
piaskowyk committed Nov 26, 2024
1 parent 3bb06e1 commit 4e53b78
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
8 changes: 4 additions & 4 deletions hermes-engine.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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" }

Expand Down
1 change: 0 additions & 1 deletion lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions utils/build-apple-framework.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion utils/build-mac-framework.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 4e53b78

Please sign in to comment.