@u4/opencv-build - npm Package Compare versions

Comparing version 0.8.0 to 0.8.1

dist/cjs/misc.d.ts

@@ -59,2 +59,4 @@ /**
     [key in boolKey | stringKey]?: string;
+} & {
+    prebuild?: "latestBuild" | "latestVersion" | "oldestBuild" | "oldestVersion";
 };
@@ -92,2 +94,3 @@ export interface OpenCVBuildEnvParams extends OpenCVBuildEnvParamsBool, OpenCVBuildEnvParamsString {
     root: ArgInfo;
+    prebuild: ArgInfo;
     buildRoot: ArgInfo;
@@ -94,0 +97,0 @@ cuda: ArgInfo;

dist/cjs/misc.js

@@ -16,2 +16,3 @@ "use strict";
     root: { arg: 'root', conf: 'rootcwd', env: 'INIT_CWD', isBool: false, doc: 'OpenCV-build root directory (deprecated)' },
+    prebuild: { arg: 'prebuild', conf: 'prebuild', env: 'OPENCV_PREBUILD', isBool: false, doc: 'force prebuild param: latestBuild|latestVersion|oldestBuild|oldestVersion' },
     buildRoot: { arg: 'buildRoot', conf: 'buildRoot', env: 'OPENCV_BUILD_ROOT', isBool: false, doc: 'OpenCV build directory' },
@@ -18,0 +19,0 @@ cuda: { arg: 'cuda', conf: 'autoBuildBuildCuda', env: 'OPENCV4NODEJS_BUILD_CUDA', isBool: true, doc: 'Enable cuda in OpenCV build' },

dist/cjs/OpenCVBuildEnv.js

@@ -116,7 +116,10 @@ "use strict";
                 const lookup = "c:/tools/opencv/build/x64/vc*/bin";
