Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[build-windows-toolchain] Build dependencies with vcpkg #60679

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

[build-windows-toolchain] Build dependencies with vcpkg #60679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
30135cd
[build-windows-toolchain] Adopt `vcpkg`
stevapple Aug 20, 2022
85aa447
[update-checkout] Add `vcpkg` to checkouts.
stevapple Aug 20, 2022
e9df53a
[build-windows-toolchain] Minor cleanups.
stevapple Aug 20, 2022
f500321
[build-windows-toolchain] Enable building on non-UTF-8 Windows machine
stevapple Aug 20, 2022
d2b4749
[build-windows-toolchain] Just clone ICU.
stevapple Aug 20, 2022
85c6a06
[build-windows-toolchain] Unset `SDKROOT` first
stevapple Aug 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
172 changes: 27 additions & 145 deletions utils/build-windows-toolchain.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,11 @@ set TMPDIR=%BuildRoot%\tmp

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

call :CloneDependencies || (exit /b)
:: Always enable symbolic links
git config --global core.symlinks true

call :CloneRepositories || (exit /b)
call :CloneICU || (exit /b)

md "%BuildRoot%\Library"

Expand Down Expand Up @@ -71,119 +74,15 @@ cmake ^
cmake --build "%BuildRoot%\icu" || (exit /b)
cmake --build "%BuildRoot%\icu" --target install || (exit /b)

:: FIXME(compnerd) is there a way to build the sources without downloading the amalgamation?
curl.exe -sOL "https://sqlite.org/2021/sqlite-amalgamation-3360000.zip" || (exit /b)
"%SystemDrive%\Program Files\Git\usr\bin\unzip.exe" -o sqlite-amalgamation-3360000.zip -d %SourceRoot%

:: TODO(compnerd) use CMakeLists.txt from compnerd/swift-build
md %BuildRoot%\sqlite
cl /nologo /DWIN32 /D_WINDOWS /W3 /MD /O2 /Ob2 /DNDEBUG /Fo%BuildRoot%\sqlite\sqlite3.c.obj /Fd%BuildRoot%\sqlite\SQLite3.pdb /FS -c %SourceRoot%\sqlite-amalgamation-3360000\sqlite3.c
lib /nologo /machine:x64 /out:%BuildRoot%\sqlite\SQLite3.lib %BuildRoot%\sqlite\sqlite3.c.obj
md %BuildRoot%\Library\sqlite-3.36.0\usr\lib
md %BuildRoot%\Library\sqlite-3.36.0\usr\include
copy %BuildRoot%\sqlite\SQLite3.lib %BuildRoot%\Library\sqlite-3.36.0\usr\lib
copy %SourceRoot%\sqlite-amalgamation-3360000\sqlite3.h %BuildRoot%\Library\sqlite-3.36.0\usr\include
copy %SourceRoot%\sqlite-amalgamation-3360000\sqlite3ext.h %BuildRoot%\Library\sqlite-3.36.0\usr\include

:: build zlib
cmake ^
-B %BuildRoot%\zlib ^

-D BUILD_SHARED_LIBS=NO ^
-D CMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% ^
-D CMAKE_C_COMPILER=cl ^
-D CMAKE_C_FLAGS="/GS- /Oy /Gw /Gy" ^
-D CMAKE_MT=mt ^
-D CMAKE_EXE_LINKER_FLAGS="/INCREMENTAL:NO" ^
-D CMAKE_SHARED_LINKER_FLAGS="/INCREMENTAL:NO" ^

-D CMAKE_INSTALL_PREFIX=%BuildRoot%\Library\zlib-1.2.11\usr ^

-D SKIP_INSTALL_FILES=YES ^

-G Ninja ^
-S %SourceRoot%\zlib || (exit /b)
cmake --build "%BUildRoot%\zlib" || (exit /b)
cmake --build "%BUildRoot%\zlib" --target install || (exit /b)

:: build libxml2
cmake ^
-B %BuildRoot%\libxml2 ^

