@@ -42,8 +42,11 @@ set TMPDIR=%BuildRoot%\tmp
4242
4343set 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+
4648call :CloneRepositories || (exit /b)
49+ call :CloneICU || (exit /b)
4750
4851md " %BuildRoot% \Library"
4952
@@ -565,17 +568,13 @@ if defined SKIP_UPDATE_CHECKOUT goto :eof
565568
566569if 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.
573573git -C " %SourceRoot% \swift" config --local core.autocrlf input
574574git -C " %SourceRoot% \swift" checkout-index --force --all
575575
576576set " args = %args% --skip-repository swift"
577577set " args = %args% --skip-repository ninja"
578- set " args = %args% --skip-repository icu"
579578set " args = %args% --skip-repository swift-integration-tests"
580579set " args = %args% --skip-repository swift-stress-tester"
581580set " args = %args% --skip-repository swift-xcode-playground-support"
@@ -585,20 +584,13 @@ call "%SourceRoot%\swift\utils\update-checkout.cmd" %args% --clone --skip-histor
585584goto :eof
586585endlocal
587586
588- :CloneDependencies
587+ :CloneICU
588+ :: TODO(stevapple) move ICU to update-checkout
589589setlocal 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
600593git 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
603595goto :eof
604596endlocal
0 commit comments