Skip to content

Commit a680228

Browse files
compnerdcompnerd
authored
Merge pull request #40290 from compnerd/systematic
CI: add swift-system to the dependency tree
2 parents 761e3a5 + c208f28 commit a680228

File tree

1 file changed

+73
-48
lines changed

1 file changed

+73
-48
lines changed

‎utils/build-windows-toolchain.bat‎

Lines changed: 73 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ cmake ^
329329
cmake --build %BuildRoot%\5 || (exit /b)
330330
cmake --build %BuildRoot%\5 --target install || (exit /b)
331331

332-
:: Build swift-tools-support-core
332+
:: Build swift-system
333333
cmake ^
334334
-B %BuildRoot%\6 ^
335335

@@ -345,19 +345,41 @@ cmake ^
345345

346346
-D CMAKE_INSTALL_PREFIX=%InstallRoot% ^
347347

348+
-G Ninja ^
349+
-S %SourceRoot%\swift-system || (exit /b)
350+
cmake --build %BuildRoot%\6 || (exit /b)
351+
cmake --build %BuildRoot%\6 --target install || (exit /b)
352+
353+
:: Build swift-tools-support-core
354+
cmake ^
355+
-B %BuildRoot%\7 ^
356+
357+
-D CMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% ^
358+
-D CMAKE_C_COMPILER=%BuildRoot%/1/bin/clang-cl.exe ^
359+
-D CMAKE_C_FLAGS="/GS- /Oy /Gw /Gy" ^
360+
-D CMAKE_CXX_COMPILER=%BuildRoot%/1/bin/clang-cl.exe ^
361+
-D CMAKE_CXX_FLAGS="/GS- /Oy /Gw /Gy" ^
362+
-D CMAKE_MT=mt ^
363+
-D CMAKE_Swift_COMPILER=%BuildRoot%/1/bin/swiftc.exe ^
364+
-D CMAKE_EXE_LINKER_FLAGS="/INCREMENTAL:NO" ^
365+
-D CMAKE_SHARED_LINKER_FLAGS="/INCREMENTAL:NO" ^
366+
367+
-D CMAKE_INSTALL_PREFIX=%InstallRoot% ^
368+
348369
-D dispatch_DIR=%BuildRoot%\3\cmake\modules ^
349370
-D Foundation_DIR=%BuildRoot%\4\cmake\modules ^
371+
-D SwiftSystem_DIR=%BuildRoot%\6\cmake\modules ^
350372
-D SQLite3_INCLUDE_DIR=%BuildRoot%\Library\sqlite-3.36.0\usr\include ^
351373
-D SQLite3_LIBRARY=%BuildRoot%\Library\sqlite-3.36.0\usr\lib\SQLite3.lib ^
352374

353375
-G Ninja ^
354376
-S %SourceRoot%\swift-tools-support-core || (exit /b)
355-
cmake --build %BuildRoot%\6 || (exit /b)
356-
cmake --build %BuildRoot%\6 --target install || (exit /b)
377+
cmake --build %BuildRoot%\7 || (exit /b)
378+
cmake --build %BuildRoot%\7 --target install || (exit /b)
357379

358380
:: Build llbuild
359381
cmake ^
360-
-B %BuildRoot%\7 ^
382+
-B %BuildRoot%\8 ^
361383

362384
-D CMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% ^
363385
-D CMAKE_C_COMPILER=%BuildRoot%/1/bin/clang-cl.exe ^
@@ -380,12 +402,12 @@ cmake ^
380402

381403
-G Ninja ^
382404
-S %SourceRoot%\llbuild || (exit /b)
383-
cmake --build %BuildRoot%\7 || (exit /b)
384-
cmake --build %BuildRoot%\7 --target install || (exit /b)
405+
cmake --build %BuildRoot%\8 || (exit /b)
406+
cmake --build %BuildRoot%\8 --target install || (exit /b)
385407

386408
:: Build swift-argument-parser
387409
cmake ^
388-
-B %BuildRoot%\8 ^
410+
-B %BuildRoot%\9 ^
389411

390412
-D CMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% ^
391413
-D CMAKE_C_COMPILER=%BuildRoot%/1/bin/clang-cl.exe ^
@@ -405,12 +427,12 @@ cmake ^
405427

406428
-G Ninja ^
407429
-S %SourceRoot%\swift-argument-parser || (exit /b)
408-
cmake --build %BuildRoot%\8 || (exit /b)
409-
cmake --build %BuildRoot%\8 --target install || (exit /b)
430+
cmake --build %BuildRoot%\9 || (exit /b)
431+
cmake --build %BuildRoot%\9 --target install || (exit /b)
410432

411433
:: Build Yams
412434
cmake ^
413-
-B %BuildRoot%\9 ^
435+
-B %BuildRoot%\10 ^
414436