-D BUILD_SHARED_LIBS=OFF ^
-D CMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% ^
-D CMAKE_C_COMPILER=cl ^
-D CMAKE_C_FLAGS="/GS- /Oy /Gw /Gy" ^
-D CMAKE_MT=mt ^
-D CMAKE_EXE_LINKER_FLAGS="/INCREMENTAL:NO" ^
-D CMAKE_SHARED_LINKER_FLAGS="/INCREMENTAL:NO" ^

-D CMAKE_INSTALL_PREFIX=%BuildRoot%\Library\libxml2-2.9.12\usr ^

-D LIBXML2_WITH_ICONV=NO ^
-D LIBXML2_WITH_ICU=NO ^
-D LIBXML2_WITH_LZMA=NO ^
-D LIBXML2_WITH_PYTHON=NO ^
-D LIBXML2_WITH_TESTS=NO ^
-D LIBXML2_WITH_THREADS=YES ^
-D LIBXML2_WITH_ZLIB=NO ^

-G Ninja ^
-S %SourceRoot%\libxml2 || (exit /b)
cmake --build "%BUildRoot%\libxml2" || (exit /b)
cmake --build "%BUildRoot%\libxml2" --target install || (exit /b)

:: build curl
cmake ^
-B %BuildRoot%\curl ^

-D BUILD_SHARED_LIBS=NO ^
-D BUILD_TESTING=NO ^
-D CMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% ^
-D CMAKE_C_COMPILER=cl ^
-D CMAKE_C_FLAGS="/GS- /Oy /Gw /Gy" ^
-D CMAKE_MT=mt ^
-D CMAKE_EXE_LINKER_FLAGS="/INCREMENTAL:NO" ^
-D CMAKE_SHARED_LINKER_FLAGS="/INCREMENTAL:NO" ^

-D CMAKE_INSTALL_PREFIX=%BuildRoot%\Library\curl-7.77.0\usr ^

-D BUILD_CURL_EXE=NO ^
-D CMAKE_USE_OPENSSL=NO ^
-D CURL_CA_PATH=none ^
-D CMAKE_USE_SCHANNEL=YES ^
-D CMAKE_USE_LIBSSH2=NO ^
-D HAVE_POLL_FINE=NO ^
-D CURL_DISABLE_LDAP=YES ^
-D CURL_DISABLE_LDAPS=YES ^
-D CURL_DISABLE_TELNET=YES ^
-D CURL_DISABLE_DICT=YES ^
-D CURL_DISABLE_FILE=YES ^
-D CURL_DISABLE_TFTP=YES ^
-D CURL_DISABLE_RTSP=YES ^
-D CURL_DISABLE_PROXY=YES ^
-D CURL_DISABLE_POP3=YES ^
-D CURL_DISABLE_IMAP=YES ^
-D CURL_DISABLE_SMTP=YES ^
-D CURL_DISABLE_GOPHER=YES ^
-D CURL_ZLIB=YES ^
-D ENABLE_UNIX_SOCKETS=NO ^
-D ENABLE_THREADED_RESOLVER=NO ^

-D ZLIB_ROOT=%BuildRoot%\Library\zlib-1.2.11\usr ^
-D ZLIB_LIBRARY=%BuildRoot%\Library\zlib-1.2.11\usr\lib\zlibstatic.lib ^

-G Ninja ^
-S %SourceRoot%\curl || (exit /b)
cmake --build "%BuildRoot%\curl" || (exit /b)
cmake --build "%BuildRoot%\curl" --target install || (exit /b)

:: Prepare system modules
copy /y "%SourceRoot%\swift\stdlib\public\Platform\ucrt.modulemap" "%UniversalCRTSdkDir%\Include\%UCRTVersion%\ucrt\module.modulemap" || (exit /b)
copy /y "%SourceRoot%\swift\stdlib\public\Platform\winsdk.modulemap" "%UniversalCRTSdkDir%\Include\%UCRTVersion%\um\module.modulemap" || (exit /b)
copy /y "%SourceRoot%\swift\stdlib\public\Platform\vcruntime.modulemap" "%VCToolsInstallDir%\include\module.modulemap" || (exit /b)
copy /y "%SourceRoot%\swift\stdlib\public\Platform\vcruntime.apinotes" "%VCToolsInstallDir%\include\vcruntime.apinotes" || (exit /b)

