JSR Integration Take 2 (#1260)

- Disabling ARC by default here because of PG and bgfx calls
retain/release
- clean up PG gradle
- JSE names to be same as JSR
- update 2 VT PGs
- remove `npm i` for android ci
- removed `npm i` in readme
- replaced `target_link_to_dependencies` with `target_link_libraries`

95% same PR as #1238

---------

Co-authored-by: Gary Hsu <[email protected]>

Author: CedricGuillemet

.github/jobs/android.yml

@@ -19,11 +19,6 @@ jobs:
       parameters:
         vmImage: ${{ parameters.vmImage }}
 
-    - script: |
-        cd Apps/Playground/Android
-        npm install
-      displayName: 'Install JS engine NPMs'
-      
     - task: Gradle@2
       inputs:
           workingDirectory: 'Apps/Playground/Android'

.github/jobs/ios.yml

@@ -27,7 +27,7 @@ jobs:
     - script: |
         mkdir buildiOS
         cd buildiOS
-        cmake .. -G Xcode -DCMAKE_TOOLCHAIN_FILE=../Dependencies/ios-cmake/ios.toolchain.cmake -DPLATFORM=OS64COMBINED -DENABLE_ARC=0 -DDEPLOYMENT_TARGET=${{ parameters.deploymentTarget }} -DENABLE_GLSLANG_BINARIES=OFF -DSPIRV_CROSS_CLI=OFF -DCMAKE_UNITY_BUILD=${UNITY_BUILD}
+        cmake .. -G Xcode -D IOS=ON -D DEPLOYMENT_TARGET=${{ parameters.deploymentTarget }} -D CMAKE_UNITY_BUILD=${UNITY_BUILD}
       displayName: 'Generate iOS solution'
 
     - task: Xcode@5

.github/jobs/linux.yml

@@ -32,7 +32,7 @@ jobs:
     - script: |
         mkdir build
         cd build
-        cmake .. -GNinja -DJSCORE_LIBRARY=/usr/lib/x86_64-linux-gnu/libjavascriptcoregtk-4.0.so -DNAPI_JAVASCRIPT_ENGINE=${{ parameters.JSEngine }} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBGFX_CONFIG_DEBUG=ON -DCMAKE_UNITY_BUILD=${UNITY_BUILD}
+        cmake .. -G Ninja -D JAVASCRIPTCORE_LIBRARY=/usr/lib/x86_64-linux-gnu/libjavascriptcoregtk-4.0.so -D NAPI_JAVASCRIPT_ENGINE=${{ parameters.JSEngine }} -D CMAKE_BUILD_TYPE=RelWithDebInfo -D BGFX_CONFIG_DEBUG=ON -D CMAKE_UNITY_BUILD=${UNITY_BUILD}
         ninja
       displayName: 'Build X11'
     

.github/jobs/macos.yml

@@ -26,7 +26,7 @@ jobs:
     - script: |
         mkdir buildmacOS
         cd buildmacOS
-        cmake .. -GXcode -DCMAKE_UNITY_BUILD=${UNITY_BUILD}
+        cmake .. -G Xcode -D CMAKE_UNITY_BUILD=${UNITY_BUILD}
       displayName: 'Generate macOS solution'
 
     - task: Xcode@5

.github/jobs/uwp.yml

@@ -34,7 +34,7 @@ jobs:
     - script: |
         mkdir build${{ variables.solutionName }}
         cd build${{ variables.solutionName }}
-        cmake .. -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ${{ variables.jsEngineDefine }} -A ${{ parameters.platform }} -DCMAKE_UNITY_BUILD=${UNITY_BUILD}
+        cmake .. -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 ${{ variables.jsEngineDefine }} -A ${{ parameters.platform }} -D CMAKE_UNITY_BUILD=${UNITY_BUILD}
       displayName: 'Generate ${{ variables.solutionName }} solution'
   
     - task: VSBuild@1

.github/jobs/win32.yml

@@ -11,6 +11,7 @@ parameters:
   values:
   - direct
   - jsi
+  - V8
 - name: graphics_api
   type: string
   default: D3D11
@@ -24,7 +25,10 @@ jobs:
       ${{ if eq(parameters.napiType, 'jsi') }}:
         napiSuffix: '_JSI'
         jsEngineDefine: '-DNAPI_JAVASCRIPT_ENGINE=JSI'
-      ${{ if ne(parameters.napiType, 'jsi') }}:
+      ${{ elseif eq(parameters.napiType, 'V8') }}:
+        napiSuffix: '_V8'
+        jsEngineDefine: '-DNAPI_JAVASCRIPT_ENGINE=V8'
+      ${{ else }}:
         napiSuffix: ''
         jsEngineDefine: ''
       solutionName: 'Win32_${{ parameters.platform }}${{variables.napiSuffix}}'
@@ -37,7 +41,8 @@ jobs:
       - script: |
           mkdir build${{ variables.solutionName }}
           cd build${{ variables.solutionName }}
-          cmake -A ${{ parameters.platform }} ${{ variables.jsEngineDefine }} -DBGFX_CONFIG_DEBUG=ON -DGRAPHICS_API=${{ parameters.graphics_api }} -DCMAKE_UNITY_BUILD=${UNITY_BUILD} ..
+          # BGFX_CONFIG_MAX_FRAME_BUFFERS is set so enough Framebuffers are available before V8 starts disposing unused ones
+          cmake -A ${{ parameters.platform }} ${{ variables.jsEngineDefine }} -D BGFX_CONFIG_DEBUG=ON -D GRAPHICS_API=${{ parameters.graphics_api }} -D CMAKE_UNITY_BUILD=${UNITY_BUILD} -D BGFX_CONFIG_MAX_FRAME_BUFFERS=256 ..
         displayName: 'Generate ${{ variables.solutionName }} solution'
     
       - task: MSBuild@1
@@ -52,14 +57,19 @@ jobs:
           reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\Playground.exe" /v DumpType /t REG_DWORD /d 2
           reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\Playground.exe" /v DumpCount /t REG_DWORD /d 1
           reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\Playground.exe" /v DumpFolder /t REG_SZ /d "$(Build.ArtifactStagingDirectory)/Dumps"
+          reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\UnitTests.exe"
+          reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\UnitTests.exe" /v DumpType /t REG_DWORD /d 2
+          reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\UnitTests.exe" /v DumpCount /t REG_DWORD /d 1
+          reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\UnitTests.exe" /v DumpFolder /t REG_SZ /d "$(Build.ArtifactStagingDirectory)/Dumps"
+
         displayName: 'Enable Crash Dumps'
     
       - script: |
           cd build${{ variables.solutionName }}\Apps\Playground
           cd RelWithDebInfo
           Playground app:///Scripts/validation_native.js 
         displayName: 'Validation Tests'
-    
+
       - task: PublishBuildArtifacts@1
         inputs:
           artifactName: '${{ variables.solutionName }} - ${{ parameters.graphics_api }} Rendered Pictures'
@@ -82,16 +92,25 @@ jobs:
           cleanTargetFolder: false
         displayName: 'Stage test app exe/pdb for publishing'
         condition: failed()
+
+      - script: |
+          cd build${{ variables.solutionName }}\Apps\UnitTests
+          cd RelWithDebInfo
+          UnitTests
+        displayName: 'Unit Tests'
+
+      - task: CopyFiles@2
+        inputs:
+          sourceFolder: 'build${{ variables.solutionName }}/Apps/UnitTests/RelWithDebInfo'
+          contents: UnitTests.*
+          targetFolder: '$(Build.ArtifactStagingDirectory)/Dumps'
+          cleanTargetFolder: false
+        displayName: 'Stage test app exe/pdb for publishing'
+        condition: failed()
 
       - task: PublishBuildArtifacts@1
         inputs:
           artifactName: '${{ variables.solutionName }} - ${{ parameters.graphics_api }} Crash Dumps'
           pathtoPublish: '$(Build.ArtifactStagingDirectory)/Dumps'
         displayName: 'Publish Tests ${{ variables.solutionName }} Dumps'
-        condition: failed()
-
-      - script: |
-          cd build${{ variables.solutionName }}\Apps\UnitTests
-          cd RelWithDebInfo
-          UnitTests
-        displayName: 'Unit Tests'
+        condition: failed()

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "base-n"]
 	path = Dependencies/base-n
 	url = https://github.com/azawadzki/base-n
