Updated opencvBuild import

Author: Simon Hofmann

lib/commons.js

@@ -1,25 +1,32 @@
-const fs = require('fs');
-const path = require('path');
+const path = require("path");
 
 function resolvePath(filePath, file) {
   if (!filePath) {
     return undefined;
   }
-  return (file ? path.resolve(filePath, file) : path.resolve(filePath)).replace(/\\/g, '/');
+  return (file ? path.resolve(filePath, file) : path.resolve(filePath)).replace(
+    /\\/g,
+    "/"
+  );
 }
 
-const defaultDir = '/usr/local';
+const defaultDir = "/usr/local";
 
 function getLibDir() {
-  const libPath = resolvePath(process.env.OPENCV_LIB_DIR)
-  if (process.platform === 'win32' && !libPath) {
-    throw new Error('OPENCV_LIB_DIR is not defined')
+  const libPath = resolvePath(process.env.OPENCV_LIB_DIR);
+  if (process.platform === "win32" && !libPath) {
+    throw new Error("OPENCV_LIB_DIR is not defined");
   }
   return libPath || `${defaultDir}/lib`;
 }
 
+function linkSystemLibs() {
+  return !!process.env.OPENCV_LINK_SYSTEM_LIBS;
+}
+
 module.exports = {
   resolvePath,
   defaultDir,
-  getLibDir
+  getLibDir,
+  linkSystemLibs
 };

lib/cv.js

@@ -1,9 +1,9 @@
 const path = require('path');
-const opencvBuild = require('opencv-build');
-const { resolvePath } = require('./commons');
+const opencvBuild = require(`@nut-tree/opencv-build-${process.platform}`);
+const { resolvePath, linkSystemLibs } = require('./commons');
 
 // ensure binaries are added to path on windows
-if (opencvBuild.isAutoBuildEnabled() && process.platform === 'win32') {
+if (!linkSystemLibs() && process.platform === 'win32') {
   // append opencv binary path to node process
   if (!process.env.path.includes(opencvBuild.opencvBinDir)) {
     process.env.path = `${process.env.path};${opencvBuild.opencvBinDir};`

lib/defines.js

@@ -1,7 +1,7 @@
-const opencvBuild = require('opencv-build');
-const { getLibDir } = require('./commons');
+const opencvBuild = require(`@nut-tree/opencv-build-${process.platform}`);
+const { getLibDir, linkSystemLibs } = require('./commons');
 
-if (!opencvBuild.isAutoBuildEnabled()) {
+if (linkSystemLibs()) {
   opencvBuild.getLibs(getLibDir())
     .filter(lib => lib.libPath)
     .map(lib => lib.opencvModule)

lib/includes.js

@@ -1,7 +1,7 @@
-const opencvBuild = require('opencv-build');
-const { resolvePath, defaultDir } = require('./commons');
+const opencvBuild = require(`@nut-tree/opencv-build-${process.platform}`);
+const { resolvePath, defaultDir, linkSystemLibs } = require('./commons');
 
-if (opencvBuild.isAutoBuildEnabled()) {
+if (linkSystemLibs()) {
   console.log(resolvePath(process.env.OPENCV_INCLUDE_DIR) || `${defaultDir}/include`);
   return;
 }

lib/libs.js

@@ -1,5 +1,5 @@
-const opencvBuild = require('opencv-build');
-const { resolvePath, getLibDir } = require('./commons');
+const opencvBuild = require(`@nut-tree/opencv-build-${process.platform}`);
+const { resolvePath, getLibDir, linkSystemLibs } = require('./commons');
 
 function linkLibs(libs) {
   libs
@@ -8,7 +8,7 @@ function linkLibs(libs) {
     .forEach(libPath => console.log(resolvePath(libPath)));
 }
 
-if (!opencvBuild.isAutoBuildEnabled()) {
+if (linkSystemLibs()) {
   linkLibs(opencvBuild.getLibs(getLibDir()));
   return;
 }
@@ -21,5 +21,5 @@ if (process.platform === 'win32') {
 
 // if not windows, link libs dynamically
 console.log('-L' + resolvePath(opencvBuild.opencvLibDir));
-opencvBuild.opencvModules.forEach(lib => console.log('-lopencv_' + lib));
+opencvBuild.opencvModules.forEach(lib => console.log(`-lopencv_${lib}`));
 console.log('-Wl,-rpath,' + resolvePath(opencvBuild.opencvLibDir));