build,windows: restore DISTTYPEDIR

refack · MylesBorins · commit c2090a063477 · 2017-09-05T12:49:51.000-04:00
* rename :exit to :distexit Backport-PR-URL: #14842 PR-URL: #13969 Refs: #13900 (review) Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: João Reis <reis@janeasystems.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Rod Vagg <rod@vagg.org>
diff --git a/vcbuild.bat b/vcbuild.bat
@@ -405,7 +405,7 @@ if not defined NODE_VERSION (
 if not defined DISTTYPE set DISTTYPE=release
 if "%DISTTYPE%"=="release" (
 set FULLVERSION=%NODE_VERSION%
- exit /b 0
+ goto distexit
 )
 if "%DISTTYPE%"=="custom" (
 if not defined CUSTOMTAG (
@@ -432,4 +432,7 @@ if not "%DISTTYPE%"=="custom" (
 set TAG=%DISTTYPE%%DATESTRING%%COMMIT%
 )
 set FULLVERSION=%NODE_VERSION%-%TAG%
-exit /b 0
+
+:distexit
+if not defined DISTTYPEDIR set DISTTYPEDIR=%DISTTYPE%
+goto :EOF

-Original file line number
+Diff line change
 ifnotdefined DISTTYPE setDISTTYPE=release
 if"%DISTTYPE%"=="release" (
 setFULLVERSION=%NODE_VERSION%
 -exit /b 0
 +goto distexit
+)
 if"%DISTTYPE%"=="custom" (
 ifnotdefined CUSTOMTAG (
 setTAG=%DISTTYPE%%DATESTRING%%COMMIT%
+)
 setFULLVERSION=%NODE_VERSION%-%TAG%
 -exit /b 0
++
 +:distexit
 +ifnotdefined DISTTYPEDIR setDISTTYPEDIR=%DISTTYPE%
 +goto :EOF