Added cleanup method for existing installs with version missmatch

Author: Simon Hofmann

build/constants.js

@@ -75,6 +75,7 @@ exports.defaultCmakeFlags = [
     "-DBUILD_opencv_xobjdetect=OFF",
     "-DBUILD_opencv_xphoto=OFF",
     // Custom config
+    "-DOPENCV_FORCE_3RDPARTY_BUILD=ON",
     "-DBUILD_PNG=ON",
     "-DBUILD_TIFF=ON",
     "-DBUILD_JASPER=ON",

build/setupOpencv.js

@@ -212,22 +212,31 @@ function installOpenCV() {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    if (!fs_extra_1.existsSync(dirs_1.dirs.opencvInstallRoot)) return [3 /*break*/, 1];
+                    if (!fs_extra_1.existsSync(dirs_1.dirs.opencvInstallRoot)) return [3 /*break*/, 4];
                     log.info("Directory " + dirs_1.dirs.opencvInstallRoot + " already exists, assuming existing installation.");
-                    log.info("Remove the existing directory to force a clean install.");
-                    return [3 /*break*/, 3];
+                    if (!(readVersionInfo() === null || readVersionInfo() !== getPackageVersion())) return [3 /*break*/, 2];
+                    log.info("Discovered version missmatch. Have: " + readVersionInfo() + " Want: " + getPackageVersion());
+                    log.info("Removing previous installation.");
+                    return [4 /*yield*/, utils_1.exec(getRmDirCmd(dirs_1.dirs.opencvInstallRoot))];
                 case 1:
+                    _a.sent();
+                    return [3 /*break*/, 3];
+                case 2:
+                    log.info("Remove the existing directory to force a clean install.");
+                    _a.label = 3;
+                case 3: return [3 /*break*/, 6];
+                case 4:
                     log.info("Installing to " + dirs_1.dirs.opencvInstallRoot, "");
                     return [4 /*yield*/, fs_extra_1.copy(dirs_1.dirs.opencvRoot, dirs_1.dirs.opencvInstallRoot, {
                             recursive: true,
                             errorOnExist: true,
                             overwrite: false
                         })];
-                case 2:
+                case 5:
                     _a.sent();
                     writeVersionInfo(getPackageVersion());
-                    _a.label = 3;
-                case 3: return [2 /*return*/];
+                    _a.label = 6;
+                case 6: return [2 /*return*/];
             }
         });
     });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nut-tree/opencv-build",
-  "version": "3.4.6-beta28",
+  "version": "3.4.6-beta31",
   "description": "A simple script to auto build recent OpenCV + contrib version via npm. Base on [justadudewhohacks/npm-opencv-build](https://github.com/justadudewhohacks/npm-opencv-build)",
   "main": "./build/index.js",
   "scripts": {

src/constants.ts

@@ -79,6 +79,7 @@ export const defaultCmakeFlags = [
   "-DBUILD_opencv_xobjdetect=OFF",
   "-DBUILD_opencv_xphoto=OFF",
   // Custom config
+  "-DOPENCV_FORCE_3RDPARTY_BUILD=ON",
   "-DBUILD_PNG=ON",
   "-DBUILD_TIFF=ON",
   "-DBUILD_JASPER=ON",

src/setupOpencv.ts

@@ -131,7 +131,13 @@ export async function setupOpencv() {
 export async function installOpenCV() {
     if (existsSync(dirs.opencvInstallRoot)) {
         log.info(`Directory ${dirs.opencvInstallRoot} already exists, assuming existing installation.`);
-        log.info(`Remove the existing directory to force a clean install.`);
+        if (readVersionInfo() === null || readVersionInfo() !== getPackageVersion()) {
+            log.info(`Discovered version missmatch. Have: ${readVersionInfo()} Want: ${getPackageVersion()}`);
+            log.info(`Removing previous installation.`);
+            await exec(getRmDirCmd(dirs.opencvInstallRoot));
+        } else {
+            log.info(`Remove the existing directory to force a clean install.`);
+        }
     } else {
         log.info(`Installing to ${dirs.opencvInstallRoot}`, "");
         await copy(dirs.opencvRoot, dirs.opencvInstallRoot, {