Skip to content

Commit beb55e3

Browse files
manbeariandscho
authored andcommitted
vcbuild: add an option to install individual 'features'
In this context, a "feature" is a dependency combined with its own dependencies. Signed-off-by: Ian Bearman <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 69c451e commit beb55e3

File tree

1 file changed

+34
-1
lines changed

1 file changed

+34
-1
lines changed

compat/vcbuild/vcpkg_install.bat

+34-1
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,47 @@ REM ================================================================
8585
:sub__install_one
8686
echo Installing package %1...
8787

88+
call :%1_features
89+
8890
REM vcpkg may not be reliable on slow, intermittent or proxy
8991
REM connections, see e.g.
9092
REM https://social.msdn.microsoft.com/Forums/windowsdesktop/en-US/4a8f7be5-5e15-4213-a7bb-ddf424a954e6/winhttpsendrequest-ends-with-12002-errorhttptimeout-after-21-seconds-no-matter-what-timeout?forum=windowssdk
9193
REM which explains the hidden 21 second timeout
9294
REM (last post by Dave : Microsoft - Windows Networking team)
9395

94-
.\vcpkg.exe install %1:%arch%
96+
.\vcpkg.exe install %1%features%:%arch%
9597
IF ERRORLEVEL 1 ( EXIT /B 1 )
9698

9799
echo Finished %1
98100
goto :EOF
101+
102+
::
103+
:: features for each vcpkg to install
104+
:: there should be an entry here for each package to install
105+
:: 'set features=' means use the default otherwise
106+
:: 'set features=[comma-delimited-feature-set]' is the syntax
107+
::
108+
109+
:zlib_features
110+
set features=
111+
goto :EOF
112+
113+
:expat_features
114+
set features=
115+
goto :EOF
116+
117+
:libiconv_features
118+
set features=
119+
goto :EOF
120+
121+
:openssl_features
122+
set features=
123+
goto :EOF
124+
125+
:libssh2_features
126+
set features=
127+
goto :EOF
128+
129+
:curl_features
130+
set features=[core,openssl]
131+
goto :EOF

0 commit comments

Comments
 (0)