Fetched upstream

Author: Simon Hofmann

appveyor.yml

@@ -14,44 +14,46 @@ init:
 
 # what combinations to test
 environment:
-  OPENCV3_LATEST: 3.4.6
-  OPENCV4_LATEST: 4.1.0
   PYTHON_VERSION: 2.7
   PYTHON: "C:\\Python27-x64"
-  # use self build
 
   matrix:
     - nodejs_version: 12
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      OPENCV_VERSION: "%OPENCV4_LATEST%"
     - nodejs_version: 11
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      OPENCV_VERSION: "%OPENCV4_LATEST%"
     - nodejs_version: 10
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      OPENCV_VERSION: "%OPENCV4_LATEST%"
     - nodejs_version: 8
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      OPENCV_VERSION: "%OPENCV4_LATEST%"
     - nodejs_version: 6
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      OPENCV_VERSION: "%OPENCV4_LATEST%"
 
 install:
+  # - cmd: choco install OpenCV -y -version %OPENCV_VERSION%
+  # - if not "%BUILD_TASK%" == "ENVS" SET OPENCV_INCLUDE_DIR=c:\tools\opencv\build\include
+  # - if not "%BUILD_TASK%" == "ENVS" SET OPENCV_LIB_DIR=c:\tools\opencv\build\x64\vc14\lib
+  # - if not "%BUILD_TASK%" == "ENVS" SET OPENCV_BIN_DIR=c:\tools\opencv\build\x64\vc14\bin
+  # - if not "%BUILD_TASK%" == "ENVS" SET PATH=%PATH%;%OPENCV_BIN_DIR%;
   - ps: Install-Product node $env:nodejs_version x64
   - node --version
-  - npm install -g node-gyp
-  - cd c:\projects\opencv4nodejs
-  - npm install
 
 build: off
 
 test_script:
   - node --version
-  - cmd: cd c:\projects\opencv4nodejs\test
-  - npm install
-  - npm run test-appveyor
-  - npm run test-externalMemTracking
+  - if "%BUILD_TASK%" == "ENVS" (
+      cd c:\projects\opencv4nodejs\ci\envs &&
+      npm install &&
+      npm test
+    ) else (
+      cd c:\projects\opencv4nodejs &&
+      npm install &&
+      cd c:\projects\opencv4nodejs\test &&
+      npm install &&
+      npm run test-appveyor &&
+      npm run test-externalMemTracking
+    )
 
 on_success:
   - cmd: cd c:\projects\opencv4nodejs