Skip to content

Commit c1e9ace

Browse files
committed
---
yaml --- r: 347163 b: refs/heads/master c: cbc5257 h: refs/heads/master i: 347161: 5825eaf 347159: ebc6bf8
1 parent de3dd2a commit c1e9ace

File tree

2 files changed

+39
-3
lines changed

2 files changed

+39
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: e1ea272cf30ad8dda92fed0a4f7a6eb23cc519ba
2+
refs/heads/master: cbc525732c85358a4a720c20447cfccfa8e2e9d9
33
refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/docs/WindowsBuild.md

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ cmake -G Ninja^
280280
-DCMAKE_SWIFT_COMPILER=S:\b\swift\bin\swiftc.exe^
281281
-DCURL_LIBRARY="S:/curl/builds/libcurl-vc15-x64-release-static-ipv6-sspi-winssl/lib/libcurl_a.lib"^
282282
-DCURL_INCLUDE_DIR="S:/curl/builds/libcurl-vc15-x64-release-static-ipv6-sspi-winssl/include"^
283+
-DENABLE_TESTING=NO^
283284
-DICU_ROOT="S:/thirdparty/icu4c-63_1-Win64-MSVC2017"^
284285
-DLIBXML2_LIBRARY="S:/libxml2/win32/bin.msvc/libxml2_a.lib"^
285286
-DLIBXML2_INCLUDE_DIR="S:/libxml2/include"^
@@ -288,7 +289,6 @@ cmake -G Ninja^
288289
S:\swift-corelibs-foundation
289290
popd
290291
cmake --build S:\b\foundation
291-
292292
```
293293

294294
- Add Foundation to your path:
@@ -321,7 +321,43 @@ cmake --build S:\b\xctest
321321
path S:\b\xctest;%PATH%
322322
```
323323

324-
### 15. Install Swift on Windows
324+
### 15. Test XCTest
325+
326+
```cmd
327+
ninja -C S:\b\xctest check-xctest
328+
```
329+
330+
### 16. Rebuild Foundation
331+
332+
```cmd
333+
mkdir "S:\b\foundation"
334+
pushd "S:\b\foundation
335+
cmake -G Ninja^
336+
-DCMAKE_BUILD_TYPE=RelWithDebInfo^
337+
-DCMAKE_C_COMPILER=clang-cl^
338+
-DCMAKE_SWIFT_COMPILER=S:\b\swift\bin\swiftc.exe^
339+
-DCURL_LIBRARY="S:/curl/builds/libcurl-vc15-x64-release-static-ipv6-sspi-winssl/lib/libcurl_a.lib"^
340+
-DCURL_INCLUDE_DIR="S:/curl/builds/libcurl-vc15-x64-release-static-ipv6-sspi-winssl/include"^
341+
-DENABLE_TESTING=YES^
342+
-DICU_ROOT="S:/thirdparty/icu4c-63_1-Win64-MSVC2017"^
343+
-DLIBXML2_LIBRARY="S:/libxml2/win32/bin.msvc/libxml2_a.lib"^
344+
-DLIBXML2_INCLUDE_DIR="S:/libxml2/include"^
345+
-DFOUNDATION_PATH_TO_LIBDISPATCH_SOURCE=S:\swift-corelibs-libdispatch^
346+
-DFOUNDATION_PATH_TO_LIBDISPATCH_BUILD=S:\b\libdispatch^
347+
-DFOUNDATION_PATH_TO_XCTEST_BUILD=S:\b\xctest^
348+
S:\swift-corelibs-foundation
349+
popd
350+
cmake --build S:\b\foundation
351+
```
352+
353+
### 17. Test Foundation
354+
355+
```cmd
356+
cmake --build S:\b\foundation
357+
ninja -C S:\b\foundation test
358+
```
359+
360+
### 18. Install Swift on Windows
325361

326362
- Run ninja install:
327363

0 commit comments

Comments
 (0)