Fix Apple build script

Summary:
1. Fix errors in build-apple-framework.sh due to changes in SH build.
2. Update build-ios-framework.sh to take an optional argument to build
for a single platform instead of all supported ones.
3. Rename hermes.framework to hermesvm.framework in rest relevant
files.

Reviewed By: tsaichien

Differential Revision: D83033266

fbshipit-source-id: faed578e5c5e41cb2d00cc3a57f0dc4ee2ddd855

Author: lavenzg

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" }
 

utils/build-apple-framework.sh

@@ -47,15 +47,15 @@ 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 -S . -B build_host_hermesc -DCMAKE_BUILD_TYPE="$BUILD_TYPE"
+  cmake --build ./build_host_hermesc --target hermesc shermes
 }
 
 # Utility function to configure an Apple framework
 function configure_apple_framework {
   local build_cli_tools
 
-  if [[ $1 == macosx ]]; then
+  if [[ $1 == iphonesimulator || $1 == macosx ]]; then
     build_cli_tools="true"
   else
     build_cli_tools="false"
@@ -70,11 +70,15 @@ function configure_apple_framework {
     -DHERMES_ENABLE_LIBFUZZER:BOOLEAN=false \
     -DHERMES_ENABLE_FUZZILLI:BOOLEAN=false \
     -DHERMES_ENABLE_TEST_SUITE:BOOLEAN=false \
+    -DHERMES_ENABLE_BITCODE:BOOLEAN=false \
     -DHERMES_BUILD_APPLE_FRAMEWORK:BOOLEAN=true \
     -DCMAKE_CXX_FLAGS="-gdwarf" \
     -DCMAKE_C_FLAGS="-gdwarf" \
     -DHERMES_ENABLE_TOOLS:BOOLEAN="$build_cli_tools" \
-    -DIMPORT_HERMESC:PATH="$PWD/build_host_hermesc/ImportHermesc.cmake" \
+    -DLLVM_ENABLE_TERMINFO=OFF \
+    -DLIBREADLINE_FOUND=OFF \
+    -DLIBTINFO_FOUND=OFF \
+    -DIMPORT_HOST_COMPILERS:PATH="$PWD/build_host_hermesc/ImportHostCompilers.cmake" \
     -DCMAKE_INSTALL_PREFIX:PATH=../destroot \
     -DCMAKE_BUILD_TYPE="$BUILD_TYPE"
 }
@@ -84,16 +88,20 @@ function build_apple_framework {
   echo "Building framework for $1 with architectures: $2"
 
   build_host_hermesc
-  [ ! -f "$PWD/build_host_hermesc/ImportHermesc.cmake" ] &&
+  [ ! -f "$PWD/build_host_hermesc/ImportHostCompilers.cmake" ] &&
   echo "Host hermesc is required to build apple frameworks!"
 
   configure_apple_framework "$1" "$2" "$3"
 
   if [[ "$BUILD_SYSTEM" == "Ninja" ]]; then
-    (cd "./build_$1" && ninja install/strip)
+    ninja -C "./build_$1" install/strip
   else
-    (cd "./build_$1" && make install/strip)
+    make -C "./build_$1" install/strip
   fi
+
+  # Copy the built binary to destroot so universal framework can be created later.
+  mkdir -p "destroot/Library/Frameworks/$1"
+  cp -R "./build_$1"/lib/hermesvm.framework* "destroot/Library/Frameworks/$1"
 }
 
 # Accepts an array of frameworks and will place all of
@@ -108,11 +116,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"

utils/build-ios-framework.sh

@@ -6,11 +6,12 @@
 
 . ./utils/build-apple-framework.sh
 
-if [ ! -d destroot/Library/Frameworks/universal/hermes.xcframework ]; then
-    ios_deployment_target=$(get_ios_deployment_target)
-    visionos_deployment_target=$(get_visionos_deployment_target)
-    tvos_deployment_target=$(get_tvos_deployment_target)
+ios_deployment_target=$(get_ios_deployment_target)
+visionos_deployment_target=$(get_visionos_deployment_target)
+tvos_deployment_target=$(get_tvos_deployment_target)
 
+function build_all {
+  if [ ! -d destroot/Library/Frameworks/universal/hermesvm.xcframework ]; then
     build_apple_framework "iphoneos" "arm64" "$ios_deployment_target"
     build_apple_framework "iphonesimulator" "x86_64;arm64" "$ios_deployment_target"
     build_apple_framework "catalyst" "x86_64;arm64" "$ios_deployment_target"
@@ -20,6 +21,20 @@ if [ ! -d destroot/Library/Frameworks/universal/hermes.xcframework ]; then
     build_apple_framework "appletvsimulator" "x86_64;arm64" "$tvos_deployment_target"
 
     create_universal_framework "iphoneos" "iphonesimulator" "catalyst" "xros" "xrsimulator" "appletvos" "appletvsimulator"
-else
+  else
     echo "Skipping; Clean \"destroot\" to rebuild".
+  fi
+}
+
+if [[ $1 == "iphoneos" ]]; then
+  build_apple_framework "iphoneos" "arm64" "$ios_deployment_target"
+elif [[ $1 == "iphonesimulator" ]]; then
+  build_apple_framework "iphonesimulator" "x86_64;arm64" "$ios_deployment_target"
+elif [[ $1 == "appletvos" ]]; then
+  build_apple_framework "appletvos" "arm64" "$tvos_deployment_target"
+elif [[ $1 == "appletvsimulator" ]]; then
+  build_apple_framework "appletvsimulator" "x86_64;arm64" "$tvos_deployment_target"
+else
+  echo "Build for all supported platforms and create universal framework."
+  build_all
 fi

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"