fix: Add support for JSI_PATH env var

facebook · Sep 23, 2022 · 39f4cba · 39f4cba
1 parent f0cca8a
commit 39f4cba
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 51 deletions.
diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock
@@ -73,6 +73,7 @@ PODS:
     - FlipperKit/FlipperKitNetworkPlugin
   - fmt (6.2.1)
   - glog (0.3.5)
+  - hermes-engine (1000.0.0)
   - libevent (2.1.12)
   - OpenSSL-Universal (1.1.1100)
   - RCT-Folly (2021.07.22.00):
@@ -91,6 +92,12 @@ PODS:
     - DoubleConversion
     - fmt (~> 6.2.1)
     - glog
+  - RCT-Folly/Futures (2021.07.22.00):
+    - boost
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - libevent
   - RCTRequired (1000.0.0)
   - RCTTypeSafety (1000.0.0):
     - FBLazyVector (= 1000.0.0)
@@ -590,6 +597,17 @@ PODS:
   - React-graphics (1000.0.0):
     - RCT-Folly/Fabric (= 2021.07.22.00)
     - React-Core/Default (= 1000.0.0)
+  - React-hermes (1000.0.0):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2021.07.22.00)
+    - RCT-Folly/Futures (= 2021.07.22.00)
+    - React-cxxreact (= 1000.0.0)
+    - React-jsi (= 1000.0.0)
+    - React-jsiexecutor (= 1000.0.0)
+    - React-jsinspector (= 1000.0.0)
+    - React-perflogger (= 1000.0.0)
   - React-jsi (1000.0.0):
     - boost (= 1.76.0)
     - DoubleConversion
@@ -753,6 +771,8 @@ DEPENDENCIES:
   - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.125.0)
   - FlipperKit/SKIOSNetworkPlugin (= 0.125.0)
   - glog (from `../../third-party-podspecs/glog.podspec`)
+  - hermes-engine (from `../../sdks/hermes/hermes-engine.podspec`)
+  - libevent (~> 2.1.12)
   - OpenSSL-Universal (= 1.1.1100)
   - RCT-Folly (from `../../third-party-podspecs/RCT-Folly.podspec`)
   - RCT-Folly/Fabric (from `../../third-party-podspecs/RCT-Folly.podspec`)
@@ -769,6 +789,7 @@ DEPENDENCIES:
   - React-cxxreact (from `../../ReactCommon/cxxreact`)
   - React-Fabric (from `../../ReactCommon`)
   - React-graphics (from `../../ReactCommon/react/renderer/graphics`)
+  - React-hermes (from `../../ReactCommon/hermes`)
   - React-jsi (from `../../ReactCommon/jsi`)
   - React-jsi/Fabric (from `../../ReactCommon/jsi`)
   - React-jsiexecutor (from `../../ReactCommon/jsiexecutor`)
@@ -824,6 +845,8 @@ EXTERNAL SOURCES:
     :path: "../../React/FBReactNativeSpec"
   glog:
     :podspec: "../../third-party-podspecs/glog.podspec"
+  hermes-engine:
+    :podspec: "../../sdks/hermes/hermes-engine.podspec"
   RCT-Folly:
     :podspec: "../../third-party-podspecs/RCT-Folly.podspec"
   RCTRequired:
@@ -848,6 +871,8 @@ EXTERNAL SOURCES:
     :path: "../../ReactCommon"
   React-graphics:
     :path: "../../ReactCommon/react/renderer/graphics"
+  React-hermes:
+    :path: "../../ReactCommon/hermes"
   React-jsi:
     :path: "../../ReactCommon/jsi"
   React-jsiexecutor:
@@ -899,8 +924,8 @@ SPEC CHECKSUMS:
   boost: a7c83b31436843459a1961bfd74b96033dc77234
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
-  FBLazyVector: 19e408e76fa9258dd32191a50d60c41444f52d29
-  FBReactNativeSpec: 27a89a8eea1b441a73a78f420dd18dad3ed13723
+  FBLazyVector: 272ddfb4d13fc8e0d398a893f57f294ad1c3cf15
+  FBReactNativeSpec: c4fce7e52645d8090e2cfc280e2b8bcdeef3a519
   Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0
   Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
   Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30
@@ -912,44 +937,46 @@ SPEC CHECKSUMS:
   FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
+  hermes-engine: a5e08ce16a59bb9fb4f909d354f6ec88ba3d8207
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
   RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda
-  RCTRequired: 1c8808cf84569265784a6c33984bbb506ada8c6e
-  RCTTypeSafety: b6dcb5036a808864ee8cad66ca15f263c24661cc
-  React: 8d809d414723bb5763093ddec7658066a21ccabc
-  React-bridging: c8806159f8ef90f27443857eed1efdb8c85940e1
-  React-callinvoker: 5f16202ad4e45f0607b1fae0f6955a8f7c87eef1
+  RCTRequired: 143356458eace901dc74a5dce46aa41ab0bde705
+  RCTTypeSafety: 7a9fd3f362fa0bd9b7cfe9e3d5ed3a72b5380ef2
+  React: 4d270acbf71a31ace1385742cd93b19576eb90c4
+  React-bridging: 1bd1aec167aee61f70dffd78c771532c3355ee3b
+  React-callinvoker: 2e4ba5ffac0dbfbe12138fe1a7c9eff1d103b8e4
   React-Codegen: 5adf19af97eb37a7d441c040521191e446255086
-  React-Core: ce4282fb714ffbe444b84d296d1728eaee4d0e9f
-  React-CoreModules: 675170bccf156da3a3348e04e2036ce401b2010d
-  React-cxxreact: 7276467c246302fedf598cc40d7003896ddb20ba
-  React-Fabric: b49c8e76c926b5b6b708802759b27dd6e02bb4bc
-  React-graphics: 5ccc9cc0d91794fd42bc1c693e9aea207554bbef
-  React-jsi: a042596cb558abea721ab5e23cb175647610a73d
-  React-jsiexecutor: f7fbac5dff7e7ff110a66edf2626b4f4f4600ef5
-  React-jsinspector: 7733dd522d044aef87caa39f3eda77593358a7eb
-  React-logger: c7960346b021767ed90971aff592a44e3d69f8bb
-  React-perflogger: c4fdd48988c2d3047186fc1bc1772d634cfca2ea
-  React-RCTActionSheet: 166fd1df85ac10219466b45d12a5884d3eaceac1
-  React-RCTAnimation: d6127046c6bb44bd3e67b7503c4ad7f91131b58e
-  React-RCTAppDelegate: 475ca9b80e26c1c4aed93ce04363092fa78cf788
-  React-RCTBlob: 68675c89ebe6edf310dddd0774ba07b685f090a9
-  React-RCTFabric: a98a6effece6719669b8c6b4d2c33fb0edddc613
-  React-RCTImage: 6de9f0f4402af859849e97cc73a56a52f400f4c9
-  React-RCTLinking: 21bb4675c3ec8fe704672ea511e817aeb3bf8370
-  React-RCTNetwork: a865deadacbf6b3d863f0496e7d2c2e81c269317
-  React-RCTPushNotification: 7f678a88147254ede5d21a1e1e71e8a964dd0051
-  React-RCTSettings: 23ce1aa52ddf5db44c973bb5cc93713e871e09b6
-  React-RCTTest: 06c388632dc7b30df17af01c8f9e89e641b4d31c
-  React-RCTText: a861fbf2835299d3cc4189697cddd8bd8602afb9
-  React-RCTVibration: 0386f50996a153b3f39cecbe7d139763ac9a9fdf
-  React-rncore: 665c70690f404bbfa3948148de72689672a906d2
-  React-runtimeexecutor: 97dca9247f4d3cfe0733384b189c6930fbd402b7
-  ReactCommon: 8e39c4b24da570ea2b631accbf779b5891befe0c
+  React-Core: 83106caeeb71ec5dab58e02b2fd222c225238d9b
+  React-CoreModules: 657938666eb5960fcc2c81efee7a1a3013d869dc
+  React-cxxreact: bd4efccb971f18e762d4b6399d2b1cc128a17bb5
+  React-Fabric: b274b30928cacbc23d35e635b4d5e4e0694f694c
+  React-graphics: d2f3cdd5de7dbdb26051a77f7afee20220e17f24
+  React-hermes: ee9c18026e7c8337148502b6f3e1d4221f16082a
+  React-jsi: 26ff4a419a45aa1851e5bbc8feefa1273f26a962
+  React-jsiexecutor: 48d059880af9582ba4ef65587426e820f3b59257
+  React-jsinspector: fa896ec3fc2b329c1524bb4ce2af916f056bf7c4
+  React-logger: 44fb9caebcd1b352b45bd34aba474a163c4a75fa
+  React-perflogger: 33c2f958870bad6b897f0adbae0ee951bf1e6a72
+  React-RCTActionSheet: d3779dbae6cc7908129fd6bbd840b385d415a70d
+  React-RCTAnimation: a3c8fc5b5a7ae54ae60aac8728d80c8f48cc26b0
+  React-RCTAppDelegate: ef4146008756feebffbffc9ae1fa6954137feca9
+  React-RCTBlob: a9992483db5121cdd5df1508cbd3b5a6ca251f22
+  React-RCTFabric: 34aeb67a3a6fd17d9376de9f2dc450faf86f97b4
+  React-RCTImage: 481f5e17614604964bcdd58088172709707da00c
+  React-RCTLinking: f4b75ca4ed2ac3d54a7e7a92f07f930d9ca1f84d
+  React-RCTNetwork: 2813e57e790d37901f1a73835e0a9252650c0af6
+  React-RCTPushNotification: e7b2a0affd93010786f0c050f701795805500fad
+  React-RCTSettings: 8b6dae1514b281909d8bef0babf90c412389dfd7
+  React-RCTTest: 30d1c74d15cf6a292bbbe60dce801c85aa388658
+  React-RCTText: 2a82145f3979b52498c27bcb02b8a3fb08ff0707
+  React-RCTVibration: 092553864e4ea59800de12c58855c8e520db808a
+  React-rncore: 37c27c9f3f6805a1570804b565f49cd0d4825ef9
+  React-runtimeexecutor: 2bd630b287a07096714feddb849656d55473def4
+  ReactCommon: 477edccffebdce936173a5bc0ec728c39494feee
   ScreenshotManager: 3fc534a218e7b8dde632158411d0f15b0ca8893c
   SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