:: Unset SDKROOT
set SDKROOT=

:: Build Toolchain
cmake ^
-B "%BuildRoot%\1" ^
Expand All @@ -192,9 +91,9 @@ cmake ^

-D CMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% ^
-D CMAKE_C_COMPILER=cl ^
-D CMAKE_C_FLAGS="/GS- /Oy /Gw /Gy" ^
-D CMAKE_C_FLAGS="/GS- /Oy /Gw /Gy /utf-8" ^
-D CMAKE_CXX_COMPILER=cl ^
-D CMAKE_CXX_FLAGS="/GS- /Oy /Gw /Gy" ^
-D CMAKE_CXX_FLAGS="/GS- /Oy /Gw /Gy /utf-8" ^
-D CMAKE_MT=mt ^
-D CMAKE_EXE_LINKER_FLAGS="/INCREMENTAL:NO" ^
-D CMAKE_SHARED_LINKER_FLAGS="/INCREMENTAL:NO" ^
Expand All @@ -206,6 +105,7 @@ cmake ^
-D PACKAGE_VENDOR="swift.org" ^
-D CLANG_VENDOR="swift.org" ^
-D CLANG_VENDOR_UTI="org.swift" ^
-D SWIFT_VENDOR="swift.org" ^
-D LLVM_APPEND_VC_REV=NO ^
-D LLVM_VERSION_SUFFIX="" ^

Expand Down Expand Up @@ -297,16 +197,13 @@ cmake ^

-D CMAKE_INSTALL_PREFIX=%SDKInstallRoot%\usr ^

-D CURL_DIR=%BuildRoot%\Library\curl-7.77.0\usr\lib\cmake\CURL ^
-D CMAKE_TOOLCHAIN_FILE=%SourceRoot%\vcpkg\scripts\buildsystems\vcpkg.cmake ^
-D VCPKG_TARGET_TRIPLET=x64-windows-static-md ^
-D VCPKG_MANIFEST_DIR=%SourceRoot%\swift-installer-scripts\shared\Foundation ^
-D ICU_ROOT=%BuildRoot%\Library\icu-69.1\usr ^
-D ICU_DATA_LIBRARY_RELEASE=%BuildRoot%\Library\icu-69.1\usr\lib\sicudt69.lib ^
-D ICU_UC_LIBRARY_RELEASE=%BuildRoot%\Library\icu-69.1\usr\lib\sicuuc69.lib ^
-D ICU_I18N_LIBRARY_RELEASE=%BuildRoot%\Library\icu-69.1\usr\lib\sicuin69.lib ^
-D LIBXML2_LIBRARY=%BuildRoot%\Library\libxml2-2.9.12\usr\lib\libxml2s.lib ^
-D LIBXML2_INCLUDE_DIR=%BuildRoot%\Library\libxml2-2.9.12\usr\include\libxml2 ^
-D LIBXML2_DEFINITIONS="/DLIBXML_STATIC" ^
-D ZLIB_LIBRARY=%BuildRoot%\Library\zlib-1.2.11\usr\lib\zlibstatic.lib ^
-D ZLIB_INCLUDE_DIR=%BuildRoot%\Library\zlib-1.2.11\usr\include ^
-D dispatch_DIR=%BuildRoot%\3\cmake\modules ^

-D ENABLE_TESTING=NO ^
Expand Down Expand Up @@ -380,11 +277,12 @@ cmake ^

-D CMAKE_INSTALL_PREFIX=%InstallRoot% ^

-D CMAKE_TOOLCHAIN_FILE=%SourceRoot%\vcpkg\scripts\buildsystems\vcpkg.cmake ^
-D VCPKG_TARGET_TRIPLET=x64-windows-static-md ^
-D VCPKG_MANIFEST_DIR=%SourceRoot%\swift-installer-scripts\shared\TSC ^
-D dispatch_DIR=%BuildRoot%\3\cmake\modules ^
-D Foundation_DIR=%BuildRoot%\4\cmake\modules ^
-D SwiftSystem_DIR=%BuildRoot%\6\cmake\modules ^
-D SQLite3_INCLUDE_DIR=%BuildRoot%\Library\sqlite-3.36.0\usr\include ^
-D SQLite3_LIBRARY=%BuildRoot%\Library\sqlite-3.36.0\usr\lib\SQLite3.lib ^

