Skip to content

Commit 4d64f27

Browse files
compnerdbnbarham
authored andcommitted
build: enable macros during the build
Use WiX to extract a future toolchain to allow building the macros support when building the toolchain. We build swift-syntax and now wire that into the build itself.
1 parent ecf0423 commit 4d64f27

File tree

1 file changed

+61
-0
lines changed

1 file changed

+61
-0
lines changed

utils/build-windows-toolchain.bat

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ del /f /q "%UniversalCRTSdkDir%\Include\%UCRTVersion%\um\module.modulemap"
5454
del /f /q "%VCToolsInstallDir%\include\module.modulemap"
5555
del /f /q "%VCToolsInstallDir%\include\vcruntime.apinotes"
5656

57+
call :FetchWiX || (exit /b)
58+
call :FetchX64Toolchain || (exit /b)
5759
call :CloneDependencies || (exit /b)
5860
call :CloneRepositories || (exit /b)
5961

@@ -190,6 +192,33 @@ cmake ^
190192
cmake --build "%BuildRoot%\curl" || (exit /b)
191193
cmake --build "%BuildRoot%\curl" --target install || (exit /b)
192194

195+
path %BuildRoot%\toolchains\swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a\PFiles64\Swift\Runtimes\0.0.0\usr\bin;%BuildRoot%\toolchains\swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a\PFiles64\Swift\Toolchains\0.0.0+Asserts\usr\bin;%Path%
196+
197+
:: Build Swift Syntax
198+
cmake ^
199+
-B "%BuildRoot%\99" ^
200+
201+
-D BUILD_SHARED_LIBS=YES ^
202+
-D CMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% ^
203+
-D CMAKE_C_COMPILER=cl.exe ^
204+
-D CMAKE_C_FLAGS="/GS- /Oy /Gw /Gy" ^
205+
-D CMAKE_CXX_COMPILER=cl ^
206+
-D CMAKE_CXX_FLAGS="/GS- /Oy /Gw /Gy" ^
207+
-D CMAKE_MT=mt ^
208+
-D CMAKE_Swift_COMPILER=%BuildRoot%/toolchains/swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a/PFiles64/Swift/Toolchains/0.0.0+Asserts/usr/bin/swiftc.exe ^
209+
-D CMAKE_Swift_FLAGS="-sdk %BuildRoot%/toolchains/swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a/PFiles64/Swift/Platforms/Windows.platform/Developer/SDKs/Windows.sdk" ^
210+
-D CMAKE_EXE_LINKER_FLAGS="/INCREMENTAL:NO" ^
211+
-D CMAKE_SHARED_LINKER_FLAGS="/INCREMENTAL:NO" ^
212+
213+
-D CMAKE_INSTALL_PREFIX="%InstallRoot%" ^
214+
215+
-D SWIFT_SYNTAX_ENABLE_WMO_PRE_3_26=YES ^
216+
217+
-G Ninja ^
218+
-S %SourceRoot%\swift-syntax || (exit /b)
219+
cmake --build %BuildRoot%\99 || (exit /b)
220+
cmake --build %BuildRoot%\99 --target install || (exit /b)
221+
193222
:: Build Toolchain
194223
cmake ^
195224
-B "%BuildRoot%\1" ^
@@ -207,11 +236,17 @@ cmake ^
207236

208237
-D CMAKE_INSTALL_PREFIX="%InstallRoot%" ^
209238

239+
-D CMAKE_Swift_COMPILER="%BuildRoot%/toolchains/swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a/PFiles64/Swift/Toolchains/0.0.0+Asserts/usr/bin/swiftc.exe" ^
240+
-D CMAKE_Swift_FLAGS="-sdk %BuildRoot%/toolchains/swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a/PFiles64/Swift/Platforms/Windows.platform/Developer/SDKs/Windows.sdk" ^
241+
210242
-D LLVM_DEFAULT_TARGET_TRIPLE=x86_64-unknown-windows-msvc ^
211243

212244
-D PACKAGE_VENDOR="swift.org" ^
213245
-D CLANG_VENDOR="swift.org" ^
214246
-D CLANG_VENDOR_UTI="org.swift" ^
247+
-D LLDB_PYTHON_EXE_RELATIVE_PATH=python.exe ^
248+
-D LLDB_PYTHON_EXT_SUFFIX=.pyd ^
249+
-D LLDB_PYTHON_RELATIVE_PATH=lib/site-packages ^
215250
-D LLVM_APPEND_VC_REV=NO ^
216251
-D LLVM_VERSION_SUFFIX="" ^
217252

@@ -226,9 +261,11 @@ cmake ^
226261
-D LLVM_EXTERNAL_CMARK_SOURCE_DIR="%SourceRoot%\cmark" ^
227262
-D PYTHON_HOME=%PYTHON_HOME% ^
228263
-D PYTHON_EXECUTABLE=%PYTHON_HOME%\python.exe ^
264+
-D SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR="%BuildRoot%\99" ^
229265
-D SWIFT_PATH_TO_LIBDISPATCH_SOURCE="%SourceRoot%\swift-corelibs-libdispatch" ^
230266
-D SWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE="%SourceRoot%\swift-syntax" ^
231267
-D SWIFT_PATH_TO_STRING_PROCESSING_SOURCE=%SourceRoot%\swift-experimental-string-processing ^
268+
-D SWIFT_PATH_TO_SWIFT_SDK="%BuildRoot%/toolchains/swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a/PFiles64/Swift/Platforms/Windows.platform/Developer/SDKs/Windows.sdk"
232269

233270
-G Ninja ^
234271
-S llvm-project\llvm || (exit /b)
@@ -815,6 +852,30 @@ git clone --quiet --no-tags --depth 1 --branch curl-7_77_0 https://github.com/cu
815852
goto :eof
816853
endlocal
817854

855+
:FetchWiX
856+
setlocal enableextensions enabledelayedexpansion
857+
858+
curl.exe -sL https://www.nuget.org/api/v2/package/wix/4.0.1 -o wix-4.0.1.zip
859+
md WiX-4.0.1 || exit (/b)
860+
cd WiX-4.0.1 || exit (/b)
861+
tar -xf ../wix-4.0.1.zip || exit (/b)
862+
863+
goto :eof
864+
endlocal
865+
866+
:FetchX64Toolchain
867+
setlocal enableextensions enabledelayedexpansion
868+
869+
curl.exe -k -sOL "https://download.swift.org/development/windows10/swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a/swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a-windows10.exe" || (exit /b)
870+
"WiX-4.0.1\tools\net6.0\any\wix.exe" burn extract swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a-windows10.exe -o %BuildRoot%\toolchains || (exit /b)
871+
msiexec.exe /qn /a "%BuildRoot%\toolchains\a0" TARGETDIR="%BuildRoot%\toolchains\swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a\PFiles64\Swift\Runtimes\0.0.0\usr\bin\" || (exit /b)
872+
msiexec.exe /qn /a "%BuildRoot%\toolchains\a1" TARGETDIR="%BuildRoot%\toolchains\swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a\" || (exit /b)
873+
msiexec.exe /qn /a "%BuildRoot%\toolchains\a2" TARGETDIR="%BuildRoot%\toolchains\swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a\" || (exit /b)
874+
msiexec.exe /qn /a "%BuildRoot%\toolchains\a5" TARGETDIR="%BuildRoot%\toolchains\swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a\" || (exit /b)
875+
876+
goto :eof
877+
endlocal
878+
818879
:TestSwift
819880
setlocal enableextensions enabledelayedexpansion
820881

0 commit comments

Comments
 (0)