Skip to content

Commit d2b4749

Browse files
committed
[build-windows-toolchain] Just clone ICU.
Other dependencies are now managed by `vcpkg`, so we don't need to handle them manually.
1 parent f500321 commit d2b4749

File tree

1 file changed

+7
-15
lines changed

1 file changed

+7
-15
lines changed

utils/build-windows-toolchain.bat

+7-15
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,11 @@ set TMPDIR=%BuildRoot%\tmp
4242

4343
set NINJA_STATUS=[%%f/%%t][%%p][%%es]
4444

45-
call :CloneDependencies || (exit /b)
45+
:: Always enable symbolic links
46+
git config --global core.symlinks true
47+
4648
call :CloneRepositories || (exit /b)
49+
call :CloneICU || (exit /b)
4750

4851
md "%BuildRoot%\Library"
4952

@@ -565,17 +568,13 @@ if defined SKIP_UPDATE_CHECKOUT goto :eof
565568

566569
if defined REPO_SCHEME set "args=--scheme %REPO_SCHEME%"
567570

568-
:: Always enable symbolic links
569-
git config --global core.symlink true
570-
571571
:: Ensure that we have the files in the original line endings, the swift tests
572572
:: depend on this being the case.
573573
git -C "%SourceRoot%\swift" config --local core.autocrlf input
574574
git -C "%SourceRoot%\swift" checkout-index --force --all
575575

576576
set "args=%args% --skip-repository swift"
577577
set "args=%args% --skip-repository ninja"
578-
set "args=%args% --skip-repository icu"
579578
set "args=%args% --skip-repository swift-integration-tests"
580579
set "args=%args% --skip-repository swift-stress-tester"
581580
set "args=%args% --skip-repository swift-xcode-playground-support"
@@ -585,20 +584,13 @@ call "%SourceRoot%\swift\utils\update-checkout.cmd" %args% --clone --skip-histor
585584
goto :eof
586585
endlocal
587586

588-
:CloneDependencies
587+
:CloneICU
588+
:: TODO(stevapple) move ICU to update-checkout
589589
setlocal enableextensions enabledelayedexpansion
590590

591-
:: Always enable symbolic links
592-
git config --global core.symlinks true
593-
594591
:: FIXME(compnerd) avoid the fresh clone
595-
rd /s /q zlib libxml2 sqlite icu curl
596-
597-
git clone --quiet --no-tags --depth 1 --branch v1.2.11 https://github.com/madler/zlib
598-
git clone --quiet --no-tags --depth 1 --branch v2.9.12 https://github.com/gnome/libxml2
599-
git clone --quiet --no-tags --depth 1 --branch version-3.36.0 https://github.com/sqlite/sqlite
592+
rd /s /q icu
600593
git clone --quiet --no-tags --depth 1 --branch maint/maint-69 https://github.com/unicode-org/icu
601-
git clone --quiet --no-tags --depth 1 --branch curl-7_77_0 https://github.com/curl/curl
602594

603595
goto :eof
604596
endlocal

0 commit comments

Comments
 (0)