Updated bundling process

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 -- -u %GITHUB_TOKEN%
+    npm run prebuild -- --include-regex "\.(node|a|so|dylib|lib|dll)$" -u %GITHUB_TOKEN%
     )

binding.gyp

@@ -35,7 +35,6 @@
 			"cc/core/TermCriteria.cc",
 			"cc/modules/io/io.cc",
 		],
-
 		"cflags" : [
 			"-std=c++11"
 		],
@@ -57,7 +56,6 @@
 			"GCC_ENABLE_CPP_EXCEPTIONS": "YES",
 			"MACOSX_DEPLOYMENT_TARGET": "10.9"
 		},
-
 		"conditions": [
 			[ "OS==\"win\"", {
 				"cflags": [
@@ -82,6 +80,14 @@
 				"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 -- -u $GITHUB_TOKEN;
+npm run prebuild -- --include-regex "\.(node|a|so|dylib|lib|dll)$" -u $GITHUB_TOKEN;

lib/bundle.js

@@ -0,0 +1,7 @@
+const { opencvLibDir } = require("./dirs");
+const { readdirSync, realpathSync } = require("fs");
+const { join } = require("path");
+
+for (const file of readdirSync(opencvLibDir)) {
+    console.log(join(realpathSync(opencvLibDir), file));
+}

lib/dirs.js

@@ -6,7 +6,7 @@ const isOSX = () => process.platform == 'darwin'
 
 const isUnix = () => !isWin() && !isOSX();
 
-const rootDir = `../node_modules/@nut-tree/opencv-build-${process.platform}`
+const rootDir = `node_modules/@nut-tree/opencv-build-${process.platform}`
 const opencvRoot = join(rootDir, 'opencv');
 const opencvBuild = join(opencvRoot, 'build');
 const opencvInclude = join(opencvBuild, 'include');

lib/libs.js

@@ -15,6 +15,5 @@ if (linkSystemLibs()) {
 }
 
 // if not windows, link libs dynamically
-console.log('-L' + opencvLibDir);
+console.log(`-L${resolvePath(opencvLibDir)}`);
 opencvBuild.opencvModules.forEach(lib => console.log(`-lopencv_${lib}`));
-console.log('-Wl,-rpath,' + opencvLibDir);

package.json

@@ -44,7 +44,6 @@
   },
   "gypfile": true,
   "dependencies": {
-    "@nut-tree/opencv-build-darwin": "^3.4.6",
     "macro-inferno": "^0.2.3",
     "nan": "^2.12.1",
     "native-node-utils": "^0.1.5",
@@ -56,5 +55,5 @@
   "devDependencies": {
     "prebuild": "^8.2.0"
   },
-  "opencv": "3.4.6"
+  "opencv": "3.4.6-local"
 }