From 0e68e4de9aaa0e83d9aced70cab3c14807659ad1 Mon Sep 17 00:00:00 2001
From: stevapple <stevapple@icloud.com>
Date: Thu, 10 Sep 2020 22:16:56 +0800
Subject: [PATCH] Fix WindowsBuild.md

---
 docs/WindowsBuild.md | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/docs/WindowsBuild.md b/docs/WindowsBuild.md
index b66f30f0516cc..2d779b451cbca 100644
--- a/docs/WindowsBuild.md
+++ b/docs/WindowsBuild.md
@@ -43,8 +43,8 @@ From the settings application, go to `Update & Security`.  In the `For developer
 
 ## Clone the repositories
 
-1. Clone `apple/llvm-project` into a directory for the toolchain
-2. Clone `apple/swift-cmark`, `apple/swift`, `apple/swift-corelibs-libdispatch`, `apple/swift-corelibs-foundation`, `apple/swift-corelibs-xctest`, `apple/swift-llbuild`, `apple/swift-package-manager` into the toolchain directory
+1. Clone `swift/master` branch of `apple/llvm-project` into the build workspace
+2. Clone `apple/swift-cmark`, `apple/swift`, `apple/swift-corelibs-libdispatch`, `apple/swift-corelibs-foundation`, `apple/swift-corelibs-xctest`, `apple/swift-tools-support-core`, `apple/swift-llbuild`, `apple/swift-argument-parser`, `apple/swift-driver`, `apple/swift-package-manager`, `JPSim/Yams`, `apple/indexstore-db` into the build workspace
 
 - Currently, other repositories in the Swift project have not been tested and may not be supported.
 
@@ -310,12 +310,12 @@ cmake -B S:\b\7 ^
   -D Foundation_DIR=S:\b\3\cmake\modules ^
   -D XCTest_DIR=S:\b\4\cmake\modules ^
   -G Ninja ^
-  -S S:\swift-llbuild
+  -S S:\Yams
 
 ninja -C S:\b\7
 ```
 
-## Build swift-driver
+## Build swift-argument-parser
 
 ```cmd
 cmake -B S:\b\8 ^
@@ -325,16 +325,14 @@ cmake -B S:\b\8 ^
   -D CMAKE_Swift_COMPILER=S:/b/1/bin/swiftc.exe ^
   -D dispatch_DIR=S:\b\2\cmake\modules ^
   -D Foundation_DIR=S:\b\3\cmake\modules ^
-  -D TSC_DIR=S:\b\5\cmake\modules ^
-  -D LLBuild_DIR=S:\b\6\cmake\modules ^
-  -D Yams_DIR=S:\b\7\cmake\modules ^
+  -D XCTest_DIR=S:\b\4\cmake\modules ^
   -G Ninja ^
-  -S S:\swift-driver
+  -S S:\swift-argument-parser
 
 ninja -C S:\b\8
 ```
 
-## Build swift-argument-parser
+## Build swift-driver
 
 ```cmd
 cmake -B S:\b\9 ^
@@ -344,9 +342,12 @@ cmake -B S:\b\9 ^
   -D CMAKE_Swift_COMPILER=S:/b/1/bin/swiftc.exe ^
   -D dispatch_DIR=S:\b\2\cmake\modules ^
   -D Foundation_DIR=S:\b\3\cmake\modules ^
-  -D XCTest_DIR=S:\b\4\cmake\modules ^
+  -D TSC_DIR=S:\b\5\cmake\modules ^
+  -D LLBuild_DIR=S:\b\6\cmake\modules ^
+  -D Yams_DIR=S:\b\7\cmake\modules ^
+  -D ArgumentParser_DIR=S:\b\8\cmake\modules ^
   -G Ninja ^
-  -S S:\swift-argument-parser
+  -S S:\swift-driver
 
 ninja -C S:\b\9
 ```
@@ -365,8 +366,8 @@ cmake -B S:\b\10 ^
   -D TSC_DIR=S:\b\5\cmake\modules ^
   -D LLBuild_DIR=S:\b\6\cmake\modules ^
   -D Yams_DIR=S:\b\7\cmake\modules ^
-  -D SwiftDriver_DIR=S:\b\8\cmake\modules ^
-  -D ArgumentParser_DIR=S:\b\9\cmake\modules ^
+  -D ArgumentParser_DIR=S:\b\8\cmake\modules ^
+  -D SwiftDriver_DIR=S:\b\9\cmake\modules ^
   -G Ninja ^
   -S S:\swift-package-manager
 
@@ -383,7 +384,7 @@ set SWIFTPM_PD_LIBS=S:\b\10\pm
 - Run ninja install:
 
 ```cmd
-ninja -C S:\b\toolchain install
+ninja -C S:\b\1 install
 ```
 
 - Add the Swift on Windows binaries path (`C:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\bin`) to the `PATH` environment variable.