-G Ninja ^
-S %SourceRoot%\swift-tools-support-core || (exit /b)
Expand All @@ -409,10 +307,11 @@ cmake ^

-D LLBUILD_SUPPORT_BINDINGS=Swift ^

-D CMAKE_TOOLCHAIN_FILE=%SourceRoot%\vcpkg\scripts\buildsystems\vcpkg.cmake ^
-D VCPKG_TARGET_TRIPLET=x64-windows-static-md ^
-D VCPKG_MANIFEST_DIR=%SourceRoot%\swift-installer-scripts\shared\LLBuild ^
-D dispatch_DIR=%BuildRoot%\3\cmake\modules ^
-D Foundation_DIR=%BuildRoot%\4\cmake\modules ^
-D SQLite3_INCLUDE_DIR=%BuildRoot%\Library\sqlite-3.36.0\usr\include ^
-D SQLite3_LIBRARY=%BuildRoot%\Library\sqlite-3.36.0\usr\lib\SQLite3.lib ^

-G Ninja ^
-S %SourceRoot%\llbuild || (exit /b)
Expand Down Expand Up @@ -494,8 +393,6 @@ cmake ^
-D LLBuild_DIR=%BuildRoot%\8\cmake\modules ^
-D ArgumentParser_DIR=%BuildRoot%\9\cmake\modules ^
-D Yams_DIR=%BuildRoot%\10\cmake\modules ^
-D SQLite3_INCLUDE_DIR=%BuildRoot%\Library\sqlite-3.36.0\usr\include ^
-D SQLite3_LIBRARY=%BuildRoot%\Library\sqlite-3.36.0\usr\lib\SQLite3.lib ^

-G Ninja ^
-S %SourceRoot%\swift-driver || (exit /b)
Expand All @@ -507,9 +404,9 @@ cmake ^
-B %BuildRoot%\12 ^

-D CMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% ^
-D CMAKE_C_COMPILER=cl ^
-D CMAKE_C_COMPILER=%BuildRoot%/1/bin/clang-cl.exe ^
-D CMAKE_C_FLAGS="/GS- /Oy /Gw /Gy" ^
-D CMAKE_CXX_COMPILER=cl ^
-D CMAKE_CXX_COMPILER=%BuildRoot%/1/bin/clang-cl.exe ^
-D CMAKE_CXX_FLAGS="/GS- /Oy /Gw /Gy" ^
-D CMAKE_MT=mt ^
-D CMAKE_Swift_COMPILER=%BuildRoot%/1/bin/swiftc.exe ^
Expand Down Expand Up @@ -569,7 +466,6 @@ cmake ^
-D TSC_DIR=%BuildRoot%\7\cmake\modules ^
-D LLBuild_DIR=%BuildRoot%\8\cmake\modules ^
-D ArgumentParser_DIR=%BuildRoot%\9\cmake\modules ^
-D Yams_DIR=%BuildRoot%\10\cmake\modules ^
-D SwiftDriver_DIR=%BuildRoot%\11\cmake\modules ^
-D SwiftCrypto_DIR=%BuildRoot%\12\cmake\modules ^
-D SwiftCollections_DIR=%BuildRoot%\13\cmake\modules ^
Expand Down Expand Up @@ -675,17 +571,13 @@ if defined SKIP_UPDATE_CHECKOUT goto :eof

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

:: Always enable symbolic links
git config --global core.symlink true

:: Ensure that we have the files in the original line endings, the swift tests
:: depend on this being the case.
git -C "%SourceRoot%\swift" config --local core.autocrlf input
git -C "%SourceRoot%\swift" checkout-index --force --all