415437
-D CMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% ^
416438
-D CMAKE_C_COMPILER=%BuildRoot%/1/bin/clang-cl.exe ^
@@ -431,12 +453,12 @@ cmake ^
431453

432454
-G Ninja ^
433455
-S %SourceRoot%\Yams || (exit /b)
434-
cmake --build %BuildRoot%\9 || (exit /b)
435-
cmake --build %BuildRoot%\9 --target install || (exit /b)
456+
cmake --build %BuildRoot%\10 || (exit /b)
457+
cmake --build %BuildRoot%\10 --target install || (exit /b)
436458

437459
:: Build swift-driver
438460
cmake ^
439-
-B %BuildRoot%\10 ^
461+
-B %BuildRoot%\11 ^
440462

441463
-D CMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% ^
442464
-D CMAKE_C_COMPILER=%BuildRoot%/1/bin/clang-cl.exe ^
@@ -453,19 +475,20 @@ cmake ^
453475
-D dispatch_DIR=%BuildRoot%\3\cmake\modules ^
454476
-D Foundation_DIR=%BuildRoot%\4\cmake\modules ^
455477
-D XCTest_DIR=%BuildRoot%\5\cmake\modules ^
456-
-D TSC_DIR=%BuildRoot%\6\cmake\modules ^
457-
-D LLBuild_DIR=%BuildRoot%\7\cmake\modules ^
458-
-D ArgumentParser_DIR=%BuildRoot%\8\cmake\modules ^
459-
-D Yams_DIR=%BuildRoot%\9\cmake\modules ^
478+
-D SwiftSystem_DIR=%BuildRoot%\6\cmake\modules ^
479+
-D TSC_DIR=%BuildRoot%\7\cmake\modules ^
480+
-D LLBuild_DIR=%BuildRoot%\8\cmake\modules ^
481+
-D ArgumentParser_DIR=%BuildRoot%\9\cmake\modules ^
482+
-D Yams_DIR=%BuildRoot%\10\cmake\modules ^
460483

461484
-G Ninja ^
462485
-S %SourceRoot%\swift-driver || (exit /b)
463-
cmake --build %BuildRoot%\10 || (exit /b)
464-
cmake --build %BuildRoot%\10 --target install || (exit /b)
486+
cmake --build %BuildRoot%\11 || (exit /b)
487+
cmake --build %BuildRoot%\11 --target install || (exit /b)
465488

466489
:: Build swift-crypto
467490
cmake ^
468-
-B %BuildRoot%\11 ^
491+
-B %BuildRoot%\12 ^
469492

470493
-D CMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% ^
471494
-D CMAKE_C_COMPILER=cl ^
@@ -484,12 +507,12 @@ cmake ^
484507

485508
-G Ninja ^
486509
-S %SourceRoot%\swift-crypto || (exit /b)
487-
cmake --build %BuildRoot%\11 || (exit /b)
488-
cmake --build %BuildRoot%\11 --target install || (exit /b)
510+
cmake --build %BuildRoot%\12 || (exit /b)
511+
cmake --build %BuildRoot%\12 --target install || (exit /b)
489512

490513
:: Build swift-collections
491514
cmake ^
492-
-B %BuildRoot%\12 ^
515+
-B %BuildRoot%\13 ^
493516

494517
-D CMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% ^
495518
-D CMAKE_C_COMPILER=%BuildRoot%/1/bin/clang-cl.exe ^
@@ -505,12 +528,12 @@ cmake ^
505528

506529
-G Ninja ^
507530
-S %SourceRoot%\swift-collections || (exit /b)
508-
cmake --build %BuildRoot%\12 || (exit /b)
509-
cmake --build %BuildRoot%\12 --target install || (exit /b)
531+
cmake --build %BuildRoot%\13 || (exit /b)
532+
cmake --build %BuildRoot%\13 --target install || (exit /b)
510533

511534
:: Build swift-package-manager
512535
cmake ^
513-
-B %BuildRoot%\13 ^
536+
-B %BuildRoot%\14 ^
514537

515538
-D CMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% ^
516539
-D CMAKE_C_COMPILER=%BuildRoot%/1/bin/clang-cl.exe ^
@@ -526,22 +549,23 @@ cmake ^
526549

