@@ -15,8 +15,6 @@ if /i "%1"=="/?" goto help
15
15
set config = Release
16
16
set target = Build
17
17
set target_arch = x86
18
- set debug_arg =
19
- set snapshot_arg =
20
18
set noprojgen =
21
19
set nobuild =
22
20
set nosign =
@@ -28,16 +26,15 @@ set licensertf=
28
26
set jslint =
29
27
set buildnodeweak =
30
28
set noetw =
31
- set noetw_arg =
32
29
set noetw_msi_arg =
33
30
set noperfctr =
34
- set noperfctr_arg =
35
31
set noperfctr_msi_arg =
36
32
set i18n_arg =
37
33
set download_arg =
38
34
set release_urls_arg =
39
35
set build_release =
40
36
set enable_vtune_profiling =
37
+ set configure_flags =
41
38
42
39
:next-arg
43
40
if " %1 " == " " goto args-done
@@ -63,7 +60,6 @@ if /i "%1"=="test-internet" set test_args=%test_args% internet&goto arg-ok
63
60
if /i " %1 " == " test-pummel" set test_args = %test_args% pummel& goto arg-ok
64
61
if /i " %1 " == " test-all" set test_args = %test_args% sequential parallel message gc internet pummel& set buildnodeweak=1& set jslint=1& goto arg-ok
65
62
if /i " %1 " == " jslint" set jslint = 1& goto arg-ok
66
- @ rem Include small-icu support with MSI installer
67
63
if /i " %1 " == " msi" set msi = 1& set licensertf=1& set download_arg=" --download=all" & set i18n_arg=small-icu& goto arg-ok
68
64
if /i " %1 " == " build-release" set build_release = 1& goto arg-ok
69
65
if /i " %1 " == " upload" set upload = 1& goto arg-ok
@@ -91,15 +87,18 @@ if defined build_release (
91
87
set i18n_arg = small-icu
92
88
)
93
89
94
- if " %config% " == " Debug" set debug_arg = --debug
95
- if defined nosnapshot set snapshot_arg = --without-snapshot
96
- if defined noetw set noetw_arg = --without-etw& set noetw_msi_arg = /p:NoETW=1
97
- if defined noperfctr set noperfctr_arg = --without-perfctr& set noperfctr_msi_arg = /p:NoPerfCtr=1
98
- if defined RELEASE_URLBASE set release_urlbase_arg = --release-urlbase=%RELEASE_URLBASE%
90
+ if " %config% " == " Debug" set configure_flags = %configure_flags% --debug
91
+ if defined nosnapshot set configure_flags = %configure_flags% --without-snapshot
92
+ if defined noetw set configure_flags = %configure_flags% --without-etw& set noetw_msi_arg = /p:NoETW=1
93
+ if defined noperfctr set configure_flags = %configure_flags% --without-perfctr& set noperfctr_msi_arg = /p:NoPerfCtr=1
94
+ if defined release_urlbase set release_urlbase_arg = --release-urlbase=%release_urlbase%
95
+ if defined download_arg set configure_flags = %configure_flags% %download_arg%
99
96
100
- if " %i18n_arg% " == " full-icu" set i18n_arg = --with-intl=full-icu
101
- if " %i18n_arg% " == " small-icu" set i18n_arg = --with-intl=small-icu
102
- if " %i18n_arg% " == " intl-none" set i18n_arg = --with-intl=none
97
+ if " %i18n_arg% " == " full-icu" set configure_flags = %configure_flags% --with-intl=full-icu
98
+ if " %i18n_arg% " == " small-icu" set configure_flags = %configure_flags% --with-intl=small-icu
99
+ if " %i18n_arg% " == " intl-none" set configure_flags = %configure_flags% --with-intl=none
100
+
101
+ if defined config_flags set configure_flags = %configure_flags% %config_flags%
103
102
104
103
if not exist " %~dp0 deps\icu" goto no-depsicu
105
104
if " %target% " == " Clean" echo deleting %~dp0 deps\icu
@@ -170,7 +169,8 @@ goto run
170
169
if defined noprojgen goto msbuild
171
170
172
171
@ rem Generate the VS project.
173
- python configure %download_arg% %i18n_arg% %debug_arg% %snapshot_arg% %noetw_arg% %noperfctr_arg% %enable_vtune_profiling% --dest-cpu=%target_arch% --tag=%TAG%
172
+ echo configure %configure_flags% %enable_vtune_profiling% --dest-cpu=%target_arch% --tag=%TAG%
173
+ python configure %configure_flags% %enable_vtune_profiling% --dest-cpu=%target_arch% --tag=%TAG%
174
174
if errorlevel 1 goto create-msvs-files-failed
175
175
if not exist node.sln goto create-msvs-files-failed
176
176
echo Project files generated.
0 commit comments