From b7b0a25acb78373f6a58353df716a9954d921504 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Sat, 25 Jan 2020 16:27:06 -0800 Subject: [PATCH 1/2] build: remove meaningless dependency --- lib/Option/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/Option/CMakeLists.txt b/lib/Option/CMakeLists.txt index bb58724f945e6..70280746f2b28 100644 --- a/lib/Option/CMakeLists.txt +++ b/lib/Option/CMakeLists.txt @@ -1,7 +1,6 @@ add_swift_host_library(swiftOption STATIC Options.cpp - SanitizerOptions.cpp - FILE_DEPENDS SwiftOptions) + SanitizerOptions.cpp) add_dependencies(swiftOption SwiftOptions) target_link_libraries(swiftOption PRIVATE From ec46f5b987300d42325ca1b556dd2bcdb1dad340 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Sat, 1 Feb 2020 16:14:26 -0800 Subject: [PATCH 2/2] docs: update the repository name (NFC) swift-windows was renamed to swift-build. Update the repository name to reflect that. --- docs/AndroidBuild.md | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/docs/AndroidBuild.md b/docs/AndroidBuild.md index 03d5f9eddad27..c45f77bec0644 100644 --- a/docs/AndroidBuild.md +++ b/docs/AndroidBuild.md @@ -11,9 +11,9 @@ Windows. 1. Configure git to work with Unix file endings 1. Clone `apple/swift-llvm` into a directory named `llvm` 1. Clone `apple/swift-corelibs-libdispatch` into a directory named `swift-corelibs-libdispatch` -1. Clone `apple/swift-corelibs-foundation` into a directory named `swift-corelibs-foundation`G +1. Clone `apple/swift-corelibs-foundation` into a directory named `swift-corelibs-foundation` 1. Clone `apple/swift-corelibs-xctest` into a directory named `swift-corelibs-xctest` -1. Clone `compnerd/swift-windows` into a directory named `swift-windows` +1. Clone `compnerd/swift-build` into a directory named `swift-build` - Currently, other repositories in the Swift project have not been tested and may not be supported. @@ -31,28 +31,27 @@ git clone https://github.com/apple/swift-llvm llvm git clone https://github.com/apple/swift-corelibs-libdispatch swift-corelibs-libdispatch git clone https://github.com/apple/swift-corelibs-foundation swift-corelibs-foundation git clone https://github.com/apple/swift-corelibs-xctest swift-corelibs-xctest -git clone https://github.com/compnerd/swift-windows swift-windows +git clone https://github.com/compnerd/swift-build swift-build ``` ## 1. Acquire the lastest toolchain and dependencies 1. Download the toolchain, ICU, libxml2, and curl for android from - [Azure](https://dev.azure.com/compnerd/windows-swift) into `S:\b\a\Library`. + [Azure](https://dev.azure.com/compnerd/swift-build) into `S:\b\a\Library`. -- You can alternatively use `Download-AndroidArtifacts.ps1` from - [compnerd/windows-swift](https://www.github.com/compnerd/windows-swift) under - the utilities directory. This will implicitly setup the requisite directory - structure. +- You can alternatively use `swift-build.py` from + [compnerd/swift-build](https://www.github.com/compnerd/swift-build) under + the utilities directory. ## 1. Configure LLVM ```cmd md S:\b\a\llvm cd S:\b\a\llvm -cmake -C S:\swift-windows\cmake\caches\android-armv7.cmake ^ +cmake -C S:\swift-build\cmake\caches\android-armv7.cmake ^ -G Ninja ^ -DCMAKE_BUILD_TYPE=Release ^ - -DCMAKE_TOOLCHAIN_FILE=S:\swift-windows\cmake\toolchains\android.toolchain.cmake ^ + -DCMAKE_TOOLCHAIN_FILE=S:\swift-build\cmake\toolchains\android.toolchain.cmake ^ -DANDROID_ALTERNATE_TOOLCHAIN=S:/b/a/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr ^ -DLLVM_HOST_TRIPLE=armv7-unknown-linux-androideabi ^ S:/llvm @@ -66,12 +65,12 @@ cmake -C S:\swift-windows\cmake\caches\android-armv7.cmake ```cmd md S:\b\a\stdlib cd S:\b\a\stdlib -cmake -C S:\windows-swift\cmake\caches\android-armv7.cmake ^ - -C S:\windows-swift\cmake\caches\swift-stdlib-android-armv7.cmake ^ +cmake -C S:\swift-build\cmake\caches\android-armv7.cmake ^ + -C S:\swift-build\cmake\caches\swift-stdlib-android-armv7.cmake ^ -G Ninja ^ -DCMAKE_BUILD_TYPE=RelWithDebInfo ^ -DCMAKE_INSTALL_PREFIX=S:/b/a/Library/Developer/Platforms/android.platform/Developer/SDKs/android.sdk/usr ^ - -DCMAKE_TOOLCHAIN_FILE=S:\windows-swift\cmake\toolchains\android.toolchain.cmake ^ + -DCMAKE_TOOLCHAIN_FILE=S:\swift-build\cmake\toolchains\android.toolchain.cmake ^ -DANDROID_ALTERNATE_TOOLCHAIN=S:/b/a/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr ^ -DLLVM_DIR=S:/b/a/llvm/lib/cmake/llvm ^ -DSWIFT_NATIVE_SWIFT_TOOLS_PATH=S:/b/a/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin ^ @@ -92,14 +91,14 @@ ninja install ```cmd md S:\b\a\libdispatch cd S:\b\a\libdispatch -cmake -C S:\windows-swift\cmake\caches\android-armv7.cmake ^ +cmake -C S:\swift-build\cmake\caches\android-armv7.cmake ^ -DSWIFT_ANDROID_SDK=S:/b/a/Library/Developer/Platforms/android.platform/Developer/SDKs/android.sdk ^ - -C S:\windows-swift\cmake\caches\android-armv7-swift-flags.cmake ^ + -C S:\swift-build\cmake\caches\android-armv7-swift-flags.cmake ^ -G Ninja ^ -DCMAKE_BUILD_TYPE=RelWithDebInfo ^ -DCMAKE_INSTALL_PREFIX=S:/b/a/Library/Developer/Platforms/android.platform/Developer/SDKs/android.sdk/usr ^ -DCMAKE_SWIFT_COMPILER=S:/b/a/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/swiftc.exe ^ - -DCMAKE_TOOLCHAIN_FILE=S:\windows-swift\cmake\toolchains\android.toolchain.cmake ^ + -DCMAKE_TOOLCHAIN_FILE=S:\swift-build\cmake\toolchains\android.toolchain.cmake ^ -DANDROID_ALTERNATE_TOOLCHAIN=S:/b/a/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr ^ -DENABLE_SWIFT=YES ^ -DENABLE_TESTING=NO ^ @@ -112,14 +111,14 @@ ninja ```cmd md S:\b\a\foundation cd S:\b\a\foundation -cmake -C S:\windows-swift\cmake\caches\android-armv7.cmake ^ +cmake -C S:\swift-build\cmake\caches\android-armv7.cmake ^ -DSWIFT_ANDROID_SDK=S:/b/a/Library/Developer/Platforms/android.platform/Developer/SDKs/android.sdk ^ - -C S:\windows-swift\cmake\caches\android-armv7-swift-flags.cmake ^ + -C S:\swift-build\cmake\caches\android-armv7-swift-flags.cmake ^ -G Ninja ^ -DCMAKE_BUILD_TYPE=RelWithDebInfo ^ -DCMAKE_INSTALL_PREFIX=S:/b/a/Library/Developer/Platforms/android.platform/Developer/SDKs/android.sdk/usr ^ -DCMAKE_SWIFT_COMPILER=S:/b/a/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/swiftc.exe ^ - -DCMAKE_TOOLCHAIN_FILE=S:\windows-swift\cmake\toolchains\android.toolchain.cmake ^ + -DCMAKE_TOOLCHAIN_FILE=S:\swift-build\cmake\toolchains\android.toolchain.cmake ^ -DANDROID_ALTERNATE_TOOLCHAIN=S:/b/a/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr ^ -DCURL_LIBRARY=S:/b/a/Library/libcurl-development/usr/lib/libcurl.a ^ -DCURL_INCLUDE_DIR=S:/b/a/Library/libcurl-development/usr/include ^ @@ -141,13 +140,13 @@ ninja ```cmd md S:\b\a\xctest cd S:\b\a\xctest -cmake -C S:\swift-windows\cmake\caches\android-armv7.cmake ^ - -C S:\swift-windows\cmake\caches\android-armv7-swift-flags.cmake ^ +cmake -C S:\swift-build\cmake\caches\android-armv7.cmake ^ + -C S:\swift-build\cmake\caches\android-armv7-swift-flags.cmake ^ -G Ninja ^ -DCMAKE_BUILD_TYPE=RelWithDebInfo ^ -DCMAKE_INSTALL_PREFIX=S:/b/a/Library/Developer/Platforms/android.platform/Developer/SDKs/android.sdk/usr ^ -DCMAKE_SWIFT_COMPILER=S:/b/a/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/swiftc.exe ^ - -DCMAKE_TOOLCHAIN_FILE=S:\swift-windows\cmake\toolchains\android.toolchain.cmake ^ + -DCMAKE_TOOLCHAIN_FILE=S:\swift-build\cmake\toolchains\android.toolchain.cmake ^ -DANDROID_ALTERNATE_TOOLCHAIN=S:/b/a/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr ^ -DSWIFT_ANDROID_SDK=S:/b/a/Library/Developer/Platforms/andrfoid.platform/Developer/SDKs/android.sdk ^ -DXCTEST_PATH_TO_FOUNDATION_BUILD=S:/b/a/foundation ^