emnapi 1.11.0 → 2.0.0-alpha.2

package/CMakeLists.txt

@@ -1,9 +1,10 @@
 cmake_minimum_required(VERSION 3.13)
 
-project(emnapi LANGUAGES C ASM)
+project(emnapi LANGUAGES C CXX ASM)
 
 option(EMNAPI_INSTALL_SRC "EMNAPI_INSTALL_SRC" OFF)
 option(EMNAPI_FIND_NODE_ADDON_API "EMNAPI_FIND_NODE_ADDON_API" OFF)
+option(EMNAPI_BUILD_BASIC_LIBS "EMNAPI_BUILD_BASIC_LIBS" OFF)
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
   set(IS_EMSCRIPTEN ON)
@@ -29,6 +30,27 @@ else()
   set(IS_WASM32_WASIP1_THREADS OFF)
 endif()
 
+set(V8_SRC
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/v8/array.cc"
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/v8/external.cc"
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/v8/exception.cc"
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/v8/date.cc"
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/v8/function.cc"
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/v8/handle_scope.cc"
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/v8/internal.cc"
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/v8/isolate.cc"
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/v8/json.cc"
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/v8/object.cc"
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/v8/string.cc"
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/v8/value.cc"
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/v8/boolean.cc"
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/v8/number.cc"
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/v8/template.cc"
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/v8/try_catch.cc"
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/v8/node.cc"
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/v8/script.cc"
+)
+
 set(UV_SRC
   "${CMAKE_CURRENT_SOURCE_DIR}/src/uv/uv-common.c"
   "${CMAKE_CURRENT_SOURCE_DIR}/src/uv/threadpool.c"
@@ -54,8 +76,10 @@ set(EMNAPI_SRC ${ENAPI_BASIC_SRC} ${EMNAPI_THREADS_SRC})
 
 set(EMNAPI_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/include/node")
 set(EMNAPI_DEFINES "BUILDING_NODE_EXTENSION")
+set(V8_DEFINES "V8_ENABLE_DIRECT_LOCAL")
 
 set(EMNAPI_JS_LIB "${CMAKE_CURRENT_SOURCE_DIR}/dist/library_napi.js")
+set(V8_JS_LIB "${CMAKE_CURRENT_SOURCE_DIR}/dist/library_v8.js")
 
 if(IS_EMSCRIPTEN)
   set(EMNAPI_MT_CFLAGS "-pthread" "-sWASM_WORKERS=1")
@@ -79,6 +103,8 @@ set(DLMALLOC_TARGET_NAME "dlmalloc")
 set(DLMALLOC_MT_TARGET_NAME "dlmalloc-mt")
 set(EMMALLOC_TARGET_NAME "emmalloc")
 set(EMMALLOC_MT_TARGET_NAME "emmalloc-mt")
+set(V8_TARGET_NAME "v8")
+set(V8_MT_TARGET_NAME "v8-mt")
 
 if(EMNAPI_FIND_NODE_ADDON_API)
   execute_process(
@@ -131,6 +157,22 @@ if(IS_WASM32)
   target_compile_definitions(${EMMALLOC_MT_TARGET_NAME} PRIVATE "PAGESIZE=65536" "__EMSCRIPTEN_SHARED_MEMORY__=1")
 endif()
 
+if(NOT IS_WASM32 AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/include/node/v8.h") 
+  set(EMNAPI_BUILD_V8 ON)
+else()
+  set(EMNAPI_BUILD_V8 OFF)
+endif()
+
+if(EMNAPI_BUILD_V8)
+  add_library(${V8_TARGET_NAME} STATIC ${V8_SRC})
+  target_include_directories(${V8_TARGET_NAME} PUBLIC ${EMNAPI_INCLUDE})
+  target_compile_definitions(${V8_TARGET_NAME} PUBLIC ${EMNAPI_DEFINES} ${V8_DEFINES})
+  if(IS_EMSCRIPTEN)
+    set_target_properties(${V8_TARGET_NAME} PROPERTIES INTERFACE_LINK_DEPENDS ${EMNAPI_JS_LIB})
+    target_link_options(${V8_TARGET_NAME} INTERFACE "--js-library=${EMNAPI_JS_LIB}" "--js-library=${V8_JS_LIB}")
+  endif()
+endif()
+
 if(NAPI_VERSION)
   add_compile_definitions("NAPI_VERSION=${NAPI_VERSION}")
 endif()
@@ -161,20 +203,22 @@ if(IS_EMSCRIPTEN)
   target_link_options(${EMNAPI_TARGET_NAME} INTERFACE "--js-library=${EMNAPI_JS_LIB}")
 endif()
 
-add_library(${EMNAPI_BASIC_TARGET_NAME} STATIC ${ENAPI_BASIC_SRC} ${UV_SRC})
-target_include_directories(${EMNAPI_BASIC_TARGET_NAME} PUBLIC ${EMNAPI_INCLUDE})
-target_compile_definitions(${EMNAPI_BASIC_TARGET_NAME}
-  PUBLIC ${EMNAPI_DEFINES}
-)
-if(IS_EMSCRIPTEN)
-  set_target_properties(${EMNAPI_BASIC_TARGET_NAME} PROPERTIES INTERFACE_LINK_DEPENDS ${EMNAPI_JS_LIB})
-  target_link_options(${EMNAPI_BASIC_TARGET_NAME} INTERFACE "--js-library=${EMNAPI_JS_LIB}")
-endif()
+if(EMNAPI_BUILD_BASIC_LIBS)
+  add_library(${EMNAPI_BASIC_TARGET_NAME} STATIC ${ENAPI_BASIC_SRC} ${UV_SRC})
+  target_include_directories(${EMNAPI_BASIC_TARGET_NAME} PUBLIC ${EMNAPI_INCLUDE})
+  target_compile_definitions(${EMNAPI_BASIC_TARGET_NAME}
+    PUBLIC ${EMNAPI_DEFINES}
+  )
+  if(IS_EMSCRIPTEN)
+    set_target_properties(${EMNAPI_BASIC_TARGET_NAME} PROPERTIES INTERFACE_LINK_DEPENDS ${EMNAPI_JS_LIB})
+    target_link_options(${EMNAPI_BASIC_TARGET_NAME} INTERFACE "--js-library=${EMNAPI_JS_LIB}")
+  endif()
 
-if(IS_WASM32 OR IS_WASM32_WASIP1 OR IS_WASM32_WASIP1_THREADS)
-  set(EMNAPI_BUILD_BASIC_MT ON)
-else()
-  set(EMNAPI_BUILD_BASIC_MT OFF)
+  if(IS_WASM32 OR IS_WASM32_WASIP1 OR IS_WASM32_WASIP1_THREADS)
+    set(EMNAPI_BUILD_BASIC_MT ON)
+  else()
+    set(EMNAPI_BUILD_BASIC_MT OFF)
+  endif()
 endif()
 
 if(IS_WASM32_WASIP1_THREADS)
@@ -190,34 +234,38 @@ if(EMNAPI_BUILD_FOR_NAPI_RS)
     PUBLIC ${EMNAPI_DEFINES} "NAPI_EXTERN=__attribute__((__import_module__(\"env\")))"
   )
 
-  add_library(${EMNAPI_BASIC_NAPI_RS_MT_TARGET_NAME} STATIC
-    ${ENAPI_BASIC_SRC}
-    ${UV_SRC}
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/thread/async_worker_create.c"
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/thread/async_worker_init.S"
-  )
-  target_include_directories(${EMNAPI_BASIC_NAPI_RS_MT_TARGET_NAME} PUBLIC ${EMNAPI_INCLUDE})
-  target_compile_definitions(${EMNAPI_BASIC_NAPI_RS_MT_TARGET_NAME}
-    PUBLIC ${EMNAPI_DEFINES} "NAPI_EXTERN=__attribute__((__import_module__(\"env\")))"
-  )
+  if(EMNAPI_BUILD_BASIC_LIBS)
+    add_library(${EMNAPI_BASIC_NAPI_RS_MT_TARGET_NAME} STATIC
+      ${ENAPI_BASIC_SRC}
+      ${UV_SRC}
+      "${CMAKE_CURRENT_SOURCE_DIR}/src/thread/async_worker_create.c"
+      "${CMAKE_CURRENT_SOURCE_DIR}/src/thread/async_worker_init.S"
+    )
+    target_include_directories(${EMNAPI_BASIC_NAPI_RS_MT_TARGET_NAME} PUBLIC ${EMNAPI_INCLUDE})
+    target_compile_definitions(${EMNAPI_BASIC_NAPI_RS_MT_TARGET_NAME}
+      PUBLIC ${EMNAPI_DEFINES} "NAPI_EXTERN=__attribute__((__import_module__(\"env\")))"
+    )
+  endif()
 endif()
 
-if(EMNAPI_BUILD_BASIC_MT)
-  add_library(${EMNAPI_BASIC_MT_TARGET_NAME} STATIC
-    ${ENAPI_BASIC_SRC}
-    ${UV_SRC}
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/thread/async_worker_create.c"
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/thread/async_worker_init.S"
-  )
-  target_compile_options(${EMNAPI_BASIC_MT_TARGET_NAME} PUBLIC "-matomics" "-mbulk-memory")
-  target_include_directories(${EMNAPI_BASIC_MT_TARGET_NAME} PUBLIC ${EMNAPI_INCLUDE})
-  target_compile_definitions(${EMNAPI_BASIC_MT_TARGET_NAME}
-    PUBLIC ${EMNAPI_DEFINES}
-  )
-
-  if(IS_EMSCRIPTEN)
-    set_target_properties(${EMNAPI_BASIC_MT_TARGET_NAME} PROPERTIES INTERFACE_LINK_DEPENDS ${EMNAPI_JS_LIB})
-    target_link_options(${EMNAPI_BASIC_MT_TARGET_NAME} INTERFACE "--js-library=${EMNAPI_JS_LIB}")
+if(EMNAPI_BUILD_BASIC_LIBS)
+  if(EMNAPI_BUILD_BASIC_MT)
+    add_library(${EMNAPI_BASIC_MT_TARGET_NAME} STATIC
+      ${ENAPI_BASIC_SRC}
+      ${UV_SRC}
+      "${CMAKE_CURRENT_SOURCE_DIR}/src/thread/async_worker_create.c"
+      "${CMAKE_CURRENT_SOURCE_DIR}/src/thread/async_worker_init.S"
+    )
+    target_compile_options(${EMNAPI_BASIC_MT_TARGET_NAME} PUBLIC "-matomics" "-mbulk-memory")
+    target_include_directories(${EMNAPI_BASIC_MT_TARGET_NAME} PUBLIC ${EMNAPI_INCLUDE})
+    target_compile_definitions(${EMNAPI_BASIC_MT_TARGET_NAME}
+      PUBLIC ${EMNAPI_DEFINES}
+    )
+
+    if(IS_EMSCRIPTEN)
+      set_target_properties(${EMNAPI_BASIC_MT_TARGET_NAME} PROPERTIES INTERFACE_LINK_DEPENDS ${EMNAPI_JS_LIB})
+      target_link_options(${EMNAPI_BASIC_MT_TARGET_NAME} INTERFACE "--js-library=${EMNAPI_JS_LIB}")
+    endif()
   endif()
 endif()
 
@@ -239,6 +287,20 @@ if(EMNAPI_BUILD_MT)
     set_target_properties(${EMNAPI_MT_TARGET_NAME} PROPERTIES INTERFACE_LINK_DEPENDS ${EMNAPI_JS_LIB})
     target_link_options(${EMNAPI_MT_TARGET_NAME} INTERFACE "--js-library=${EMNAPI_JS_LIB}")
   endif()
+
+  if(EMNAPI_BUILD_V8)
+    add_library(${V8_MT_TARGET_NAME} STATIC ${V8_SRC})
+    target_compile_options(${V8_MT_TARGET_NAME}
+      PUBLIC "-matomics" "-mbulk-memory"
+      PRIVATE ${EMNAPI_MT_CFLAGS}
+    )
+    target_include_directories(${V8_MT_TARGET_NAME} PUBLIC ${EMNAPI_INCLUDE})
+    target_compile_definitions(${V8_MT_TARGET_NAME} PUBLIC ${EMNAPI_DEFINES} ${V8_DEFINES})
+    if(IS_EMSCRIPTEN)
+      set_target_properties(${V8_MT_TARGET_NAME} PROPERTIES INTERFACE_LINK_DEPENDS ${EMNAPI_JS_LIB})
+      target_link_options(${V8_MT_TARGET_NAME} INTERFACE "--js-library=${EMNAPI_JS_LIB}" "--js-library=${V8_JS_LIB}")
+    endif()
+  endif()
 endif()
 
 if(IS_EMSCRIPTEN)
@@ -253,16 +315,29 @@ endif()
 # endif()
 if(LIB_ARCH)
   install(TARGETS ${EMNAPI_TARGET_NAME} DESTINATION "lib/${LIB_ARCH}")
-  install(TARGETS ${EMNAPI_BASIC_TARGET_NAME} DESTINATION "lib/${LIB_ARCH}")
+  # install(TARGETS ${EMNAPI_BASIC_TARGET_NAME} DESTINATION "lib/${LIB_ARCH}")
+  if(EMNAPI_BUILD_V8)
+    install(TARGETS ${V8_TARGET_NAME} DESTINATION "lib/${LIB_ARCH}")
+  endif()
   if(EMNAPI_BUILD_MT)
     install(TARGETS ${EMNAPI_MT_TARGET_NAME} DESTINATION "lib/${LIB_ARCH}")
+    if(EMNAPI_BUILD_V8)
+      install(TARGETS ${V8_MT_TARGET_NAME} DESTINATION "lib/${LIB_ARCH}")
+    endif()
   endif()
-  if(EMNAPI_BUILD_BASIC_MT)
-    install(TARGETS ${EMNAPI_BASIC_MT_TARGET_NAME} DESTINATION "lib/${LIB_ARCH}")
+
+  if(EMNAPI_BUILD_BASIC_LIBS)
+    install(TARGETS ${EMNAPI_BASIC_TARGET_NAME} DESTINATION "lib/${LIB_ARCH}")
+    if(EMNAPI_BUILD_BASIC_MT)
+      install(TARGETS ${EMNAPI_BASIC_MT_TARGET_NAME} DESTINATION "lib/${LIB_ARCH}")
+    endif()
   endif()
+
   if(EMNAPI_BUILD_FOR_NAPI_RS)
     install(TARGETS ${EMNAPI_NAPI_RS_MT_TARGET_NAME} DESTINATION "lib/${LIB_ARCH}")
-    install(TARGETS ${EMNAPI_BASIC_NAPI_RS_MT_TARGET_NAME} DESTINATION "lib/${LIB_ARCH}")
+    if(EMNAPI_BUILD_BASIC_LIBS)
+      install(TARGETS ${EMNAPI_BASIC_NAPI_RS_MT_TARGET_NAME} DESTINATION "lib/${LIB_ARCH}")
+    endif()
   endif()
   if(IS_WASM32)
     install(TARGETS ${DLMALLOC_TARGET_NAME} DESTINATION "lib/${LIB_ARCH}")
@@ -277,23 +352,15 @@ install(FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/emnapi.gyp
   DESTINATION ".")
 
-install(FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/node/emnapi_common.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/node/emnapi.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/node/js_native_api_types.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/node/js_native_api.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/node/node_api_types.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/node/node_api.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/node/uv.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/node/config.gypi
-  DESTINATION "include/node")
-
 install(DIRECTORY
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/node/uv
-  DESTINATION "include/node")
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/node
+  DESTINATION "include")
 
 install(FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/dist/library_napi.js
+    ${CMAKE_CURRENT_SOURCE_DIR}/dist/library_v8.js
+    ${CMAKE_CURRENT_SOURCE_DIR}/dist/library_async_work.js
+    ${CMAKE_CURRENT_SOURCE_DIR}/dist/library_threadsafe_function.js
   DESTINATION "dist")
 
 if(EMNAPI_INSTALL_SRC)
@@ -310,4 +377,7 @@ if(EMNAPI_INSTALL_SRC)
   install(DIRECTORY
     ${CMAKE_CURRENT_SOURCE_DIR}/src/thread
     DESTINATION "src")
+  install(DIRECTORY
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/v8
+    DESTINATION "src")
 endif()