Reverted installation

Author: Simon Hofmann

Diff for: build/dirs.d.ts

@@ -1,7 +1,6 @@
 export declare const dirs: {
     rootDir: string;
     opencvRoot: string;
-    opencvInstallRoot: string;
     opencvSrc: string;
     opencvContribSrc: string;
     opencvContribModules: string;

Diff for: build/dirs.js

@@ -2,8 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var path = require("path");
 var utils_1 = require("./utils");
-var env_1 = require("./env");
-var os_1 = require("os");
 var rootDir = path.resolve(__dirname, '../');
 var opencvRoot = path.join(rootDir, 'opencv');
 var opencvSrc = path.join(opencvRoot, 'opencv');
@@ -14,22 +12,15 @@ var opencvInclude = path.join(opencvBuild, 'include');
 var opencvLibDir = utils_1.isWin() ? path.join(opencvBuild, 'lib/Release') : path.join(opencvBuild, 'lib');
 var opencvBinDir = utils_1.isWin() ? path.join(opencvBuild, 'bin/Release') : path.join(opencvBuild, 'bin');
 var autoBuildFile = path.join(opencvRoot, 'auto-build.json');
-var installDir = os_1.homedir();
-var installedOpenCV = path.resolve(path.join(installDir, 'opencv-prebuilt'));
-var installedOpencvBuild = path.join(installedOpenCV, 'build');
-var installedOpencvInclude = path.join(installedOpencvBuild, 'include');
-var installedOpencvLibDir = utils_1.isWin() ? path.join(installedOpencvBuild, 'lib/Release') : path.join(installedOpencvBuild, 'lib');
-var installedOpencvBinDir = utils_1.isWin() ? path.join(installedOpencvBuild, 'bin/Release') : path.join(installedOpencvBuild, 'bin');
 exports.dirs = {
     rootDir: rootDir,
     opencvRoot: opencvRoot,
-    opencvInstallRoot: installedOpenCV,
     opencvSrc: opencvSrc,
     opencvContribSrc: opencvContribSrc,
     opencvContribModules: opencvContribModules,
-    opencvBuild: env_1.isAutoBuildEnabled() ? opencvBuild : installedOpencvBuild,
-    opencvInclude: env_1.isAutoBuildEnabled() ? opencvInclude : installedOpencvInclude,
-    opencvLibDir: env_1.isAutoBuildEnabled() ? opencvLibDir : installedOpencvLibDir,
-    opencvBinDir: env_1.isAutoBuildEnabled() ? opencvBinDir : installedOpencvBinDir,
+    opencvBuild: opencvBuild,
+    opencvInclude: opencvInclude,
+    opencvLibDir: opencvLibDir,
+    opencvBinDir: opencvBinDir,
     autoBuildFile: autoBuildFile
 };

Diff for: build/index.d.ts

@@ -4,5 +4,4 @@ export declare const opencvInclude: string;
 export declare const opencvLibDir: string;
 export declare const opencvBinDir: string;
 export declare const opencvBuildDir: string;
-export declare const installedOpenCV: string;
 export declare const getLibs: (libDir: string) => import("./types").OpencvModule[];

Diff for: build/index.js

@@ -15,5 +15,4 @@ exports.opencvInclude = dirs_1.dirs.opencvInclude;
 exports.opencvLibDir = dirs_1.dirs.opencvLibDir;
 exports.opencvBinDir = dirs_1.dirs.opencvBinDir;
 exports.opencvBuildDir = dirs_1.dirs.opencvBuild;
-exports.installedOpenCV = dirs_1.dirs.opencvInstallRoot;
 exports.getLibs = getLibsFactory_1.getLibsFactory({ isWin: utils_1.isWin, isOSX: utils_1.isOSX, opencvModules: constants_1.opencvModules, path: path, fs: fs });

Diff for: build/install.js

@@ -41,7 +41,7 @@ var utils_1 = require("./utils");
 var log = require("npmlog");
 function install() {
     return __awaiter(this, void 0, void 0, function () {
-        var err_1, e_1;
+        var err_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -71,22 +71,7 @@ function install() {
                     log.error(err_1);
                     process.exit(1);
                     return [3 /*break*/, 6];
-                case 6:
-                    if (!!env_1.isInstallDisabled()) return [3 /*break*/, 10];
-                    _a.label = 7;
-                case 7:
-                    _a.trys.push([7, 9, , 10]);
-                    log.info("Moving files", "");
-                    return [4 /*yield*/, setupOpencv_1.installOpenCV()];
-                case 8:
-                    _a.sent();
-                    return [3 /*break*/, 10];
-                case 9:
-                    e_1 = _a.sent();
-                    log.error(e_1);
-                    process.exit(1);
-                    return [3 /*break*/, 10];
-                case 10: return [2 /*return*/];
+                case 6: return [2 /*return*/];
             }
         });
     });

