paths and assemble

Author: CedricGuillemet

.github/workflows/typescript.yml

@@ -21,16 +21,14 @@ jobs:
       - name: NPM Install (Binary Package)
         run: npm install
         working-directory: ./Package
-      - name: Build BabylonNative source tree
-        run: npx gulp buildBabylonNativeSourceTree
-        working-directory: ./Package
       - name: NPM Install (Modules)
-        run: npm install
+        run: |
+          export BABYLON_NO_CMAKE_POSTINSTALL=1
+          npm install
         working-directory: ./Modules/@babylonjs/react-native
       - name: NPM Install (Playground)
         run: npm install
         working-directory: ./Apps/Playground
-
       - name: Gulp
         run: npx gulp buildAssembled
         working-directory: ./Package

Modules/@babylonjs/react-native/postinstall.js

@@ -24,7 +24,6 @@ function iosCMake() {
     '-DFETCHCONTENT_SOURCE_DIR_IOS-CMAKE=./shared/BabylonNative/deps/ios-cmake-src'
   ], { stdio: 'inherit' });
 
-
   cmake.on('exit', code => {
     if (code !== 0) {
       console.error(`CMake exited with code ${code}`);
@@ -34,7 +33,10 @@ function iosCMake() {
 }
 
 function postInstall() {
-  if (os.platform() === "darwin") {
+  if (
+    os.platform() === "darwin" &&
+    process.env.BABYLON_NO_CMAKE_POSTINSTALL !== "1"
+  ) {
     iosCMake();
   }
 }

Modules/@babylonjs/react-native/react-native-babylon.podspec

@@ -6,7 +6,7 @@ package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
 podspec_dir = File.dirname(__FILE__)
 base_base_path = File.expand_path('../../../node_modules/@babylonjs/react-native/Build/iOS', podspec_dir)
-base_base_path_symlink = File.expand_path('../../../Modules/@babylonjs/react-native/Build/iOS', podspec_dir)
+base_base_path_symlink = File.expand_path('../../../../../Modules/@babylonjs/react-native/Build/iOS', podspec_dir)
 babylon_base_path = File.join(base_base_path, 'shared/BabylonNative/Repo')
 babylon_base_path_symlink = File.join(base_base_path_symlink, 'shared/BabylonNative/Repo')
 

Package/gulpfile.js

@@ -382,7 +382,7 @@ const buildBabylonNativeSourceTree = async () => {
 }
 
 const copyFiles = gulp.parallel(copyCommonFiles, copySharedFiles, copyIOSFiles, copyAndroidFiles, copyWindowsFiles);
-const buildAssembled = gulp.series(copyFiles, buildTypeScript, validateAssembled);
+const buildAssembled = gulp.series(buildBabylonNativeSourceTree, copyFiles, buildTypeScript, validateAssembled);
 const buildIOS = gulp.series(buildIphoneOS, buildIphoneSimulator);
 
 exports.buildAssembled = buildAssembled;