-[submodule "arcana.cpp"]
-	path = Dependencies/arcana.cpp
-	url = https://github.com/microsoft/arcana.cpp
 [submodule "glslang"]
 	path = Dependencies/glslang
 	url = https://github.com/KhronosGroup/glslang
@@ -13,9 +10,6 @@
 [submodule "bgfx.cmake"]
 	path = Dependencies/bgfx.cmake
 	url = https://github.com/BabylonJS/bgfx.cmake
-[submodule "Dependencies/ios-cmake"]
-	path = Dependencies/ios-cmake
-	url = https://github.com/leetal/ios-cmake.git
 [submodule "Dependencies/xr/Dependencies/OpenXR-SDK"]
 	path = Dependencies/xr/Dependencies/OpenXR-SDK
 	url = https://github.com/KhronosGroup/OpenXR-SDK

Apps/Playground/Android/app/CMakeLists.txt

@@ -23,14 +23,6 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
 set(BABYLON_NATIVE_PLATFORM "Android")
 set(CMAKE_CXX_STANDARD 17)
 
-if (${ANDROID_JSENGINE_LIBNAME} STREQUAL "jsc")
-    set(NAPI_JAVASCRIPT_ENGINE "JavaScriptCore" CACHE STRING "JavaScript engine for N-API.")
-elseif (${ANDROID_JSENGINE_LIBNAME} STREQUAL "v8android")
-    set(NAPI_JAVASCRIPT_ENGINE "V8" CACHE STRING "JavaScript engine for N-API.")
-else()
-    message(FATAL_ERROR "Unrecognized JS engine: ${ANDROID_JSENGINE_LIBNAME}")
-endif()
-
 add_library(javascript_engine SHARED IMPORTED GLOBAL)
 set_target_properties(javascript_engine PROPERTIES IMPORTED_LOCATION "${ANDROID_JSENGINE_LIBPATH}/${ANDROID_ABI}/lib${ANDROID_JSENGINE_LIBNAME}.so")
 target_include_directories(javascript_engine INTERFACE "${ANDROID_JSENGINE_INCPATH}")