Diff for: build/setupOpencv.d.ts

@@ -1,5 +1 @@
 export declare function setupOpencv(): Promise<void>;
-export declare function installOpenCV(): Promise<void>;
-export declare function writeVersionInfo(version: string): void;
-export declare function readVersionInfo(): string | null;
-export declare function getPackageVersion(): string;

Diff for: build/setupOpencv.js

@@ -34,16 +34,12 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var _this = this;
 Object.defineProperty(exports, "__esModule", { value: true });
 var constants_1 = require("./constants");
 var dirs_1 = require("./dirs");
 var env_1 = require("./env");
 var findMsBuild_1 = require("./findMsBuild");
 var utils_1 = require("./utils");
-var fs_extra_1 = require("fs-extra");
-var fs_1 = require("fs");
-var path_1 = require("path");
 var log = require('npmlog');
 function getIfExistsDirCmd(dirname, exists) {
     if (exists === void 0) { exists = true; }
@@ -208,70 +204,3 @@ function setupOpencv() {
     });
 }
 exports.setupOpencv = setupOpencv;
-function installOpenCV() {
-    return __awaiter(this, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if (!fs_extra_1.existsSync(dirs_1.dirs.opencvInstallRoot)) return [3 /*break*/, 5];
-                    log.info("Directory " + dirs_1.dirs.opencvInstallRoot + " already exists, assuming existing installation.");
-                    if (!(readVersionInfo() === null || readVersionInfo() !== getPackageVersion())) return [3 /*break*/, 3];
-                    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 [4 /*yield*/, copyOpenCV()];
-                case 2:
-                    _a.sent();
-                    return [3 /*break*/, 4];
-                case 3:
-                    log.info("Remove the existing directory to force a clean install.");
-                    _a.label = 4;
-                case 4: return [3 /*break*/, 7];
-                case 5:
-                    log.info("Installing to " + dirs_1.dirs.opencvInstallRoot, "");
-                    return [4 /*yield*/, copyOpenCV()];
-                case 6:
-                    _a.sent();
-                    _a.label = 7;
-                case 7: return [2 /*return*/];
-            }
-        });
-    });
-}
-exports.installOpenCV = installOpenCV;
-var copyOpenCV = function () { return __awaiter(_this, void 0, void 0, function () {
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, fs_extra_1.copy(dirs_1.dirs.opencvRoot, dirs_1.dirs.opencvInstallRoot, {
-                    recursive: true,
-                    errorOnExist: true,
-                    overwrite: false
-                })];
-            case 1:
-                _a.sent();
-                writeVersionInfo(getPackageVersion());
-                return [2 /*return*/];
-        }
-    });
-}); };
-var getVersionInfoPath = function () { return path_1.join(dirs_1.dirs.opencvInstallRoot, "versioninfo.json"); };
-function writeVersionInfo(version) {
-    fs_1.writeFileSync(getVersionInfoPath(), JSON.stringify({ version: version }));
-}
-exports.writeVersionInfo = writeVersionInfo;
-function readVersionInfo() {
-    try {
-        return require(getVersionInfoPath()).version;
-    }
-    catch (e) {
-        return null;
-    }
-}
-exports.readVersionInfo = readVersionInfo;
-function getPackageVersion() {
-    var packageJson = require(path_1.join(__dirname, "../package.json"));
-    return packageJson.name + "@" + packageJson.version;
-}
-exports.getPackageVersion = getPackageVersion;