527550
-D dispatch_DIR=%BuildRoot%\3\cmake\modules ^
528551
-D Foundation_DIR=%BuildRoot%\4\cmake\modules ^
529-
-D TSC_DIR=%BuildRoot%\6\cmake\modules ^
530-
-D LLBuild_DIR=%BuildRoot%\7\cmake\modules ^
531-
-D ArgumentParser_DIR=%BuildRoot%\8\cmake\modules ^
532-
-D Yams_DIR=%BuildRoot%\9\cmake\modules ^
533-
-D SwiftDriver_DIR=%BuildRoot%\10\cmake\modules ^
534-
-D SwiftCrypto_DIR=%BuildRoot%\11\cmake\modules ^
535-
-D SwiftCollections_DIR=%BuildRoot%\12\cmake\modules ^
552+
-D SwiftSystem_DIR=%BuildRoot%\6\cmake\modules ^
553+
-D TSC_DIR=%BuildRoot%\7\cmake\modules ^
554+
-D LLBuild_DIR=%BuildRoot%\8\cmake\modules ^
555+
-D ArgumentParser_DIR=%BuildRoot%\9\cmake\modules ^
556+
-D Yams_DIR=%BuildRoot%\10\cmake\modules ^
557+
-D SwiftDriver_DIR=%BuildRoot%\11\cmake\modules ^
558+
-D SwiftCrypto_DIR=%BuildRoot%\12\cmake\modules ^
559+
-D SwiftCollections_DIR=%BuildRoot%\13\cmake\modules ^
536560

537561
-G Ninja ^
538562
-S %SourceRoot%\swiftpm || (exit /b)
539-
cmake --build %BuildRoot%\13 || (exit /b)
540-
cmake --build %BuildRoot%\13 --target install || (exit /b)
563+
cmake --build %BuildRoot%\14 || (exit /b)
564+
cmake --build %BuildRoot%\14 --target install || (exit /b)
541565

542566
:: Build IndexStoreDB
543567
cmake ^
544-
-B %BuildRoot%\14 ^
568+
-B %BuildRoot%\15 ^
545569

546570
-D BUILD_SHARED_LIBS=YES ^
547571
-D CMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% ^
@@ -561,12 +585,12 @@ cmake ^
561585

562586
-G Ninja ^
563587
-S %SourceRoot%\indexstore-db || (exit /b)
564-
cmake --build %BuildRoot%\14 || (exit /b)
565-
cmake --build %BuildRoot%\14 --target install || (exit /b)
588+
cmake --build %BuildRoot%\15 || (exit /b)
589+
cmake --build %BuildRoot%\15 --target install || (exit /b)
566590

567591
:: Build SourceKit-LSP
568592
cmake ^
569-
-B %BuildRoot%\15 ^
593+
-B %BuildRoot%\16 ^
570594

571595
-D BUILD_SHARED_LIBS=YES ^
572596
-D CMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% ^
@@ -583,18 +607,19 @@ cmake ^
583607

584608
-D dispatch_DIR=%BuildRoot%\3\cmake\modules ^
585609
-D Foundation_DIR=%BuildRoot%\4\cmake\modules ^
586-
-D TSC_DIR=%BuildRoot%\6\cmake\modules ^
587-
-D LLBuild_DIR=%BuildRoot%\7\cmake\modules ^
588-
-D ArgumentParser_DIR=%BuildRoot%\8\cmake\modules ^
589-
-D Yams_DIR=%BuildRoot%\9\cmake\modules ^
590-
-D SwiftPM_DIR=%BuildRoot%\13\cmake\modules ^
591-
-D IndexStoreDB_DIR=%BuildRoot%\14\cmake\modules ^
592-
-D SwiftCollections_DIR=%BuildRoot%\12\cmake\modules ^
610+
-D SwiftSystem_DIR=%BuildRoot%\6\cmake\modules ^
611+
-D TSC_DIR=%BuildRoot%\7\cmake\modules ^
612+
-D LLBuild_DIR=%BuildRoot%\8\cmake\modules ^
613+
-D ArgumentParser_DIR=%BuildRoot%\9\cmake\modules ^
614+
-D Yams_DIR=%BuildRoot%\10\cmake\modules ^
615+
-D SwiftPM_DIR=%BuildRoot%\14\cmake\modules ^
616+
-D IndexStoreDB_DIR=%BuildRoot%\15\cmake\modules ^
617+
-D SwiftCollections_DIR=%BuildRoot%\13\cmake\modules ^
593618

594619
-G Ninja ^
595620
-S %SourceRoot%\sourcekit-lsp || (exit /b)
596-
cmake --build %BuildRoot%\15 || (exit /b)
597-
cmake --build %BuildRoot%\15 --target install || (exit /b)
621+
cmake --build %BuildRoot%\16 || (exit /b)
622+
cmake --build %BuildRoot%\16 --target install || (exit /b)
598623

599624
:: Create Configuration Files
600625
python -c "import plistlib; print(str(plistlib.dumps({ 'DefaultProperties': { 'DEFAULT_USE_RUNTIME': 'MD' } }), encoding='utf-8'))" > %SDKInstallRoot%\SDKSettings.plist

0 commit comments

Comments
 (0)