Skip to content

Commit 3423ee1

Browse files
authored
Merge pull request swiftlang#29666 from compnerd/ci-broadening
CI: adjust the temporary drive, unzip path
2 parents ead5b95 + 102fe35 commit 3423ee1

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

utils/build-windows.bat

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ mkdir %full_build_root%
4545

4646
:: Use the shortest path we can for the build directory, to avoid Windows
4747
:: path problems as much as we can.
48-
subst S: /d
49-
subst S: %full_build_root% %exitOnError%
50-
set build_root=S:
48+
subst T: /d
49+
subst T: %full_build_root% %exitOnError%
50+
set build_root=T:
5151
set install_directory=%build_root%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr
5252

5353
call :clone_repositories %exitOnError%
@@ -80,7 +80,10 @@ endlocal
8080
:: It supposes the %CD% is the source root.
8181
setlocal enableextensions enabledelayedexpansion
8282

83-
git config --global core.autocrlf false
83+
git -C "%source_root%\swift" config --local core.autocrlf input
84+
git -C "%source_root%\swift" config --local core.symlink true
85+
git -C "%source_root%\swift" checkout HEAD
86+
8487
git clone --depth 1 --single-branch https://github.com/apple/swift-cmark cmark %exitOnError%
8588
git clone --depth 1 --single-branch --branch swift/master https://github.com/apple/llvm-project llvm-project %exitOnError%
8689
mklink /D "%source_root%\clang" "%source_root%\llvm-project\clang"
@@ -104,7 +107,7 @@ set file_name=icu4c-%icu_version%-Win64-MSVC2017.zip
104107
curl -L -O "https://github.com/unicode-org/icu/releases/download/release-%icu_version_dashed%/%file_name%" %exitOnError%
105108
:: unzip warns about the paths in the zip using slashes, which raises the
106109
:: errorLevel to 1. We cannot use exitOnError, and have to ignore errors.
107-
unzip -o %file_name% -d "%source_root%\icu-%icu_version%"
110+
"%ProgramFiles%\Git\usr\bin\unzip.exe" -o %file_name% -d "%source_root%\icu-%icu_version%"
108111
exit /b 0
109112

110113
goto :eof
@@ -118,7 +121,7 @@ setlocal enableextensions enabledelayedexpansion
118121

119122
set file_name=sqlite-amalgamation-3270200.zip
120123
curl -L -O "https://www.sqlite.org/2019/%file_name%" %exitOnError%
121-
unzip -o %file_name% %exitOnError%
124+
"%ProgramFiles%\Git\usr\bin\unzip.exe" -o %file_name% %exitOnError%
122125

123126
goto :eof
124127
endlocal
@@ -287,6 +290,7 @@ cmake "%source_root%\lldb"^
287290
-DCMAKE_CXX_FLAGS:STRING="/GS- /Oy"^
288291
-DCMAKE_EXE_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
289292
-DCMAKE_SHARED_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
293+
-DLLDB_DISABLE_PYTHON=YES^
290294
-DLLDB_INCLUDE_TESTS:BOOL=NO %exitOnError%
291295

292296
popd

0 commit comments

Comments
 (0)