Diff for: package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@nut-tree/opencv-build",
-  "version": "3.4.6-home",
+  "version": "3.4.6-local",
   "description": "A simple script to auto build recent OpenCV + contrib version via npm. Based on [justadudewhohacks/npm-opencv-build](https://github.com/justadudewhohacks/npm-opencv-build)",
   "main": "./build/index.js",
   "scripts": {
@@ -26,14 +26,12 @@
   },
   "homepage": "https://github.com/nut-tree/npm-opencv-build#readme",
   "dependencies": {
-    "fs-extra": "^8.0.1",
     "npmlog": "^4.1.2"
   },
   "devDependencies": {
-    "@types/fs-extra": "^7.0.0",
     "@types/node": "^12.0.0",
     "chai": "^4.2.0",
     "mocha": "^6.1.4",
     "typescript": "^3.4.5"
   }
-}
+}

Diff for: package.json

@@ -2,9 +2,6 @@ import * as path from 'path';
 
 import {isWin} from './utils';
 
-import {isAutoBuildEnabled} from "./env";
-import {homedir} from "os";
-
 const rootDir = path.resolve(__dirname, '../');
 const opencvRoot = path.join(rootDir, 'opencv');
 const opencvSrc = path.join(opencvRoot, 'opencv');
@@ -16,24 +13,15 @@ const opencvLibDir = isWin() ? path.join(opencvBuild, 'lib/Release') : path.join
 const opencvBinDir = isWin() ? path.join(opencvBuild, 'bin/Release') : path.join(opencvBuild, 'bin');
 const autoBuildFile = path.join(opencvRoot, 'auto-build.json');
 
-const installDir = homedir();
-const installedOpenCV = path.resolve(path.join(installDir, 'opencv-prebuilt'));
-
-const installedOpencvBuild = path.join(installedOpenCV, 'build');
-const installedOpencvInclude = path.join(installedOpencvBuild, 'include');
-const installedOpencvLibDir = isWin() ? path.join(installedOpencvBuild, 'lib/Release') : path.join(installedOpencvBuild, 'lib');
-const installedOpencvBinDir = isWin() ? path.join(installedOpencvBuild, 'bin/Release') : path.join(installedOpencvBuild, 'bin');
-
 export const dirs = {
   rootDir,
   opencvRoot,
-  opencvInstallRoot: installedOpenCV,
   opencvSrc,
   opencvContribSrc,
   opencvContribModules,
-  opencvBuild: isAutoBuildEnabled() ? opencvBuild : installedOpencvBuild,
-  opencvInclude: isAutoBuildEnabled() ? opencvInclude : installedOpencvInclude,
-  opencvLibDir: isAutoBuildEnabled() ? opencvLibDir : installedOpencvLibDir,
-  opencvBinDir: isAutoBuildEnabled() ? opencvBinDir : installedOpencvBinDir,
+  opencvBuild,
+  opencvInclude,
+  opencvLibDir,
+  opencvBinDir,
   autoBuildFile
 };

Diff for: src/dirs.ts

@@ -12,5 +12,4 @@ export const opencvInclude = dirs.opencvInclude;
 export const opencvLibDir = dirs.opencvLibDir;
 export const opencvBinDir = dirs.opencvBinDir;
 export const opencvBuildDir = dirs.opencvBuild;
-export const installedOpenCV = dirs.opencvInstallRoot;
 export const getLibs = getLibsFactory({isWin, isOSX, opencvModules, path, fs});

Diff for: src/index.ts

@@ -1,5 +1,5 @@
 import {autoBuildFlags, isAutoBuildEnabled, isInstallDisabled, isWithoutContrib, opencvVersion} from "./env";
-import {installOpenCV, setupOpencv} from "./setupOpencv";
+import {setupOpencv} from "./setupOpencv";
 import {requireCmake, requireGit} from "./utils";
 
 const log = require("npmlog");
@@ -27,13 +27,4 @@ export async function install() {
             process.exit(1);
         }
     }
-    if (!isInstallDisabled()) {
-        try {
-            log.info("Moving files", "");
-            await installOpenCV();
-        } catch (e) {
-            log.error(e);
-            process.exit(1);
-        }
-    }
 }