@@ -56,7 +48,6 @@ target_link_libraries(BabylonNativeJNI
     AppRuntime
     Canvas
     Console
-    ChromeDevTools
     GraphicsDevice
     NativeCamera
     NativeEngine

Apps/Playground/Android/app/build.gradle

@@ -1,21 +1,8 @@
 apply plugin: 'com.android.application'
 
-// When no project property is set for Gradle ('-PJSEngine=')
-// default JS engine is set to v8android
-// JSEngine property can be:
-// - jsc for JavaScriptCore
-// - v8android for V8
-
-def jsEngineBaseDir = "${buildDir}/JS"
-def jsEngineIncDir = "${jsEngineBaseDir}/include/V8"
-def jsEngineLibDir = "${rootDir}/app/src/main/jniLibs"
-
-def jsEngineLibName = "v8android"
-if (project.hasProperty("JSEngine")) {
-    jsEngineLibName = project.property("JSEngine")
-    if ("${jsEngineLibName}" == "jsc" ) {
-        jsEngineIncDir = "${jsEngineBaseDir}/include"
-    }
+def jsEngine = "V8"
+if (project.hasProperty("jsEngine")) {
+    jsEngine = project.property("jsEngine")
 }
 
 def graphics_api = "OpenGL"
@@ -36,12 +23,12 @@ def arcore_libpath = "${buildDir}/arcore-native"
 configurations { natives }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         applicationId "com.android.babylonnative.playground"
         minSdkVersion "${platformVersion}"
-        targetSdkVersion 28
+        targetSdkVersion 29
         ndkVersion "23.1.7779620"
         if (project.hasProperty("NDK_VERSION")) {
             def NDKVersion = project.property("NDK_VERSION")
@@ -54,9 +41,8 @@ android {
                     "-DENABLE_PCH=OFF",
                     "-DGRAPHICS_API=${graphics_api}",
                     "-DARCORE_LIBPATH=${arcore_libpath}/jni",
-                    "-DANDROID_JSENGINE_LIBPATH=${jsEngineLibDir}",
-                    "-DANDROID_JSENGINE_LIBNAME=${jsEngineLibName}",
-                    "-DANDROID_JSENGINE_INCPATH=${jsEngineIncDir}",
+                    "-DNAPI_JAVASCRIPT_ENGINE=${jsEngine}",
+                    "-DJSRUNTIMEHOST_CORE_APPRUNTIME_V8_INSPECTOR=ON"
                     "-DCMAKE_UNITY_BUILD=${unity_build}"
             }
         }
@@ -162,78 +148,5 @@ task copyFiles {
     }
 }
 
-repositories {
-    mavenLocal()
-    maven {
-        // Android JSC is installed from npm
-        url "$rootDir/../../node_modules/jsc-android/dist"
-    }
-    maven {
-        // Android V8 is installed from npm
-        url "$rootDir/../../node_modules/v8-android/dist"
-    }
-    google()
-    jcenter()
-}
-
-configurations 
-{ 
-    jscAndroid
-    v8Android 
-}
-
-dependencies {
-    jscAndroid 'org.webkit:android-jsc:+'
-    v8Android 'org.chromium:v8-android:+'
-}
-
-// Extracts the shared libraries from aars in the natives configuration.
-// This is done so that NDK builds can access these libraries.
-task extractJSEngineLibraries() {
-    // Always extract, this insures the native libs are updated if the version changes.
-    outputs.upToDateWhen { false }
-    def jsconfig
-    if ("${jsEngineLibName}" == "jsc" ) {
-        jsconfig = configurations.jscAndroid
-    } else {
-        jsconfig = configurations.v8Android
-    }
-    doFirst {
-        jsconfig.files.each { f ->
-            copy {
-                from zipTree(f)
-                into jsEngineLibDir
-                include "jni/**/*"
-                // remove 'jni/'
-                eachFile { fcd ->
-                    fcd.relativePath = new RelativePath(true, fcd.relativePath.segments.drop(1))  
-                }
-                includeEmptyDirs = false
-            }
-        }
-    }
-}
-
-tasks.whenTaskAdded { task ->
-    if (task.name.contains("external") && !task.name.contains("Clean")) {
-        task.dependsOn(extractJSEngineLibraries)
-    }
-}
-
-task copyFilesJSHeaders {
-    copy
-    {
-        from "${rootDir}/../../node_modules/jsc-android/dist/include"
-        include "*"
-        into "${jsEngineBaseDir}/include/JavaScriptCore"
-    }
-    copy
-    {
-        from "${rootDir}/../../node_modules/v8-android/dist/include"
-        include "**/*"
-        into "${jsEngineIncDir}"
-    }
-}
-
 preBuild.dependsOn(copyFiles)
-preBuild.dependsOn(copyFilesJSHeaders)
+

Apps/Playground/Android/app/src/main/cpp/BabylonNativeJNI.cpp

@@ -18,7 +18,6 @@
 #include <Babylon/Plugins/NativeXr.h>
 #include <Babylon/Plugins/NativeCamera.h>
 #include <Babylon/Plugins/NativeOptimizations.h>
-#include <Babylon/Plugins/ChromeDevTools.h>
 #include <Babylon/Polyfills/Console.h>
 #include <Babylon/Polyfills/Window.h>
 #include <Babylon/Polyfills/XMLHttpRequest.h>
@@ -29,7 +28,6 @@ namespace
     std::optional<Babylon::Graphics::Device> device{};
     std::optional<Babylon::Graphics::DeviceUpdate> deviceUpdate{};
     std::optional<Babylon::AppRuntime> runtime{};
-    std::optional<Babylon::Plugins::ChromeDevTools> chromeDevTools{};
     std::optional<Babylon::Plugins::NativeXr> nativeXr{};
     Babylon::Plugins::NativeInput* nativeInput{};
     std::optional<Babylon::Polyfills::Canvas> nativeCanvas{};
@@ -58,7 +56,6 @@ extern "C"
         scriptLoader.reset();
 
         nativeInput = {};
-        chromeDevTools.reset();
         nativeXr.reset();
         scriptLoader.reset();
         runtime.reset();
@@ -126,12 +123,6 @@ extern "C"
 
                 Babylon::Polyfills::XMLHttpRequest::Initialize(env);
                 nativeCanvas.emplace(Babylon::Polyfills::Canvas::Initialize(env));
-
-                chromeDevTools.emplace(Babylon::Plugins::ChromeDevTools::Initialize(env));
-                if (chromeDevTools->SupportsInspector())
-                {
-                    chromeDevTools->StartInspector(5643, "BabylonNative Playground");
-                }
             });
 
             scriptLoader.emplace(*runtime);