Partial prebuild

Author: Simon Hofmann

appveyor.yml

@@ -68,5 +68,5 @@ test_script:
 on_success:
   - cmd: cd c:\projects\opencv4nodejs
   - IF defined APPVEYOR_REPO_TAG_NAME (
-    npm run prebuild -- --include-regex "\.(node|a|so|dylib|lib|dll)$" -u %GITHUB_TOKEN%
+    npm run prebuild -- -u %GITHUB_TOKEN%
     )

binding.gyp

@@ -79,15 +79,6 @@
 				"cflags": ["--coverage"],
 				"ldflags": ["--coverage"]
 			},
-    }
-	},
-	{
-		"target_name": "action_after_build",
-      	"type": "none",
-      	"dependencies": [ "opencv4nodejs" ],
-      	"copies": [{
-          "files": [ "<!@(node ./lib/bundle.js)" ],
-          "destination": "<(PRODUCT_DIR)"
-        }]
+		}
 	}]
 }

ci/prebuild/prebuild.sh

@@ -4,4 +4,4 @@ npm install --unsafe-perm &&\
 cd test
 npm install && npm test
 cd -
-npm run prebuild -- --include-regex "\.(node|a|so|dylib|lib|dll)$" -u $GITHUB_TOKEN;
+npm run prebuild -- -u $GITHUB_TOKEN;

lib/bundle.js

@@ -1,4 +1,4 @@
-const { opencvInclude } = require("./dirs");
+const opencvBuild = require(`@nut-tree/opencv-build-${process.platform}`);
 const { resolvePath, defaultDir, linkSystemLibs } = require('./commons');
 
 if (linkSystemLibs()) {
@@ -7,4 +7,4 @@ if (linkSystemLibs()) {
 }
 
 // set include dir from auto build
-console.log(resolvePath(opencvInclude));
+console.log(resolvePath(opencvBuild.opencvInclude));

lib/dirs.js

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

lib/includes.js

@@ -1,6 +1,6 @@
 {
   "name": "opencv4nodejs-prebuilt",
-  "version": "4.15.0-slim",
+  "version": "4.15.0",
   "description": "This is a fork of opencv4nodejs which provides pre-built binaries",
   "keywords": [
     "opencv",
@@ -34,7 +34,7 @@
   "typings": "./lib/index.d.ts",
   "scripts": {
     "preinstall": "node ./install.js",
-    "install": "prebuild-install --verbose || node-gyp rebuild",
+    "install": "node-gyp rebuild > build.log 2>&1",
     "configure": "node-gyp configure",
     "build": "node-gyp configure build",
     "rebuild": "node-gyp rebuild",