-  Yoga: 1b1a12ff3d86a10565ea7cbe057d42f5e5fb2a07
+  Yoga: 900dac8720abf015d8f8b7f10a8b27d76f582649
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
 PODFILE CHECKSUM: e86c02825ce4e267e6fb3975bae791feb32a94a0

diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj
@@ -911,7 +911,7 @@
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -996,7 +996,7 @@
 				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;

diff --git a/sdks/hermes-engine/hermes-engine.podspec b/sdks/hermes-engine/hermes-engine.podspec
@@ -65,23 +65,21 @@ Pod::Spec.new do |spec|
   if source[:git] then
     hermes_utils_path = "#{react_native_path}/sdks/hermes-engine/utils"
     spec.prepare_command = <<-EOS
-      # When true, debug build will be used.
-      # See `build-apple-framework.sh` for details
+    export BUILD_TYPE=#{ENV['PRODUCTION'] == '1' ? 'Release' : 'Debug'}
+    export RELEASE_VERSION="#{version}"
+    export IOS_DEPLOYMENT_TARGET="#{spec.deployment_target('ios')}"
+    export MAC_DEPLOYMENT_TARGET="#{spec.deployment_target('osx')}"
+    export JSI_PATH="#{react_native_path}/ReactCommon/jsi"
 
-      export BUILD_TYPE=#{get_hermes_build_type.to_s.capitalize}
-      export RELEASE_VERSION="#{version}"
-      export IOS_DEPLOYMENT_TARGET="#{spec.deployment_target('ios')}"
-      export MAC_DEPLOYMENT_TARGET="#{spec.deployment_target('osx')}"
+    # Set HERMES_OVERRIDE_HERMESC_PATH if pre-built HermesC is available
+    #{File.exist?(import_hermesc_file) ? "export HERMES_OVERRIDE_HERMESC_PATH=#{import_hermesc_file}" : ""}
+    #{File.exist?(import_hermesc_file) ? "echo \"Overriding HermesC path...\"" : ""}
 
-      # Set HERMES_OVERRIDE_HERMESC_PATH if pre-built HermesC is available
-      #{File.exist?(import_hermesc_file) ? "export HERMES_OVERRIDE_HERMESC_PATH=#{import_hermesc_file}" : ""}
-      #{File.exist?(import_hermesc_file) ? "echo \"Overriding HermesC path...\"" : ""}
+    # Build iOS framework
+    #{hermes_utils_path}/build-ios-framework.sh
 
-      # Build iOS framework
-      #{hermes_utils_path}/build-ios-framework.sh
-
-      # Build Mac framework
-      #{hermes_utils_path}/build-mac-framework.sh
+    # Build Mac framework
+    #{hermes_utils_path}/build-mac-framework.sh
     EOS
   end
 end
diff --git a/sdks/hermes-engine/utils/build-apple-framework.sh b/sdks/hermes-engine/utils/build-apple-framework.sh
@@ -7,7 +7,9 @@
 NUM_CORES=$(sysctl -n hw.ncpu)
 IMPORT_HERMESC_PATH=${HERMES_OVERRIDE_HERMESC_PATH:-$PWD/build_host_hermesc/ImportHermesc.cmake}
 REACT_NATIVE_PATH=${REACT_NATIVE_PATH:-$PWD/../..}
-JSI_PATH="$REACT_NATIVE_PATH/ReactCommon/jsi"
+if [[ -z JSI_PATH ]]; then
+  JSI_PATH="$REACT_NATIVE_PATH/ReactCommon/jsi"
+fi
 
 function use_env_var_or_ruby_prop {
   if [[ -n "$1" ]]; then