koffi 2.3.6-beta.2 → 2.3.6-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "koffi",
-    "version": "2.3.6-beta.2",
+    "version": "2.3.6-beta.4",
     "stable": "2.3.5",
     "description": "Fast and simple C FFI (foreign function interface) for Node.js",
     "keywords": [

package/src/cnoke/src/builder.js

@@ -63,7 +63,7 @@ function Builder(config = {}) {
             build_dir = expand_path(pkg.cnoke.output);
 
             if (!tools.path_is_absolute(build_dir))
-                build_dir = path.join(project_dir, build_dir);
+                build_dir = path.join(package_dir, build_dir);
         } else {
             build_dir = project_dir + '/build';
         }
@@ -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();
 
@@ -295,7 +298,7 @@ function Builder(config = {}) {
             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);
             }
@@ -303,7 +306,7 @@ function Builder(config = {}) {
             console.error('Failed to load prebuilt binary, rebuilding from source');
         }
 
-        return true;
+        return false;
     }
 
     this.clean = function() {