From c403eeb7fdf8c1033422b6ea8bf025667892f867 Mon Sep 17 00:00:00 2001
From: Bartosz Sosnowski <bartosz@janeasystems.com>
Date: Tue, 19 Jun 2018 11:42:31 +0200
Subject: [PATCH] build: build addons in parallel on Windows

Port https://github.com/nodejs/node/pull/21155 to vcbuild.bat

PR-URL: https://github.com/nodejs/node/pull/21403
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
---
 vcbuild.bat | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/vcbuild.bat b/vcbuild.bat
index 49ff50f60e4a36..595f8dd6c99941 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -448,13 +448,11 @@ for /d %%F in (test\addons\??_*) do (
 "%node_exe%" tools\doc\addon-verify.js
 if %errorlevel% neq 0 exit /b %errorlevel%
 :: building addons
-setlocal EnableDelayedExpansion
-for /d %%F in (test\addons\*) do (
-  %node_gyp_exe% rebuild ^
-    --directory="%%F" ^
-    --nodedir="%cd%"
-  if !errorlevel! neq 0 exit /b !errorlevel!
-)
+setlocal
+set npm_config_nodedir=%~dp0
+"%node_exe%" "%~dp0tools\build-addons.js" "%~dp0deps\npm\node_modules\node-gyp\bin\node-gyp.js" "%~dp0test\addons"
+if errorlevel 1 exit /b 1
+endlocal
 
 :build-addons-napi
 if not defined build_addons_napi goto run-tests