set "args=%args% --skip-repository swift"
set "args=%args% --skip-repository ninja"
set "args=%args% --skip-repository icu"
set "args=%args% --skip-repository swift-integration-tests"
set "args=%args% --skip-repository swift-stress-tester"
set "args=%args% --skip-repository swift-xcode-playground-support"
Expand All @@ -695,20 +587,13 @@ call "%SourceRoot%\swift\utils\update-checkout.cmd" %args% --clone --skip-histor
goto :eof
endlocal

:CloneDependencies
:CloneICU
:: TODO(stevapple) move ICU to update-checkout
setlocal enableextensions enabledelayedexpansion

:: Always enable symbolic links
git config --global core.symlink true

:: FIXME(compnerd) avoid the fresh clone
rd /s /q zlib libxml2 sqlite icu curl

git clone --quiet --no-tags --depth 1 --branch v1.2.11 https://github.com/madler/zlib
git clone --quiet --no-tags --depth 1 --branch v2.9.12 https://github.com/gnome/libxml2
git clone --quiet --no-tags --depth 1 --branch version-3.36.0 https://github.com/sqlite/sqlite
rd /s /q icu
git clone --quiet --no-tags --depth 1 --branch maint/maint-69 https://github.com/unicode-org/icu
git clone --quiet --no-tags --depth 1 --branch curl-7_77_0 https://github.com/curl/curl

goto :eof
endlocal
Expand Down Expand Up @@ -756,16 +641,13 @@ cmake ^

-D CMAKE_INSTALL_PREFIX=%SDKInstallRoot%\usr ^

-D CURL_DIR=%BuildRoot%\Library\curl-7.77.0\usr\lib\cmake\CURL ^
-D CMAKE_TOOLCHAIN_FILE=%SourceRoot%\vcpkg\scripts\buildsystems\vcpkg.cmake ^
-D VCPKG_TARGET_TRIPLET=x64-windows-static-md ^
-D VCPKG_MANIFEST_DIR=%SourceRoot%\swift-installer-scripts\shared\Foundation ^
-D ICU_ROOT=%BuildRoot%\Library\icu-69.1\usr ^
-D ICU_DATA_LIBRARY_RELEASE=%BuildRoot%\Library\icu-69.1\usr\lib\sicudt69.lib ^
-D ICU_I18N_LIBRARY_RELEASE=%BuildRoot%\Library\icu-69.1\usr\lib\sicuin69.lib ^
-D ICU_UC_LIBRARY_RELEASE=%BuildRoot%\Library\icu-69.1\usr\lib\sicuuc69.lib ^
-D LIBXML2_LIBRARY=%BuildRoot%\Library\libxml2-2.9.12\usr\lib\libxml2s.lib ^
-D LIBXML2_INCLUDE_DIR=%BuildRoot%\Library\libxml2-2.9.12\usr\include\libxml2 ^
-D LIBXML2_DEFINITIONS="/DLIBXML_STATIC" ^
-D ZLIB_LIBRARY=%BuildRoot%\Library\zlib-1.2.11\usr\lib\zlibstatic.lib ^
-D ZLIB_INCLUDE_DIR=%BuildRoot%\Library\zlib-1.2.11\usr\include ^
-D dispatch_DIR=%BuildRoot%\3\cmake\modules ^
-D XCTest_DIR=%BuildRoot%\5\cmake\modules ^

Expand Down
9 changes: 7 additions & 2 deletions utils/update_checkout/update-checkout-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,11 @@
"swift-llvm-bindings": {
"remote": { "id": "apple/swift-llvm-bindings" } },
"llvm-project": {
"remote": { "id": "apple/llvm-project" } }
"remote": { "id": "apple/llvm-project" } },
"vcpkg": {
"remote": { "id": "microsoft/vcpkg" },
"platforms": [ "Windows" ]
}
},
"default-branch-scheme": "main",
"branch-schemes": {
Expand Down Expand Up @@ -125,7 +129,8 @@
"swift-markdown": "main",
"swift-nio": "2.31.2",
"swift-nio-ssl": "2.15.0",
"swift-experimental-string-processing": "swift/main"
"swift-experimental-string-processing": "swift/main",
"vcpkg": "2022.07.25"
}
},
"rebranch": {
Expand Down