Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
b5c24df
doc: fix type of atime/mtime
exoego Sep 23, 2019
3f02855
module: move cjs type check behind flag
guybedford Sep 27, 2019
ab060bf
doc: clarify fs.symlink() usage
Granjow Sep 25, 2019
2ea4cc0
doc: clarify pipeline stream cleanup
ronag Sep 27, 2019
8d88010
src: try showing stack traces when process._fatalException is not set
joyeecheung Sep 20, 2019
a86b71f
src: disconnect inspector before exiting out of fatal exception
joyeecheung Sep 19, 2019
c361180
tools: make mailmap processing for author list case-insensitive
addaleax Sep 18, 2019
91e4cc7
doc: update AUTHORS list
addaleax Sep 18, 2019
04df7db
worker: keep allocators for transferred SAB instances alive longer
addaleax Sep 20, 2019
3de1fc6
doc: document that iv may be null when using createCipheriv()
BridgeAR Sep 23, 2019
6579b1a
doc,http: indicate callback is optional for message.setTimeout()
trivikr Sep 22, 2019
588b388
crypto: use byteLength in timingSafeEqual
tniessen Oct 8, 2018
64740d4
src: fix compiler warning in inspector_profiler.cc
danbev Sep 23, 2019
a04fc86
http2: optimize the altsvc Max bytes limit, define and use constants
rickyes Sep 23, 2019
17c3478
src: fix asan build for gcc/clang
devnexen Aug 31, 2019
2b76cb6
doc: remove align from tables
XhmikosR Sep 23, 2019
7a6b05a
doc: fix 404 links
XhmikosR Sep 23, 2019
c2791dc
doc: fix some recent nits
vsemozhetbyt Sep 23, 2019
0fc85ff
doc: specify `display=fallback` for Google Fonts
XhmikosR Sep 24, 2019
d258e02
doc: clarify stream errors while reading and writing
ronag Sep 22, 2019
1303e35
doc: clarify description of `readable.push()` method
ImHype Sep 25, 2019
d86f10c
doc: add KeyObject to type for crypto.createDecipheriv() argument
Sep 24, 2019
038cbb0
doc: fix output in inspector HeapProfile example
fanatid Sep 26, 2019
ef033d0
worker: fix process._fatalException return type
BridgeAR Sep 25, 2019
ae46196
build,win: goto lint only after defining node_exe
joaocgreis Sep 19, 2019
35e1d8c
build: include deps/v8/test/torque in source tarball
richardlau Sep 26, 2019
0041f1c
doc: sync security policy with nodejs.org
sam-github Sep 23, 2019
69f2634
tls: simplify setSecureContext() option parsing
cjihrig Sep 25, 2019
d1f4bef
module: pass full URL to loader for top-level load
guybedford Sep 27, 2019
298d927
deps: enable unit data in small-icu
targos Sep 27, 2019
2a6b7b0
test: fix flaky test-cluster-net-listen-ipv6only-none
Trott Sep 25, 2019
c3a1303
src: rename --loader to --experimental-loader
reasonablytall Sep 28, 2019
8507485
2019-10-01, Version 12.11.1 (Current)
targos Oct 1, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
build,win: goto lint only after defining node_exe
When running `vcbuild lint` on a new prompt where vcbuild was not run
before, `%node_exe%` was not defined and `eslint.js`, `lint-js.js`
and `lint-md.js` would be run directly using the program defined in
Windows (usually the Windows Scripting Host or Notepad).

This moves the goto statement to after `%node_exe%` is defined.

Fixes: #29602

PR-URL: #29616
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
  • Loading branch information
joaocgreis authored and targos committed Oct 1, 2019
commit ae461964a7dbee1d0c428914f851a0f5439178c9
9 changes: 4 additions & 5 deletions vcbuild.bat
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,6 @@ goto next-arg

:args-done

if "%*"=="lint" (
goto lint-cpp
)

if defined build_release (
set config=Release
set package=1
Expand All @@ -178,6 +174,9 @@ set "npm_exe="%~dp0%node_exe%" %~dp0deps\npm\bin\npm-cli.js"
if "%target_env%"=="vs2017" set "node_gyp_exe=%node_gyp_exe% --msvs_version=2017"
if "%target_env%"=="vs2019" set "node_gyp_exe=%node_gyp_exe% --msvs_version=2019"

:: skip building if the only argument received was lint
if "%*"=="lint" if exist "%node_exe%" goto lint-cpp

if "%config%"=="Debug" set configure_flags=%configure_flags% --debug
if defined nosnapshot set configure_flags=%configure_flags% --without-snapshot
if defined noetw set configure_flags=%configure_flags% --without-etw& set noetw_msi_arg=/p:NoETW=1
Expand Down Expand Up @@ -641,7 +640,7 @@ if not defined lint_cpp goto lint-js
if defined NODEJS_MAKE goto run-make-lint
where make > NUL 2>&1 && make -v | findstr /C:"GNU Make" 1> NUL
if "%ERRORLEVEL%"=="0" set "NODEJS_MAKE=make PYTHON=python" & goto run-make-lint
where wsl > NUL 2>1
where wsl > NUL 2>&1
if "%ERRORLEVEL%"=="0" set "NODEJS_MAKE=wsl make" & goto run-make-lint
echo Could not find GNU Make, needed for linting C/C++
goto lint-js
Expand Down