koffi 2.1.3 → 2.1.4

package/package.json

@@ -1,69 +1,45 @@
 {
-  "name": "koffi",
-  "version": "2.1.3",
-  "stable": "2.1.3",
-  "description": "Fast and simple C FFI (foreign function interface) for Node.js",
-  "keywords": [
-    "foreign",
-    "function",
-    "interface",
-    "ffi",
-    "binding",
-    "c",
-    "napi"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Koromix/luigi.git"
-  },
-  "homepage": "https://koffi.dev/",
-  "author": "Niels Martignène <niels.martignene@protonmail.com>",
-  "main": "src/index.js",
-  "scripts": {
-    "install": "cnoke --prebuild",
-    "test": "node qemu/qemu.js test",
-    "prepublishOnly": "node qemu/qemu.js pack"
-  },
-  "license": "AGPL-3.0",
-  "dependencies": {
-    "cnoke": "^3.2.0"
-  },
-  "devDependencies": {
-    "chalk": "^4.1.2",
-    "ffi-napi": "^4.0.3",
-    "minimatch": "^5.0.1",
-    "node-ssh": "^12.0.3",
-    "raylib": "^0.9.2",
-    "ref-napi": "^3.0.3",
-    "ref-struct-di": "^1.1.1",
-    "tar": "^6.1.11"
-  },
-  "cnoke": {
-    "prebuild": "build/qemu/{{version}}/koffi_{{platform}}_{{arch}}.tar.gz",
-    "require": "./build/koffi.node",
-    "napi": 8
-  },
-  "files": [
-    "src",
-    "doc",
-    "benchmark/CMakeLists.txt",
-    "benchmark/atoi_*",
-    "benchmark/raylib_*",
-    "qemu/qemu.js",
-    "qemu/registry",
-    "test/async.js",
-    "test/callbacks.js",
-    "test/CMakeLists.txt",
-    "test/misc.c",
-    "test/misc.def",
-    "test/raylib.js",
-    "test/sqlite.js",
-    "test/sync.js",
-    "vendor",
-    "LICENSE.txt",
-    "README.md",
-    "ChangeLog.md",
-    "CMakeLists.txt",
-    "build/qemu/*/*.tar.gz"
-  ]
-}
+    "name": "koffi",
+    "version": "2.1.4",
+    "stable": "2.1.4",
+    "description": "Fast and simple C FFI (foreign function interface) for Node.js",
+    "keywords": [
+        "foreign",
+        "function",
+        "interface",
+        "ffi",
+        "binding",
+        "c",
+        "napi"
+    ],
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/Koromix/rygel.git"
+    },
+    "homepage": "https://koffi.dev/",
+    "author": "Niels Martignène <niels.martignene@protonmail.com>",
+    "main": "src/koffi/src/index.js",
+    "scripts": {
+        "install": "cnoke --prebuild -d src/koffi",
+        "test": "node src/koffi/qemu/qemu.js test"
+    },
+    "license": "AGPL-3.0",
+    "dependencies": {
+        "cnoke": "^3.2.1"
+    },
+    "devDependencies": {
+        "chalk": "^4.1.2",
+        "ffi-napi": "^4.0.3",
+        "minimatch": "^5.0.1",
+        "node-ssh": "^12.0.3",
+        "raylib": "^0.9.2",
+        "ref-napi": "^3.0.3",
+        "ref-struct-di": "^1.1.1",
+        "tar": "^6.1.11"
+    },
+    "cnoke": {
+        "prebuild": "src/koffi/build/{{version}}/koffi_{{platform}}_{{arch}}.tar.gz",
+        "require": "./src/koffi/build/koffi.node",
+        "napi": 8
+    }
+}

package/src/cnoke/README.md