-                const candidates = (0, tiny_glob_1.sync)(lookup);
+                const candidates = ["c:\\tools\\opencv\\build\\x64\\vc14\\bin", "c:\\tools\\opencv\\build\\x64\\vc16\\bin"];
+                // const candidates = blob(lookup); // blob looks broken
+                let fnd = false;
                 for (const candidate of candidates) {
                     if (fs_1.default.existsSync(candidate)) {
+                        fnd = true;
                         process.env.OPENCV_BIN_DIR = candidate;
-                        summery.push('OPENCV_BIN_DIR resolved');
+                        summery.push(`OPENCV_BIN_DIR resolved as ${(0, utils_js_1.highlight)(candidate)}`);
                         changes++;
@@ -126,4 +129,4 @@ break;
                 }
-                if (!candidates.length) {
-                    summery.push(`failed to resolve OPENCV_BIN_DIR from ${lookup}`);
+                if (!fnd) {
+                    summery.push(`failed to resolve OPENCV_BIN_DIR from ${lookup} => ${candidates.join(',')}`);
                 }
@@ -133,13 +136,16 @@ }
                 const lookup = "c:/tools/opencv/build/x64/vc*/lib";
-                // const candidate = "c:\\tools\\opencv\\build\\x64\\vc14\\lib"
-                const candidates = (0, tiny_glob_1.sync)(lookup);
+                const candidates = ["c:\\tools\\opencv\\build\\x64\\vc14\\lib", "c:\\tools\\opencv\\build\\x64\\vc16\\lib"];
+                // const candidates = blob(lookup); // blob looks broken
+                let fnd = false;
                 for (const candidate of candidates) {
                     if (fs_1.default.existsSync(candidate)) {
+                        fnd = true;
                         process.env.OPENCV_LIB_DIR = candidate;
-                        summery.push('OPENCV_LIB_DIR resolved');
+                        summery.push(`OPENCV_LIB_DIR resolved as ${(0, utils_js_1.highlight)(candidate)}`);
                         changes++;
+                        break;
                     }
                 }
-                if (!candidates.length) {
-                    summery.push(`failed to resolve OPENCV_LIB_DIR from ${lookup}`);
+                if (!fnd) {
+                    summery.push(`failed to resolve OPENCV_LIB_DIR from ${lookup} => ${candidates.join(',')}`);
                 }
@@ -146,0 +152,0 @@ }

dist/esm/misc.d.ts

@@ -59,2 +59,4 @@ /**
     [key in boolKey | stringKey]?: string;
+} & {
+    prebuild?: "latestBuild" | "latestVersion" | "oldestBuild" | "oldestVersion";
 };
@@ -92,2 +94,3 @@ export interface OpenCVBuildEnvParams extends OpenCVBuildEnvParamsBool, OpenCVBuildEnvParamsString {
     root: ArgInfo;
+    prebuild: ArgInfo;
     buildRoot: ArgInfo;
@@ -94,0 +97,0 @@ cuda: ArgInfo;

dist/esm/misc.js

@@ -13,2 +13,3 @@ /**
     root: { arg: 'root', conf: 'rootcwd', env: 'INIT_CWD', isBool: false, doc: 'OpenCV-build root directory (deprecated)' },
+    prebuild: { arg: 'prebuild', conf: 'prebuild', env: 'OPENCV_PREBUILD', isBool: false, doc: 'force prebuild param: latestBuild|latestVersion|oldestBuild|oldestVersion' },
     buildRoot: { arg: 'buildRoot', conf: 'buildRoot', env: 'OPENCV_BUILD_ROOT', isBool: false, doc: 'OpenCV build directory' },
@@ -15,0 +16,0 @@ cuda: { arg: 'cuda', conf: 'autoBuildBuildCuda', env: 'OPENCV4NODEJS_BUILD_CUDA', isBool: true, doc: 'Enable cuda in OpenCV build' },

dist/esm/OpenCVBuildEnv.js

@@ -111,7 +111,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
                 const lookup = "c:/tools/opencv/build/x64/vc*/bin";
-                const candidates = blob(lookup);
+                const candidates = ["c:\\tools\\opencv\\build\\x64\\vc14\\bin", "c:\\tools\\opencv\\build\\x64\\vc16\\bin"];
+                // const candidates = blob(lookup); // blob looks broken
+                let fnd = false;
                 for (const candidate of candidates) {
                     if (fs.existsSync(candidate)) {
+                        fnd = true;
                         process.env.OPENCV_BIN_DIR = candidate;
-                        summery.push('OPENCV_BIN_DIR resolved');
+                        summery.push(`OPENCV_BIN_DIR resolved as ${highlight(candidate)}`);
                         changes++;
@@ -121,4 +124,4 @@ break;
                 }
-                if (!candidates.length) {
-                    summery.push(`failed to resolve OPENCV_BIN_DIR from ${lookup}`);
+                if (!fnd) {
+                    summery.push(`failed to resolve OPENCV_BIN_DIR from ${lookup} => ${candidates.join(',')}`);
                 }
@@ -128,13 +131,16 @@ }
                 const lookup = "c:/tools/opencv/build/x64/vc*/lib";
-                // const candidate = "c:\\tools\\opencv\\build\\x64\\vc14\\lib"
-                const candidates = blob(lookup);
+                const candidates = ["c:\\tools\\opencv\\build\\x64\\vc14\\lib", "c:\\tools\\opencv\\build\\x64\\vc16\\lib"];
+                // const candidates = blob(lookup); // blob looks broken
+                let fnd = false;
                 for (const candidate of candidates) {
                     if (fs.existsSync(candidate)) {
+                        fnd = true;
                         process.env.OPENCV_LIB_DIR = candidate;
-                        summery.push('OPENCV_LIB_DIR resolved');
+                        summery.push(`OPENCV_LIB_DIR resolved as ${highlight(candidate)}`);
                         changes++;
+                        break;
                     }
                 }
-                if (!candidates.length) {
-                    summery.push(`failed to resolve OPENCV_LIB_DIR from ${lookup}`);
+                if (!fnd) {
+                    summery.push(`failed to resolve OPENCV_LIB_DIR from ${lookup} => ${candidates.join(',')}`);
                 }
@@ -141,0 +147,0 @@ }

package.json

 {
   "name": "@u4/opencv-build",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "A simple script to auto build recent OpenCV + contrib version via npm 2022 Edition",
@@ -5,0 +5,0 @@ "main": "dist/cjs/index.js",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

358807

increased by0.64%

Lines of code

5686

increased by0.35%

No dependency changes