koffi 2.3.6-beta.1 → 2.3.6-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "koffi",
-    "version": "2.3.6-beta.1",
+    "version": "2.3.6-beta.3",
     "stable": "2.3.5",
     "description": "Fast and simple C FFI (foreign function interface) for Node.js",
     "keywords": [
@@ -27,6 +27,6 @@
     "cnoke": {
         "napi": 8,
         "require": "./src/koffi/build/{{version}}/koffi_{{platform}}_{{arch}}/koffi.node",
-        "output": "./build/{{version}}/koffi_{{platform}}_{{arch}}"
+        "output": "src/koffi/build/{{version}}/koffi_{{platform}}_{{arch}}"
     }
 }

package/src/cnoke/src/builder.js

@@ -211,8 +211,11 @@ function Builder(config = {}) {
     this.build = async function() {
         check_compatibility();
 
-        if (prebuild)
-            await check_prebuild();
+        if (prebuild) {
+            let valid = await check_prebuild();
+            if (valid)
+                return;
+        }
 
         check_cmake();
 
@@ -270,13 +273,11 @@ function Builder(config = {}) {
                     archive_filename = build_dir + '/' + basename;
                     await tools.download_http(url, archive_filename);
                 } else {
-                    if (tools.path_is_absolute(url)) {
-                        archive_filename = url;
-                    } else if (package_dir != null) {
-                        archive_filename = package_dir + '/' + url;
-                    } else {
-                        archive_filename = project_dir + '/' + url;
-                    }
+                    archive_filename = url;
+
+                    if (!tools.path_is_absolute(archive_filename))
+                        archive_filename = path.join(package_dir, archive_filename);
+
                     if (!fs.existsSync(archive_filename))
                         throw new Error('Cannot find local prebuilt archive');
                 }
@@ -291,10 +292,13 @@ function Builder(config = {}) {
         if (pkg.cnoke.require != null) {
             let binary_filename = expand_path(pkg.cnoke.require);
 
+            if (!tools.path_is_absolute(binary_filename))
+                binary_filename = path.join(package_dir, binary_filename);
+
             if (fs.existsSync(binary_filename)) {
                 let proc = spawnSync(process.execPath, ['-e', 'require(process.argv[1])', binary_filename]);
                 if (proc.status === 0)
-                    return false;
+                    return true;
 
                 fs.unlinkSync(binary_filename);
             }
@@ -302,7 +306,7 @@ function Builder(config = {}) {
             console.error('Failed to load prebuilt binary, rebuilding from source');
         }
 
-        return true;
+        return false;
     }
 
     this.clean = function() {