adapt build to new electron version

Author: erossignon

.travis.yml

@@ -10,9 +10,9 @@ os:
 
 env:
   matrix:
-  - TRAVIS_NODE_VERSION="6"
+  # - TRAVIS_NODE_VERSION="6"
   #- TRAVIS_NODE_VERSION="6" ARCH="x86"
-  - TRAVIS_NODE_VERSION="7"
+  # - TRAVIS_NODE_VERSION="7"
   #- TRAVIS_NODE_VERSION="7" ARCH="x86"
   #- TRAVIS_ELECTRON_VERSION="1.4.14" TRAVIS_NODE_VERSION="6"
   - TRAVIS_NODE_VERSION="8"

Makefile

@@ -11,7 +11,7 @@ clean:
 	node-pre-gyp clean
 
 packet:
-	npm install mocha
+	npm install mocha@7
 	npm install assert
 	npm install should
 	npm install node-pre-gyp		

README.md

@@ -62,7 +62,7 @@ $npm install node-occ
 # installing nodejs and gyp utility to build extensions
 sudo apt-get install nodejs npm
 sudo npm install node-pre-gyp -g
-sudo npm install mocha -g
+sudo npm install mocha@7 -g
 
 #installing cmake
 sudo apt-get install cmake cmake-curses-gui g++ build-essential libtbb2

appveyor.yml

@@ -21,23 +21,20 @@ environment:
   VisualStudioVersion: "12"
   matrix:
 
-    # - nodejs_version: 6
-    #   platform: x86
-
-    - nodejs_version: 6
-      platform: x64
-
-    # - nodejs_version: 7
-    #   platform: x86
-
-    - nodejs_version: 7
+    - electron_version: "7.3.2"
+      nodejs_version: 12
       platform: x64
+    
+    # - electron_version: "8.5.0" // not working yet =< GetBackingStore missing
+    #   nodejs_version: 12
+    #   platform: x64
 
+    # - electron_version: "9.2.0"
+    #   nodejs_version: 12
+    #   platform: x64
+    
     - nodejs_version: 8
       platform: x64
-
-    - nodejs_version: 9
-      platform: x64
 
     - nodejs_version: 10
       platform: x64
@@ -64,17 +61,7 @@ environment:
     #   nodejs_version: 6
     #   platform: x64
 
-    - electron_version: "7.3.2"
-      nodejs_version: 12
-      platform: x64
-    
-    - electron_version: "8.5.0"
-      nodejs_version: 12
-      platform: x64
 
-    - electron_version: "9.2.0"
-      nodejs_version: 12
-      platform: x64
 
 # clone directory
 clone_folder: c:\projects\node-occ

build.bat

@@ -72,21 +72,23 @@ df
 
 
 IF NOT DEFINED electron_version (
-   SET electron_version=1.4.14
+   SET electron_version=9.2.0
 )
 
 SET npm_config_target=%electron_version%
-SET npm_config_disturl=https://atom.io/download/atom-shell
+SET npm_config_arch=%PLATFORM%
+SET npm_config_target_arch=%PLATFORM%
+SET npm_config_disturl=https://electronjs.org/headers
 SET npm_config_runtime=electron
-
+SET npm_config_build_from_source=true
 ECHO Install electron and electron-mocha
 ECHO "  PLATFORM            =" %PLATFORM%
 ECHO "  npm_config_arch     =" %npm_config_arch%
 ECHO "  npm_config_target   =" %npm_config_target%
 ECHO "  npm_config_runtime  =" %npm_config_runtime%
-
+SET HOME=%APPDATA%/.electron-gyp
 CALL npm install electron@%electron_version% -g
-CALL npm install electron-mocha
+CALL npm install electron-mocha@%electron_version%
 CALL npm install --build-from-source --msvc_version=%VSVER% --target_arch=%npm_config_arch%
 if  NOT '%ERRORLEVEL%'=='0'   goto handle_npm_install_error