koffi 2.12.1 → 2.12.3

package/src/cnoke/src/builder.js

@@ -1,7 +1,7 @@
-// Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+// Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the “Software”), to deal in 
+// this software and associated documentation files (the “Software”), to deal in
 // the Software without restriction, including without limitation the rights to use,
 // copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 // Software, and to permit persons to whom the Software is furnished to do so,
@@ -70,6 +70,7 @@ function Builder(config = {}) {
     let cache_dir = get_cache_directory();
     let build_dir = config.build_dir;
     let work_dir = null;
+    let output_dir = null;
 
     if (build_dir == null) {
         let options = read_cnoke_options();
@@ -81,7 +82,8 @@ function Builder(config = {}) {
         }
     }
     build_dir = build_dir.replace(/\\/g, '/');
-    work_dir = build_dir + `/v${runtime_version}_${arch}`;
+    work_dir = build_dir + `/v${runtime_version}_${arch}/${mode}`;
+    output_dir = work_dir + '/Output';
 
     let cmake_bin = null;
 
@@ -99,6 +101,7 @@ function Builder(config = {}) {
         // Prepare build directory
         fs.mkdirSync(build_dir, { recursive: true, mode: 0o755 });
         fs.mkdirSync(work_dir, { recursive: true, mode: 0o755 });
+        fs.mkdirSync(output_dir, { recursive: true, mode: 0o755 });
 
         retry &= fs.existsSync(work_dir + '/CMakeCache.txt');
 
@@ -212,7 +215,7 @@ function Builder(config = {}) {
         args.push(`-DCMAKE_BUILD_TYPE=${mode}`);
         for (let type of ['ARCHIVE', 'RUNTIME', 'LIBRARY']) {
             for (let suffix of ['', '_DEBUG', '_RELEASE', '_RELWITHDEBINFO'])
-                args.push(`-DCMAKE_${type}_OUTPUT_DIRECTORY${suffix}=${build_dir}`);
+                args.push(`-DCMAKE_${type}_OUTPUT_DIRECTORY${suffix}=${output_dir}`);
         }
         args.push('--no-warn-unused-cli');
 
@@ -261,6 +264,10 @@ function Builder(config = {}) {
         let proc = spawnSync(cmake_bin, args, { stdio: 'inherit' });
         if (proc.status !== 0)
             throw new Error('Failed to run build step');
+
+        console.log('>> Copy target files');
+
+        tools.sync_files(output_dir, build_dir);
     };
 
     async function check_prebuild() {
@@ -418,16 +425,6 @@ function Builder(config = {}) {
             }
         }
 
-        try {
-            let json = fs.readFileSync(project_dir + '/CNoke.json', { encoding: 'utf-8' });
-
-            cnoke = JSON.parse(json);
-            directory = project_dir;
-        } catch (err) {
-            if (err.code != 'ENOENT')
-                throw err;
-        }
-
         if (cnoke == null)
             cnoke = pkg?.cnoke ?? {};
 

package/src/cnoke/src/index.js

@@ -1,7 +1,7 @@
-// Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+// Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the “Software”), to deal in 
+// this software and associated documentation files (the “Software”), to deal in
 // the Software without restriction, including without limitation the rights to use,
 // copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 // Software, and to permit persons to whom the Software is furnished to do so,

package/src/cnoke/src/tools.js

@@ -1,7 +1,7 @@
-// Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+// Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the “Software”), to deal in 
+// this software and associated documentation files (the “Software”), to deal in
 // the Software without restriction, including without limitation the rights to use,
 // copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 // Software, and to permit persons to whom the Software is furnished to do so,
@@ -233,6 +233,37 @@ function is_path_separator(c) {
     return false;
 }
 
+function sync_files(src_dir, dest_dir) {
+    let keep = new Set;
+
+    // Copy source files
+    {
+        let entries = fs.readdirSync(src_dir, { withFileTypes: true });
+
+        for (let entry of entries) {
+            if (!entry.isFile())
+                continue;
+
+            keep.add(entry.name);
+            fs.copyFileSync(src_dir + `/${entry.name}`, dest_dir + `/${entry.name}`);
+        }
+    }
+
+    // Delete old destination files
+    {
+        let entries = fs.readdirSync(dest_dir, { withFileTypes: true });
+
+        for (let entry of entries) {
+            if (!entry.isFile())
+                continue;
+            if (keep.has(entry.name))
+                continue;
+
+            fs.unlinkSync(dest_dir + `/${entry.name}`);
+        }
+    }
+}
+
 function determine_arch() {
     let arch = process.arch;
 
@@ -390,6 +421,7 @@ module.exports = {
     extract_targz,
     path_is_absolute,
     path_has_dotdot,
+    sync_files,
     determine_arch,
     unlink_recursive,
     get_napi_version,