@@ -0,0 +1,97 @@
+# Table of contents
+
+- [Introduction](#introduction)
+- [Get started](#get-started)
+- [Command usage](#command-usage)
+
+# Introduction
+
+CNoke is a simpler alternative to CMake.js, without any dependency, designed to build
+native Node addons based on CMake.
+
+Install it like this:
+
+```sh
+npm install cnoke
+```
+
+It obviously requires [CMake](http://www.cmake.org/download/) and a proper C/C++ toolchain:
+
+* Windows: Visual C++ Build Tools or a recent version of Visual C++ will do (the free Community version works well)
+* POSIX (Linux, macOS, etc.): Clang or GCC, and Make (Ninja is preferred if available)
+
+# Get started
+
+In order to build a native Node.js addon with CNoke, you can use the following CMakeLists.txt
+template to get started:
+
+```cmake
+cmake_minimum_required(VERSION 3.11)
+project(hello C CXX)
+
+find_package(CNoke)
+
+add_node_addon(NAME hello SOURCES hello.cc)
+```
+
+You can also do it manually (without the module) if you prefer:
+
+```cmake
+cmake_minimum_required(VERSION 3.11)
+project(hello C CXX)
+
+add_library(hello SHARED hello.cc ${NODE_JS_SOURCES})
+set_target_properties(hello PROPERTIES PREFIX "" SUFFIX ".node")
+target_include_directories(hello PRIVATE ${NODE_JS_INCLUDE_DIRS})
+target_link_libraries(hello PRIVATE ${NODE_JS_LIBRARIES})
+target_compile_options(hello PRIVATE ${NODE_JS_COMPILE_FLAGS})
+target_link_options(hello PRIVATE ${NODE_JS_LINK_FLAGS})
+```
+
+In order for this to run when `npm install` runs (directly or when someone else installs
+your dependency), add the following script to package.json:
+
+```json
+"scripts": {
+    "install": "cnoke"
+}
+```
+
+# Command usage
+
+You can find the same help text by running `cnoke --help`:
+
+```
+Usage: cnoke [command] [options...] [targets...]
+
+Commands:
+    configure                            Configure CMake build
+    build                                Build project (configure if needed)
+    clean                                Clean build files
+
+Options:
+    -d, --directory <DIR>                Change project directory
+                                         (default: current working directory)
+
+    -B, --config <CONFIG>                Change build type: RelWithDebInfo, Debug, Release
+                                         (default: RelWithDebInfo)
+    -D, --debug                          Shortcut for --config Debug
+
+        --prebuild <URL>                 Set URL template to download prebuilt binaries
+        --require <PATH>                 Require specified module, drop prebuild if it fails
+
+    -a, --arch <ARCH>                    Change architecture and ABI
+                                         (default: x64)
+    -v, --runtime-version <VERSION>      Change node version
+                                         (default: v16.14.0)
+    -t, --toolset <TOOLSET>              Change default CMake toolset
+    -C, --prefer-clang                   Use Clang instead of default CMake compiler
+
+        --verbose                        Show build commands while building
+```
+
+The ARCH value is similar to process.arch, with the following differences:
+
+- arm is changed to arm32hf or arm32sf depending on the floating-point ABI used (hard-float, soft-float)
+- riscv32 is changed to riscv32sf, riscv32hf32, riscv32hf64 or riscv32hf128 depending on the floating-point ABI
+- riscv64 is changed to riscv64sf, riscv64hf32, riscv64hf64 or riscv64hf128 depending on the floating-point ABI

package/src/cnoke/assets/FindCNoke.cmake

@@ -0,0 +1,71 @@
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see https://www.gnu.org/licenses/.
+
+if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo" OR
+   CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
+    set(USE_UNITY_BUILDS ON CACHE BOOL "Use single-TU builds (aka. Unity builds)")
+else()
+    set(USE_UNITY_BUILDS OFF CACHE BOOL "Use single-TU builds (aka. Unity builds)")
+endif()
+
+function(add_node_addon)
+    cmake_parse_arguments(ARG "" "NAME" "SOURCES" ${ARGN})
+
+    add_library(${ARG_NAME} SHARED ${ARG_SOURCES} ${NODE_JS_SOURCES})
+    set_target_properties(${ARG_NAME} PROPERTIES PREFIX "" SUFFIX ".node")
+    target_include_directories(${ARG_NAME} PRIVATE ${NODE_JS_INCLUDE_DIRS})
+    target_link_libraries(${ARG_NAME} PRIVATE ${NODE_JS_LIBRARIES})
+    target_compile_options(${ARG_NAME} PRIVATE ${NODE_JS_COMPILE_FLAGS})
+    if (NODE_JS_LINK_FLAGS)
+        target_link_options(${ARG_NAME} PRIVATE ${NODE_JS_LINK_FLAGS})
+    endif()
+endfunction()
+
+if(USE_UNITY_BUILDS)
+    function(enable_unity_build TARGET)
+        get_target_property(sources ${TARGET} SOURCES)
+        string(GENEX_STRIP "${sources}" sources)
+
+        set(unity_file_c "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_unity.c")
+        set(unity_file_cpp "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_unity.cpp")
+        file(REMOVE ${unity_file_c} ${unity_file_cpp})
+
+        foreach(src ${sources})
+            get_source_file_property(language ${src} LANGUAGE)
+            if(IS_ABSOLUTE ${src})
+                set(src_full ${src})
+            else()
+                set(src_full "${CMAKE_CURRENT_SOURCE_DIR}/${src}")
+            endif()
+            if(language STREQUAL "C")
+                set_source_files_properties(${src} PROPERTIES HEADER_FILE_ONLY 1)
+                file(APPEND ${unity_file_c} "#include \"${src_full}\"\n")
+            elseif(language STREQUAL "CXX")
+                set_source_files_properties(${src} PROPERTIES HEADER_FILE_ONLY 1)
+                file(APPEND ${unity_file_cpp} "#include \"${src_full}\"\n")
+            endif()
+        endforeach()
+
+        if(EXISTS ${unity_file_c})
+            target_sources(${TARGET} PRIVATE ${unity_file_c})
+        endif()
+        if(EXISTS ${unity_file_cpp})
+            target_sources(${TARGET} PRIVATE ${unity_file_cpp})
+        endif()
+
+        target_compile_definitions(${TARGET} PRIVATE -DUNITY_BUILD=1)
+    endfunction()
+else()
+    function(enable_unity_build TARGET)
+    endfunction()
+endif()

package/src/cnoke/assets/win_delay_hook.c

@@ -0,0 +1,34 @@
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see https://www.gnu.org/licenses/.
+
+#include <stdlib.h>
+#ifndef NOMINMAX
+    #define NOMINMAX
+#endif
+#ifndef WIN32_LEAN_AND_MEAN
+    #define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#include <delayimp.h>
+
+static FARPROC WINAPI self_exe_hook(unsigned int event, DelayLoadInfo *info)
+{
+    if (event == dliNotePreLoadLibrary && !stricmp(info->szDll, "node.exe")) {
+        HMODULE h = GetModuleHandle(NULL);
+        return (FARPROC)h;
+    }
+
+    return NULL;
+}
+
+const PfnDliHook __pfnDliNotifyHook2 = self_exe_hook;