build,windows: fix vcbuild.bat

[refack]

restore DISTTYPEDIR
Ref: #13900 (review)

Checklist

• make -j4 test (UNIX), or vcbuild test (Windows) passes
• commit message follows commit guidelines

Affected core subsystem(s)

build,windows

[refack]

/cc @joaocgreis @nodejs/release
Apparently 614dbbd broke the release script. We need to fast track this
[edit]
No need for fast track since 614dbbd is not part of any release branch yet.

[tniessen]

Windows CI: https://ci.nodejs.org/job/node-test-commit-windows-fanned/10048/

[joaocgreis]

I also added a fix to the CI script (nodejs/build#776) because the nightlies would break. There should be no issue with having both, so I believe this should land.

[rvagg]

lgtm, thanks for getting onto it so quick @refack

[gibfahn]

Is there a reason the goto is needed? If it's only used in this one function can't you just do:

 if "%DISTTYPE%"=="release" (
     set FULLVERSION=%NODE_VERSION%
+   if not defined DISTTYPEDIR set DISTTYPEDIR=%DISTTYPE%
   exit /b 0

)
set FULLVERSION=%NODE_VERSION%-%TAG%
+if not defined DISTTYPEDIR set DISTTYPEDIR=%DISTTYPE%

It's possible probable I'm misunderstanding some of the subtleties of this script.

[joaocgreis]

The two implementations are functionally the same.

Here the idea is to have two parts: first do checks and set variables depending on the DISTTYPE, then goto a common block for all DISTTYPEs that may depend on the variables set above. I prefer the current change as it avoids duplicating the same set, but no strong feelings.

[refack]

I think at some point the subroutine was used more than once... Now it's a degenerate label, but I as well would rather keep it this way...

[gibfahn]

Agreed that the set repetition is also not great. If you guys prefer it this way then let's do that! I just found the goto :EOF as the last line confusing, but hopefully long-term we can move to the Powershell promised land anyway.