build,win: vcbuild refactoring call configure

PR-URL: #17299 Reviewed-By: Tobias Nießen <[email protected]>

Author: refack

vcbuild.bat

@@ -105,7 +105,7 @@ if /i "%1"=="upload" set upload=1&goto arg-ok
 if /i "%1"=="small-icu"seti18n_arg=%1&goto arg-ok
 if /i "%1"=="full-icu"seti18n_arg=%1&goto arg-ok
 if /i "%1"=="intl-none"seti18n_arg=%1&goto arg-ok
-if /i "%1"=="without-intl"seti18n_arg=%1&goto arg-ok
+if /i "%1"=="without-intl"seti18n_arg=intl-none&goto arg-ok
 if /i "%1"=="download-all"setdownload_arg="--download=all"&goto arg-ok
 if /i "%1"=="ignore-flaky"settest_args=%test_args% --flaky-tests=dontcare&goto arg-ok
 if /i "%1"=="enable-vtune"setenable_vtune_arg=1&goto arg-ok
@@ -146,26 +146,21 @@ set "node_gyp_exe="%node_exe%" deps\npm\node_modules\node-gyp\bin\node-gyp"
 if"%target_env%"=="vs2015"set"node_gyp_exe=%node_gyp_exe% --msvs_version=2015"
 if"%target_env%"=="vs2017"set"node_gyp_exe=%node_gyp_exe% --msvs_version=2017"
 
-if"%config%"=="Debug"setconfigure_flags=%configure_flags% --debug
-ifdefined nosnapshot setconfigure_flags=%configure_flags% --without-snapshot
-ifdefined noetw setconfigure_flags=%configure_flags% --without-etw&setnoetw_msi_arg=/p:NoETW=1
-ifdefined noperfctr setconfigure_flags=%configure_flags% --without-perfctr&setnoperfctr_msi_arg=/p:NoPerfCtr=1
-ifdefined release_urlbase setconfigure_flags=%configure_flags% --release-urlbase=%release_urlbase%
-ifdefined download_arg setconfigure_flags=%configure_flags%%download_arg%
+if"%config%"=="Debug"setconfigure_flags=%configure_flags% --debug
+ifdefined nosnapshot setconfigure_flags=%configure_flags% --without-snapshot
+ifdefined noetw setconfigure_flags=%configure_flags% --without-etw&setnoetw_msi_arg=/p:NoETW=1
+ifdefined noperfctr setconfigure_flags=%configure_flags% --without-perfctr&setnoperfctr_msi_arg=/p:NoPerfCtr=1
+ifdefined release_urlbase setconfigure_flags=%configure_flags% --release-urlbase=%release_urlbase%
+ifdefined download_arg setconfigure_flags=%configure_flags%%download_arg%
 ifdefined enable_vtune_arg setconfigure_flags=%configure_flags% --enable-vtune-profiling
-ifdefined dll setconfigure_flags=%configure_flags% --shared
-ifdefined enable_static setconfigure_flags=%configure_flags% --enable-static
-ifdefined no_NODE_OPTIONS setconfigure_flags=%configure_flags% --without-node-options
-
-REM if defined debug_http2 set configure_flags=%configure_flags% --debug-http2
-REM if defined debug_nghttp2 set configure_flags=%configure_flags% --debug-nghttp2
-
-if"%i18n_arg%"=="full-icu"setconfigure_flags=%configure_flags% --with-intl=full-icu
-if"%i18n_arg%"=="small-icu"setconfigure_flags=%configure_flags% --with-intl=small-icu
-if"%i18n_arg%"=="intl-none"setconfigure_flags=%configure_flags% --with-intl=none
-if"%i18n_arg%"=="without-intl"setconfigure_flags=%configure_flags% --without-intl
-
-ifdefined config_flags setconfigure_flags=%configure_flags%%config_flags%
+ifdefined dll setconfigure_flags=%configure_flags% --shared
+ifdefined enable_static setconfigure_flags=%configure_flags% --enable-static
+ifdefined no_NODE_OPTIONS setconfigure_flags=%configure_flags% --without-node-options
+ifdefined link_module setconfigure_flags=%configure_flags%%link_module%
+ifdefined i18n_arg setconfigure_flags=%configure_flags% --with-intl=%i18n_arg%
+ifdefined config_flags setconfigure_flags=%configure_flags%%config_flags%
+ifdefined target_arch setconfigure_flags=%configure_flags% --dest-cpu=%target_arch%
+ifdefined TAG setconfigure_flags=%configure_flags% --tag=%TAG%
 
 ifnotexist"%~dp0deps\icu"goto no-depsicu
 if"%target%"=="Clean"echo deleting %~dp0deps\icu
@@ -266,7 +261,7 @@ goto run
 ifdefined noprojgen goto msbuild
 
 @rem Generate the VS project.
-call :run-python configure %configure_flags% --dest-cpu=%target_arch% --tag=%TAG%%link_module%
+call :run-python configure %configure_flags%
 iferrorlevel1goto create-msvs-files-failed
 ifnotexist node.sln goto create-msvs-files-failed
 echo Project files generated.
@@ -295,7 +290,7 @@ if errorlevel 1 echo Failed to sign exe&goto exit
 @rem Skip license.rtf generation if not requested.
 ifnotdefined licensertf goto package
 
-%config%\node tools\license2rtf.js < LICENSE >%config%\license.rtf
+%config%\node.exe tools\license2rtf.js < LICENSE >%config%\license.rtf
 iferrorlevel1echo Failed to generate license.rtf&goto exit
 
 :package