From f5b58bc08becbe39c01a2eac8cda25ae597e0159 Mon Sep 17 00:00:00 2001 From: Kewde Date: Mon, 11 Nov 2019 13:05:26 +0000 Subject: [PATCH 01/26] deps: alternative update of node-gyp for electron (v5 & v6), windows --- scripts/build-appveyor.bat | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index bb0205cbf..d368124f5 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -72,6 +72,12 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR IF "%nodejs_version:~0,1%"=="5" CALL npm install node-gyp@3.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR +::Need to force update node-gyp to v6.* for electron v6 & v5 +IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install node-gyp@6.x +IF %ERRORLEVEL% NEQ 0 GOTO ERROR +IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install node-gyp@6.x +IF %ERRORLEVEL% NEQ 0 GOTO ERROR + CALL npm install --build-from-source --msvs_version=%msvs_version% %TOOLSET_ARGS% --loglevel=http IF %ERRORLEVEL% NEQ 0 GOTO ERROR From a621fa894509ef22b8ed7b5be610a911b9339d1e Mon Sep 17 00:00:00 2001 From: Kewde Date: Mon, 11 Nov 2019 16:26:22 +0000 Subject: [PATCH 02/26] deps: install globally --- scripts/build-appveyor.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index d368124f5..0976e7fdd 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -72,10 +72,10 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR IF "%nodejs_version:~0,1%"=="5" CALL npm install node-gyp@3.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR -::Need to force update node-gyp to v6.* for electron v6 & v5 -IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install node-gyp@6.x +::Need to force update node-gyp to v6+ for electron v6 and v5 +IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install -g node-gyp@6.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR -IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install node-gyp@6.x +IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install -g node-gyp@6.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR CALL npm install --build-from-source --msvs_version=%msvs_version% %TOOLSET_ARGS% --loglevel=http From 4adafad3851546e2831f36b38454c763e2a699a4 Mon Sep 17 00:00:00 2001 From: Kewde Date: Mon, 11 Nov 2019 17:42:16 +0000 Subject: [PATCH 03/26] deps: force installation into the folder that node-pre-gyp uses force an updated version into the directory that node-pre-gyp uses to fetch node-gyp from "C:\Program Files\nodejs\node_modules\npm\node_modules" --- scripts/build-appveyor.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index 0976e7fdd..281f96197 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -73,9 +73,9 @@ IF "%nodejs_version:~0,1%"=="5" CALL npm install node-gyp@3.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR ::Need to force update node-gyp to v6+ for electron v6 and v5 -IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install -g node-gyp@6.x +IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix C:\Program Files\nodejs\node_modules\npm\node_modules node-gyp@6.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR -IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install -g node-gyp@6.x +IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install --prefix C:\Program Files\nodejs\node_modules\npm\node_modules node-gyp@6.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR CALL npm install --build-from-source --msvs_version=%msvs_version% %TOOLSET_ARGS% --loglevel=http From ebd0a284a240a08afc5becb28f90732a3fce3b88 Mon Sep 17 00:00:00 2001 From: Kewde Date: Mon, 11 Nov 2019 17:45:04 +0000 Subject: [PATCH 04/26] deps: quotes around file path due to space --- scripts/build-appveyor.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index 281f96197..af5f4dbf7 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -73,9 +73,9 @@ IF "%nodejs_version:~0,1%"=="5" CALL npm install node-gyp@3.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR ::Need to force update node-gyp to v6+ for electron v6 and v5 -IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix C:\Program Files\nodejs\node_modules\npm\node_modules node-gyp@6.x +IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix "C:\Program Files\nodejs\node_modules\npm\node_modules" node-gyp@6.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR -IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install --prefix C:\Program Files\nodejs\node_modules\npm\node_modules node-gyp@6.x +IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install --prefix "C:\Program Files\nodejs\node_modules\npm\node_modules" node-gyp@6.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR CALL npm install --build-from-source --msvs_version=%msvs_version% %TOOLSET_ARGS% --loglevel=http From a67b0b10bb00d575d41e864e597df550a11d1926 Mon Sep 17 00:00:00 2001 From: Kewde Date: Mon, 11 Nov 2019 19:10:02 +0000 Subject: [PATCH 05/26] deps: remove node_modules in path --- scripts/build-appveyor.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index af5f4dbf7..6e78814e3 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -73,9 +73,9 @@ IF "%nodejs_version:~0,1%"=="5" CALL npm install node-gyp@3.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR ::Need to force update node-gyp to v6+ for electron v6 and v5 -IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix "C:\Program Files\nodejs\node_modules\npm\node_modules" node-gyp@6.x +IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix "C:\Program Files\nodejs\node_modules\npm" node-gyp@6.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR -IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install --prefix "C:\Program Files\nodejs\node_modules\npm\node_modules" node-gyp@6.x +IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install --prefix "C:\Program Files\nodejs\node_modules\npm" node-gyp@6.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR CALL npm install --build-from-source --msvs_version=%msvs_version% %TOOLSET_ARGS% --loglevel=http From 678b40d01e69eba3ccc5b4a338840e591cd0d207 Mon Sep 17 00:00:00 2001 From: Kewde Date: Mon, 11 Nov 2019 22:05:12 +0000 Subject: [PATCH 06/26] deps: use %ProgramFiles% to dynamically locate the directory --- scripts/build-appveyor.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index 6e78814e3..926520cd0 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -73,9 +73,9 @@ IF "%nodejs_version:~0,1%"=="5" CALL npm install node-gyp@3.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR ::Need to force update node-gyp to v6+ for electron v6 and v5 -IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix "C:\Program Files\nodejs\node_modules\npm" node-gyp@6.x +IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix "%ProgramFiles%\nodejs\node_modules\npm" node-gyp@6.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR -IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install --prefix "C:\Program Files\nodejs\node_modules\npm" node-gyp@6.x +IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install --prefix "%ProgramFiles%\nodejs\node_modules\npm" node-gyp@6.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR CALL npm install --build-from-source --msvs_version=%msvs_version% %TOOLSET_ARGS% --loglevel=http From cb93e18c6ae7898141c336a7e681661ae279b370 Mon Sep 17 00:00:00 2001 From: Kewde Date: Tue, 12 Nov 2019 15:49:41 +0000 Subject: [PATCH 07/26] deps: detect environment to build for using %platform% --- scripts/build-appveyor.bat | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index 926520cd0..a2a09e8c3 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -73,10 +73,16 @@ IF "%nodejs_version:~0,1%"=="5" CALL npm install node-gyp@3.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR ::Need to force update node-gyp to v6+ for electron v6 and v5 -IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix "%ProgramFiles%\nodejs\node_modules\npm" node-gyp@6.x -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install --prefix "%ProgramFiles%\nodejs\node_modules\npm" node-gyp@6.x -IF %ERRORLEVEL% NEQ 0 GOTO ERROR +IF NOT "%NODE_RUNTIME%"=="" ( + SET npm_in_nodejs_dir = "%ProgramFiles%\nodejs\node_modules\npm" + IF /I "%platform%"=="x86" ( + SET npm_in_nodejs_dir = "%ProgramFiles(x86)%\nodejs\node_modules\npm" + ) + IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix "%npm_in_nodejs_dir%" node-gyp@6.x + IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install --prefix "%npm_in_nodejs_dir%" node-gyp@6.x + ) + IF %ERRORLEVEL% NEQ 0 GOTO ERROR +) CALL npm install --build-from-source --msvs_version=%msvs_version% %TOOLSET_ARGS% --loglevel=http IF %ERRORLEVEL% NEQ 0 GOTO ERROR From 58bf68fb7fcacf3baca49075d54448d3fdddff16 Mon Sep 17 00:00:00 2001 From: Kewde Date: Tue, 12 Nov 2019 18:13:58 +0000 Subject: [PATCH 08/26] deps: logging and small typo fix --- scripts/build-appveyor.bat | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index a2a09e8c3..41901f5e2 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -73,16 +73,18 @@ IF "%nodejs_version:~0,1%"=="5" CALL npm install node-gyp@3.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR ::Need to force update node-gyp to v6+ for electron v6 and v5 +ECHO ===== conditional node-gyp upgrade START ============ IF NOT "%NODE_RUNTIME%"=="" ( SET npm_in_nodejs_dir = "%ProgramFiles%\nodejs\node_modules\npm" IF /I "%platform%"=="x86" ( SET npm_in_nodejs_dir = "%ProgramFiles(x86)%\nodejs\node_modules\npm" ) - IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix "%npm_in_nodejs_dir%" node-gyp@6.x - IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install --prefix "%npm_in_nodejs_dir%" node-gyp@6.x - ) + ECHO npm_in_nodejs_dir^: %npm_in_nodejs_dir% + IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix "%npm_in_nodejs_dir%" node-gyp@6.x + IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install --prefix "%npm_in_nodejs_dir%" node-gyp@6.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR ) +ECHO ===== conditional node-gyp upgrade END ============ CALL npm install --build-from-source --msvs_version=%msvs_version% %TOOLSET_ARGS% --loglevel=http IF %ERRORLEVEL% NEQ 0 GOTO ERROR From 520d06a5539d558aa1a5dab21b45c6a209f5489a Mon Sep 17 00:00:00 2001 From: Kewde Date: Thu, 14 Nov 2019 08:10:45 +0000 Subject: [PATCH 09/26] deps: set variable outside of if statement --- scripts/build-appveyor.bat | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index 41901f5e2..6a4fe274f 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -74,12 +74,12 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR ::Need to force update node-gyp to v6+ for electron v6 and v5 ECHO ===== conditional node-gyp upgrade START ============ +:: Find the folder to install the node-gyp in +SET npm_in_nodejs_dir = "%ProgramFiles%\nodejs\node_modules\npm" +IF /I "%platform%"=="x86" SET npm_in_nodejs_dir = "%ProgramFiles(x86)%\nodejs\node_modules\npm" +ECHO npm_in_nodejs_dir^: %npm_in_nodejs_dir% +:: Check if electron and install IF NOT "%NODE_RUNTIME%"=="" ( - SET npm_in_nodejs_dir = "%ProgramFiles%\nodejs\node_modules\npm" - IF /I "%platform%"=="x86" ( - SET npm_in_nodejs_dir = "%ProgramFiles(x86)%\nodejs\node_modules\npm" - ) - ECHO npm_in_nodejs_dir^: %npm_in_nodejs_dir% IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix "%npm_in_nodejs_dir%" node-gyp@6.x IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install --prefix "%npm_in_nodejs_dir%" node-gyp@6.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR From dc52a9bc150a4378a5a4658bf92366fb69ad6c35 Mon Sep 17 00:00:00 2001 From: Kewde Date: Thu, 14 Nov 2019 08:37:29 +0000 Subject: [PATCH 10/26] deps: add debug logging --- scripts/build-appveyor.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index 6a4fe274f..bab765dfe 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -76,6 +76,7 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR ECHO ===== conditional node-gyp upgrade START ============ :: Find the folder to install the node-gyp in SET npm_in_nodejs_dir = "%ProgramFiles%\nodejs\node_modules\npm" +ECHO npm_in_nodejs_dir^: %npm_in_nodejs_dir% IF /I "%platform%"=="x86" SET npm_in_nodejs_dir = "%ProgramFiles(x86)%\nodejs\node_modules\npm" ECHO npm_in_nodejs_dir^: %npm_in_nodejs_dir% :: Check if electron and install From dab13be1fd58e41c9e8aa2d68f6a849a59a08b58 Mon Sep 17 00:00:00 2001 From: Kewde Date: Thu, 14 Nov 2019 08:43:08 +0000 Subject: [PATCH 11/26] deps: specify electron runtime better --- scripts/build-appveyor.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index bab765dfe..4b98dac4b 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -80,7 +80,7 @@ ECHO npm_in_nodejs_dir^: %npm_in_nodejs_dir% IF /I "%platform%"=="x86" SET npm_in_nodejs_dir = "%ProgramFiles(x86)%\nodejs\node_modules\npm" ECHO npm_in_nodejs_dir^: %npm_in_nodejs_dir% :: Check if electron and install -IF NOT "%NODE_RUNTIME%"=="" ( +IF /I "%NODE_RUNTIME%"=="electron" ( IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix "%npm_in_nodejs_dir%" node-gyp@6.x IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install --prefix "%npm_in_nodejs_dir%" node-gyp@6.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR From 5133fa414f7eebc00ef078864a1fae944844f509 Mon Sep 17 00:00:00 2001 From: Kewde Date: Fri, 15 Nov 2019 15:58:17 +0000 Subject: [PATCH 12/26] deps: fix set variable, no spaces --- scripts/build-appveyor.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index 4b98dac4b..921f49d16 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -75,9 +75,9 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR ::Need to force update node-gyp to v6+ for electron v6 and v5 ECHO ===== conditional node-gyp upgrade START ============ :: Find the folder to install the node-gyp in -SET npm_in_nodejs_dir = "%ProgramFiles%\nodejs\node_modules\npm" +SET npm_in_nodejs_dir="%ProgramFiles%\nodejs\node_modules\npm" ECHO npm_in_nodejs_dir^: %npm_in_nodejs_dir% -IF /I "%platform%"=="x86" SET npm_in_nodejs_dir = "%ProgramFiles(x86)%\nodejs\node_modules\npm" +IF /I "%platform%"=="x86" SET npm_in_nodejs_dir="%ProgramFiles(x86)%\nodejs\node_modules\npm" ECHO npm_in_nodejs_dir^: %npm_in_nodejs_dir% :: Check if electron and install IF /I "%NODE_RUNTIME%"=="electron" ( From 06c21aa67475c88019b2c33b41b90c5ef43e090d Mon Sep 17 00:00:00 2001 From: Kewde Date: Fri, 15 Nov 2019 17:08:10 +0000 Subject: [PATCH 13/26] deps: try double " --- scripts/build-appveyor.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index 921f49d16..b0ee0d9aa 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -81,8 +81,8 @@ IF /I "%platform%"=="x86" SET npm_in_nodejs_dir="%ProgramFiles(x86)%\nodejs\node ECHO npm_in_nodejs_dir^: %npm_in_nodejs_dir% :: Check if electron and install IF /I "%NODE_RUNTIME%"=="electron" ( - IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix "%npm_in_nodejs_dir%" node-gyp@6.x - IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install --prefix "%npm_in_nodejs_dir%" node-gyp@6.x + IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix ""%npm_in_nodejs_dir%"" node-gyp@6.x + IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install --prefix ""%npm_in_nodejs_dir%"" node-gyp@6.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR ) ECHO ===== conditional node-gyp upgrade END ============ From 913a3262c84c6e5e181a7669267061baa3d79f3b Mon Sep 17 00:00:00 2001 From: Kewde Date: Fri, 15 Nov 2019 17:13:21 +0000 Subject: [PATCH 14/26] try without quotes (i hate batch) --- scripts/build-appveyor.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index b0ee0d9aa..1f6c9bb7c 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -81,8 +81,8 @@ IF /I "%platform%"=="x86" SET npm_in_nodejs_dir="%ProgramFiles(x86)%\nodejs\node ECHO npm_in_nodejs_dir^: %npm_in_nodejs_dir% :: Check if electron and install IF /I "%NODE_RUNTIME%"=="electron" ( - IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix ""%npm_in_nodejs_dir%"" node-gyp@6.x - IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install --prefix ""%npm_in_nodejs_dir%"" node-gyp@6.x + IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix %npm_in_nodejs_dir% node-gyp@6.x + IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install --prefix %npm_in_nodejs_dir% node-gyp@6.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR ) ECHO ===== conditional node-gyp upgrade END ============ From 919de2842ea0b0e7b361ab53b58918cd854bc335 Mon Sep 17 00:00:00 2001 From: Kewde Date: Sat, 16 Nov 2019 01:44:53 +0000 Subject: [PATCH 15/26] deps: move goto outside of if --- scripts/build-appveyor.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index 1f6c9bb7c..82bd47d91 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -83,8 +83,8 @@ ECHO npm_in_nodejs_dir^: %npm_in_nodejs_dir% IF /I "%NODE_RUNTIME%"=="electron" ( IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix %npm_in_nodejs_dir% node-gyp@6.x IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install --prefix %npm_in_nodejs_dir% node-gyp@6.x - IF %ERRORLEVEL% NEQ 0 GOTO ERROR ) +IF %ERRORLEVEL% NEQ 0 GOTO ERROR ECHO ===== conditional node-gyp upgrade END ============ CALL npm install --build-from-source --msvs_version=%msvs_version% %TOOLSET_ARGS% --loglevel=http From 8f577f893978fe36ddd0709b87ce801a708b8678 Mon Sep 17 00:00:00 2001 From: Kewde Date: Sat, 16 Nov 2019 01:51:33 +0000 Subject: [PATCH 16/26] add debug logging --- scripts/build-appveyor.bat | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index 82bd47d91..eb442723a 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -80,10 +80,15 @@ ECHO npm_in_nodejs_dir^: %npm_in_nodejs_dir% IF /I "%platform%"=="x86" SET npm_in_nodejs_dir="%ProgramFiles(x86)%\nodejs\node_modules\npm" ECHO npm_in_nodejs_dir^: %npm_in_nodejs_dir% :: Check if electron and install +ECHO "Before the if" IF /I "%NODE_RUNTIME%"=="electron" ( + ECHO "Inside the if" IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix %npm_in_nodejs_dir% node-gyp@6.x + ECHO "Point 2" IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install --prefix %npm_in_nodejs_dir% node-gyp@6.x + ECHO "Point 3" ) +ECHO "After the if" IF %ERRORLEVEL% NEQ 0 GOTO ERROR ECHO ===== conditional node-gyp upgrade END ============ From 9dc8271408d8ba511a205f830add9e88bc0ea118 Mon Sep 17 00:00:00 2001 From: Kewde Date: Sat, 16 Nov 2019 02:37:26 +0000 Subject: [PATCH 17/26] more debug logging --- scripts/build-appveyor.bat | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index eb442723a..9e6c718fd 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -81,12 +81,14 @@ IF /I "%platform%"=="x86" SET npm_in_nodejs_dir="%ProgramFiles(x86)%\nodejs\node ECHO npm_in_nodejs_dir^: %npm_in_nodejs_dir% :: Check if electron and install ECHO "Before the if" -IF /I "%NODE_RUNTIME%"=="electron" ( - ECHO "Inside the if" +IF /I %NODE_RUNTIME%==electron ( + ECHO "Electron environment, checking for version 5 or 6.." IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix %npm_in_nodejs_dir% node-gyp@6.x ECHO "Point 2" IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install --prefix %npm_in_nodejs_dir% node-gyp@6.x ECHO "Point 3" +) ELSE ( + ECHO "Not an electron environment." ) ECHO "After the if" IF %ERRORLEVEL% NEQ 0 GOTO ERROR From c6db64d65ad668bfc1653c87d8c87cb698ac50ff Mon Sep 17 00:00:00 2001 From: Kewde Date: Sat, 16 Nov 2019 03:00:59 +0000 Subject: [PATCH 18/26] add back quotes --- scripts/build-appveyor.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index 9e6c718fd..395b79823 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -81,7 +81,7 @@ IF /I "%platform%"=="x86" SET npm_in_nodejs_dir="%ProgramFiles(x86)%\nodejs\node ECHO npm_in_nodejs_dir^: %npm_in_nodejs_dir% :: Check if electron and install ECHO "Before the if" -IF /I %NODE_RUNTIME%==electron ( +IF /I "%NODE_RUNTIME%"=="electron" ( ECHO "Electron environment, checking for version 5 or 6.." IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix %npm_in_nodejs_dir% node-gyp@6.x ECHO "Point 2" From 092f015fab9f1128828a5bc5f82ec270e8ab77ff Mon Sep 17 00:00:00 2001 From: Kewde Date: Sun, 17 Nov 2019 02:00:28 +0000 Subject: [PATCH 19/26] remove /I from if --- scripts/build-appveyor.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index 395b79823..518309c25 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -81,7 +81,7 @@ IF /I "%platform%"=="x86" SET npm_in_nodejs_dir="%ProgramFiles(x86)%\nodejs\node ECHO npm_in_nodejs_dir^: %npm_in_nodejs_dir% :: Check if electron and install ECHO "Before the if" -IF /I "%NODE_RUNTIME%"=="electron" ( +IF "%NODE_RUNTIME%"=="electron" ( ECHO "Electron environment, checking for version 5 or 6.." IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix %npm_in_nodejs_dir% node-gyp@6.x ECHO "Point 2" From cc1b6b54ae2c346f4dc4753732178719aea21b6f Mon Sep 17 00:00:00 2001 From: Kewde Date: Mon, 18 Nov 2019 00:41:28 +0000 Subject: [PATCH 20/26] unnest if and remove debug logging --- scripts/build-appveyor.bat | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index 518309c25..17b2dea4a 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -80,17 +80,8 @@ ECHO npm_in_nodejs_dir^: %npm_in_nodejs_dir% IF /I "%platform%"=="x86" SET npm_in_nodejs_dir="%ProgramFiles(x86)%\nodejs\node_modules\npm" ECHO npm_in_nodejs_dir^: %npm_in_nodejs_dir% :: Check if electron and install -ECHO "Before the if" -IF "%NODE_RUNTIME%"=="electron" ( - ECHO "Electron environment, checking for version 5 or 6.." - IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix %npm_in_nodejs_dir% node-gyp@6.x - ECHO "Point 2" - IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install --prefix %npm_in_nodejs_dir% node-gyp@6.x - ECHO "Point 3" -) ELSE ( - ECHO "Not an electron environment." -) -ECHO "After the if" +IF "%NODE_RUNTIME%"=="electron" IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix %npm_in_nodejs_dir% node-gyp@6.x +IF "%NODE_RUNTIME%"=="electron" IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install --prefix %npm_in_nodejs_dir% node-gyp@6.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR ECHO ===== conditional node-gyp upgrade END ============ From 46c095a4d58544d990210110097b14008b23b623 Mon Sep 17 00:00:00 2001 From: Kewde Date: Mon, 18 Nov 2019 00:48:39 +0000 Subject: [PATCH 21/26] add debug --- scripts/build-appveyor.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index 17b2dea4a..666cf9c84 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -80,6 +80,7 @@ ECHO npm_in_nodejs_dir^: %npm_in_nodejs_dir% IF /I "%platform%"=="x86" SET npm_in_nodejs_dir="%ProgramFiles(x86)%\nodejs\node_modules\npm" ECHO npm_in_nodejs_dir^: %npm_in_nodejs_dir% :: Check if electron and install + ECHO NODE_RUNTIME^: %NODE_RUNTIME% IF "%NODE_RUNTIME%"=="electron" IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix %npm_in_nodejs_dir% node-gyp@6.x IF "%NODE_RUNTIME%"=="electron" IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install --prefix %npm_in_nodejs_dir% node-gyp@6.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR From f36f5ece8ac38f91fac92035f175e58a94798851 Mon Sep 17 00:00:00 2001 From: Kewde Date: Mon, 18 Nov 2019 12:49:25 +0000 Subject: [PATCH 22/26] attempt without IF "%NODE_RUNTIME%"=="electron" --- scripts/build-appveyor.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index 666cf9c84..f836eb358 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -80,9 +80,9 @@ ECHO npm_in_nodejs_dir^: %npm_in_nodejs_dir% IF /I "%platform%"=="x86" SET npm_in_nodejs_dir="%ProgramFiles(x86)%\nodejs\node_modules\npm" ECHO npm_in_nodejs_dir^: %npm_in_nodejs_dir% :: Check if electron and install - ECHO NODE_RUNTIME^: %NODE_RUNTIME% -IF "%NODE_RUNTIME%"=="electron" IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix %npm_in_nodejs_dir% node-gyp@6.x -IF "%NODE_RUNTIME%"=="electron" IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install --prefix %npm_in_nodejs_dir% node-gyp@6.x +ECHO NODE_RUNTIME^: %NODE_RUNTIME% +IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix %npm_in_nodejs_dir% node-gyp@6.x +IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install --prefix %npm_in_nodejs_dir% node-gyp@6.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR ECHO ===== conditional node-gyp upgrade END ============ From 7ebe69c4739fbb2cd8d7596014955a2c992fa83f Mon Sep 17 00:00:00 2001 From: Kewde Date: Mon, 18 Nov 2019 12:59:34 +0000 Subject: [PATCH 23/26] add additional IF %ERRORLEVEL% NEQ 0 GOTO ERROR --- scripts/build-appveyor.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index f836eb358..575b0a213 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -82,6 +82,7 @@ ECHO npm_in_nodejs_dir^: %npm_in_nodejs_dir% :: Check if electron and install ECHO NODE_RUNTIME^: %NODE_RUNTIME% IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix %npm_in_nodejs_dir% node-gyp@6.x +IF %ERRORLEVEL% NEQ 0 GOTO ERROR IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install --prefix %npm_in_nodejs_dir% node-gyp@6.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR ECHO ===== conditional node-gyp upgrade END ============ From 6a6dcb09810feec028f982e4cad803f052d0ac8a Mon Sep 17 00:00:00 2001 From: Kewde Date: Thu, 21 Nov 2019 08:02:04 +0000 Subject: [PATCH 24/26] more logging on NODE_RUNTIME_VERSION --- scripts/build-appveyor.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index 575b0a213..a7fa2985e 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -81,6 +81,7 @@ IF /I "%platform%"=="x86" SET npm_in_nodejs_dir="%ProgramFiles(x86)%\nodejs\node ECHO npm_in_nodejs_dir^: %npm_in_nodejs_dir% :: Check if electron and install ECHO NODE_RUNTIME^: %NODE_RUNTIME% +ECHO NODE_RUNTIME_VERSION_REDUCED^: %NODE_RUNTIME_VERSION:~0,1% IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix %npm_in_nodejs_dir% node-gyp@6.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install --prefix %npm_in_nodejs_dir% node-gyp@6.x From 3adec9f8c0886f62319b15cb31a58fcaaf96000f Mon Sep 17 00:00:00 2001 From: Kewde Date: Thu, 21 Nov 2019 08:20:44 +0000 Subject: [PATCH 25/26] move logic to add in debugging --- scripts/build-appveyor.bat | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index a7fa2985e..f61c28859 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -79,12 +79,16 @@ SET npm_in_nodejs_dir="%ProgramFiles%\nodejs\node_modules\npm" ECHO npm_in_nodejs_dir^: %npm_in_nodejs_dir% IF /I "%platform%"=="x86" SET npm_in_nodejs_dir="%ProgramFiles(x86)%\nodejs\node_modules\npm" ECHO npm_in_nodejs_dir^: %npm_in_nodejs_dir% +:: Set boolean whether the update has to happen +SET "needs_patch=" +IF DEFINED %NODE_RUNTIME_VERSION% ( + ECHO NODE_RUNTIME_VERSION_REDUCED^: %NODE_RUNTIME_VERSION:~0,1% + IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" SET "needs_patch=y" + IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" SET "needs_patch=y" +) :: Check if electron and install ECHO NODE_RUNTIME^: %NODE_RUNTIME% -ECHO NODE_RUNTIME_VERSION_REDUCED^: %NODE_RUNTIME_VERSION:~0,1% -IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" CALL npm install --prefix %npm_in_nodejs_dir% node-gyp@6.x -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" CALL npm install --prefix %npm_in_nodejs_dir% node-gyp@6.x +IF DEFINED needs_patch CALL npm install --prefix %npm_in_nodejs_dir% node-gyp@6.x IF %ERRORLEVEL% NEQ 0 GOTO ERROR ECHO ===== conditional node-gyp upgrade END ============ From b318e2cfc48b92ac5bf763878f9e518329954b2c Mon Sep 17 00:00:00 2001 From: Kewde Date: Thu, 21 Nov 2019 08:23:37 +0000 Subject: [PATCH 26/26] fix % --- scripts/build-appveyor.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-appveyor.bat b/scripts/build-appveyor.bat index f61c28859..80a0113e1 100644 --- a/scripts/build-appveyor.bat +++ b/scripts/build-appveyor.bat @@ -81,7 +81,7 @@ IF /I "%platform%"=="x86" SET npm_in_nodejs_dir="%ProgramFiles(x86)%\nodejs\node ECHO npm_in_nodejs_dir^: %npm_in_nodejs_dir% :: Set boolean whether the update has to happen SET "needs_patch=" -IF DEFINED %NODE_RUNTIME_VERSION% ( +IF DEFINED NODE_RUNTIME_VERSION ( ECHO NODE_RUNTIME_VERSION_REDUCED^: %NODE_RUNTIME_VERSION:~0,1% IF "%NODE_RUNTIME_VERSION:~0,1%"=="5" SET "needs_patch=y" IF "%NODE_RUNTIME_VERSION:~0,1%"=="6" SET "needs_patch=y"