Merge branch 'rebased-changes'

Author: aemino

.gitignore

@@ -5,6 +5,7 @@ xcuserdata
 *~
 \#*
 .\#*
+.*.sw[nop]
 *.xcscmblueprint
 /default.profraw
 *.xcodeproj

CMakeLists.txt

@@ -0,0 +1,28 @@
+# This source file is part of the Swift.org open source project
+#
+# Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See http://swift.org/LICENSE.txt for license information
+# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+
+cmake_minimum_required(VERSION 3.15.1)
+
+project(SwiftPM LANGUAGES C Swift)
+
+set(CMAKE_Swift_LANGUAGE_VERSION 4.2)
+set(CMAKE_Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift)
+
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
+option(BUILD_SHARED_LIBS "Build shared libraryes by default" YES)
+
+if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
+  execute_process(COMMAND xcrun --sdk macosx --show-sdk-path
+    OUTPUT_VARIABLE CMAKE_OSX_SYSROOT
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+endif()
+
+add_subdirectory(Sources)

CODEOWNERS

@@ -1,27 +1,27 @@
-This file is a list of the people responsible for ensuring that patches for a
-particular part of Swift are reviewed, either by themselves or by someone else.
-They are also the gatekeepers for their part of Swift, with the final word on
-what goes in or not.
-
-The list is sorted by surname and formatted to allow easy grepping and
-beautification by scripts.  The fields are: name (N), email (E), web-address
-(W), PGP key ID and fingerprint (P), description (D), and snail-mail address
-(S).
-
-N: Ankit Aggarwal
-E: [email protected]
-D: Package Manager
-
-N: Anders Bertelrud
-E: [email protected]
-D: Package Manager
-
-N: Daniel Dunbar
-E: [email protected]
-D: Package Manager
+# This file is a list of the people responsible for ensuring that patches for a
+# particular part of Swift are reviewed, either by themselves or by someone else.
+# They are also the gatekeepers for their part of Swift, with the final word on
+# what goes in or not.
+# 
+# The list is sorted by surname and formatted to allow easy grepping and
+# beautification by scripts.  The fields are: name (N), email (E), web-address
+# (W), PGP key ID and fingerprint (P), description (D), and snail-mail address
+# (S).
+ 
+# N: Ankit Aggarwal
+# E: [email protected]
+# D: Package Manager
+# 
+# N: Anders Bertelrud
+# E: [email protected]
+# D: Package Manager
+ 
+# N: Daniel Dunbar
+# E: [email protected]
+# D: Package Manager
 
 ###
 
 # The following lines are used by GitHub to automatically recommend reviewers.
 
-* @aciidb0mb3r
+* @aciidb0mb3r @abertelrud @neonichu

Documentation/Development.md

@@ -2,90 +2,97 @@
 
 This document contains information on building and testing the Swift Package Manager.
 
-## Using Swift compiler build script
+## Using the Swift Compiler Build Script
 
 The official way to build and test is using the Swift compiler build script.
 First, follow the instructions provided
 [here](https://github.com/apple/swift/blob/master/README.md#getting-started) and
 then run one of these commands from the Swift Package Manager directory:
 
-##### macOS:
+### macOS
 
 ```sh
 $ ../swift/utils/build-script -R --llbuild --swiftpm
 ```
 
-##### Linux:
+### Linux
 
 ```sh
 $ ../swift/utils/build-script -R --llbuild --swiftpm --xctest --foundation --libdispatch
 ```
 
-This will build compiler and friends in `build/` directory. It takes about ~1
+This will build the compiler and friends in the `build/` directory. It takes about 1
 hour for the initial build process. However, it is not really required to build
 the entire compiler in order to work on the Package Manager. A faster option is
 using a [snapshot](https://swift.org/download/#releases) from swift.org.
 
-## Using trunk snapshot
-
-1. [Download](https://swift.org/download/#snapshots) and install latest Trunk Development snapshot.
-2. Run the following command depending on your platform.
-
-	### macOS
-	```sh
-	$ export TOOLCHAINS=swift
-	# Verify that we're able to find the swift compiler from the installed toolchain.
-	$ xcrun --find swift
-	/Library/Developer/Toolchains/swift-latest.xctoolchain/usr/bin/swift
-	```
-	### Linux
-	```sh
-	$ export PATH=/path/to/swift-toolchain/usr/bin:"${PATH}"
-	# Verify that we're able to find the swift compiler from the installed toolchain.
-	$ which swift
-	/path/to/swift-toolchain/usr/bin/swift
-	```
-
-3. Clone [llbuild](https://github.com/apple/swift-llbuild) next to the package manager directory.
-
-    ```sh
-    $ git clone https://github.com/apple/swift-llbuild llbuild
-    $ ls
-    swiftpm llbuild
-    ```
-
-    Note: Make sure the directory for llbuild is called "llbuild" and not
+## Using a Trunk Snapshot
+
+1. [Download](https://swift.org/download/#snapshots) and install the latest Trunk Development snapshot.
+2. Run the following commands depending on your platform.
+
+### macOS
+
+```sh
+$ export TOOLCHAINS=swift
+# Verify that we're able to find the swift compiler from the installed toolchain.
+$ xcrun --find swift
+/Library/Developer/Toolchains/swift-latest.xctoolchain/usr/bin/swift
+```
+
+### Linux
+
+```sh
+$ export PATH=/path/to/swift-toolchain/usr/bin:"${PATH}"
+# Verify that we're able to find the swift compiler from the installed toolchain.
+$ which swift
+/path/to/swift-toolchain/usr/bin/swift
+```
+
+3. Clone [llbuild](https://github.com/apple/swift-llbuild) beside the package manager directory.
+
+```sh
+$ git clone https://github.com/apple/swift-llbuild llbuild
+$ ls
+swiftpm llbuild
+```
+
+Note: Make sure the directory for llbuild is called "llbuild" and not
     "swift-llbuild".
- 
-4. Building the Swift Package Manager.
-
-	```sh
-	$ cd swiftpm
-	$ Utilities/bootstrap
-	```
-	
-    This command will build the Package Manager inside `.build/` directory.
+
+4. Build the Swift Package Manager.
+
+```sh
+$ cd swiftpm
+$ Utilities/bootstrap
+```
+
+ Note: The bootstrap script requires having [CMake](https://cmake.org/) and [Ninja](https://ninja-build.org/) installed. Please refer to the [Swift project repo](https://github.com/apple/swift/blob/master/README.md#macos) for installation instructions.
+
+This command builds the Package Manager inside the `.build/` directory.
     Run the bootstrap script to rebuild after making a change to the source
     code.
-	
-    You can also use the built binaries: `swift-build`, `swift-package`,
+
+   You can also use the built binaries: `swift-build`, `swift-package`,
     `swift-test`, `swift-run`.
-	
-	### Example:
-	```sh
-	$ cd /tmp && mkdir hello && cd hello
-	$ /path/to/swiftpm/.build/x86_64-apple-macosx/debug/swift-package init
-	$ /path/to/swiftpm/.build/x86_64-apple-macosx/debug/swift-build
-	```
 
-5. Testing the Swift Package Manager.
+### Example
 
-	```sh
-	$ Utilities/bootstrap test --test-parallel
-	```
-	Use this command to run the tests. All tests must pass before a patch can be accepted.
+```sh
+$ cd /tmp && mkdir hello && cd hello
+$ /path/to/swiftpm/.build/x86_64-apple-macosx/debug/swift-package init
+$ /path/to/swiftpm/.build/x86_64-apple-macosx/debug/swift-build
+```
 
-## Self-hosting
+5. Test the Swift Package Manager.
+
+```sh
+$ Utilities/bootstrap test --test-parallel
+```
+
+Use this command to run the tests. All tests must pass before a patch can be accepted.
+
+## Self Hosting a Swift Package
 
 It is possible to build SwiftPM with itself using a special script that is
 emitted during bootstrapping. This is useful when you want to rebuild just the
@@ -98,44 +105,44 @@ $ cd swiftpm
 $ .build/x86_64-apple-macosx/debug/spm build
 
 # Run a single test.
-$ .build/x86_64-apple-macosx/debug/spm test --filter BasicTests.GraphAlgorithmsTests/testCycleDetection
+$ .build/x86_64-apple-macosx/debug/spm test --filter PackageGraphTests.DependencyResolverTests/testBasics
 ```
 
-Note: If you make any changes to `PackageDescription` runtime-related targets,
+Note: If you make any changes to the `PackageDescription` runtime-related targets,
 you **will** need to rebuild using the bootstrap script.
 
 ## Developing using Xcode
 
-Run the following command to generate a Xcode project.
+Run the following commands to generate and open an Xcode project.
 
 ```sh
 $ Utilities/bootstrap --generate-xcodeproj
 generated: ./SwiftPM.xcodeproj
 $ open SwiftPM.xcodeproj
 ```
 
-Note: If you make any changes to `PackageDescription` or `PackageDescription4`
-target, you will need to regenerate the Xcode project using the above command.
+Note: If you make any changes to the `PackageDescription` or `PackageDescription4`
+targets, you will need to regenerate the Xcode project using the above command.
 
-## Continuous Integration
+## Using Continuous Integration
 
 SwiftPM uses [swift-ci](https://ci.swift.org) infrastructure for its continuous integration testing. The
-bots can be triggered on pull-requests if you have commit access, otherwise ask
+bots can be triggered on pull-requests if you have commit access. Otherwise, ask
 one of the code owners to trigger them for you. The following commands are supported:
 
-### @swift-ci please smoke test
+    @swift-ci please smoke test
 
-Run tests with trunk compiler and other projects. This is **required** before
+Run tests with the trunk compiler and other projects. This is **required** before
 a pull-request can be merged.
 
-### @swift-ci test with toolchain
+    @swift-ci test with toolchain
 
-Run tests with latest trunk snapshot. This has fast turnaround times so it can
+Run tests with the latest trunk snapshot. This has fast turnaround times so it can
 be used to get quick feedback.
 
-Note: Smoke tests are still required for merging the pull-requests.
+Note: Smoke tests are still required for merging pull-requests.
 
-## Running the performance tests
+## Running the Performance Tests
 
 Running performance tests is a little awkward right now. First, generate the
 Xcode project using this command:
@@ -152,38 +159,50 @@ For contributors on macOS who need to test on Linux, install Docker and use the
 following commands:
 
 ```sh
-$ Utilities/Docker/docker-utils build # will build an image with the latest swift snapshot
-$ Utilities/Docker/docker-utils bootstrap # will bootstrap SwiftPM on the linux container
-$ Utilities/Docker/docker-utils run bash # to run an interactive bash shell in the container
+$ Utilities/Docker/docker-utils build # will build an image with the latest Swift snapshot
+$ Utilities/Docker/docker-utils bootstrap # will bootstrap SwiftPM on the Linux container
+$ Utilities/Docker/docker-utils run bash # to run an interactive Bash shell in the container
 $ Utilities/Docker/docker-utils swift-build # to run swift-build in the container
 $ Utilities/Docker/docker-utils swift-test # to run swift-test in the container
 $ Utilities/Docker/docker-utils swift-run # to run swift-run in the container
 ```
 
-## Using custom Swift compilers
+## Using Custom Swift Compilers
 
-SwiftPM needs Swift compiler to parse Package.swift manifest files and to
-compile Swift source files. You can use `SWIFT_EXEC` and `SWIFT_EXEC_MANIFEST`
+SwiftPM needs the Swift compiler to parse `Package.swift` manifest files and to
+compile Swift source files. You can use the `SWIFT_EXEC` and `SWIFT_EXEC_MANIFEST`
 environment variables to control which compiler to use for these operations.
 
 `SWIFT_EXEC_MANIFEST`: This variable controls which compiler to use for parsing
-Package.swift manifest files. The lookup order for the manifest compiler is:
-SWIFT_EXEC_MANIFEST, swiftc adjacent to swiftpm binaries, SWIFT_EXEC
+`Package.swift` manifest files. The lookup order for the manifest compiler is:
+`SWIFT_EXEC_MANIFEST`, `swiftc` adjacent to the `swiftpm` binaries, then `SWIFT_EXEC`
 
 `SWIFT_EXEC`: This variable controls which compiler to use for compiling Swift
-sources. The lookup order for the sources compiler is: SWIFT_EXEC, swiftc adjacent
-to swiftpm binaries. This is also useful for Swift compiler developers when they
+sources. The lookup order for the sources' compiler is: `SWIFT_EXEC`, then `swiftc` adjacent
+to `swiftpm` binaries. This is also useful for Swift compiler developers when they
 want to use a debug compiler with SwiftPM.
 
 ```sh
 $ SWIFT_EXEC=/path/to/my/built/swiftc swift build
 ```
 
-## Overriding path to the runtime libraries
+## Overriding the Path to the Runtime Libraries
 
-SwiftPM computes the path of runtime libraries relative to where it is
+SwiftPM computes the path of its runtime libraries relative to where it is
 installed. This path can be overridden by setting the environment variable
-`SWIFTPM_PD_LIBS` to a directory containing the libraries. This can be a list of
-absolute search paths separated by colon (":"). SwiftPM will choose the first
-path which exists on disk. If none of the path are present on disk, it will fall
+`SWIFTPM_PD_LIBS` to a directory containing the libraries, or a colon-separated list of
+absolute search paths. SwiftPM will choose the first
+path which exists on disk. If none of the paths are present on disk, it will fall
 back to built-in computation.
+
+## Skipping SwiftPM tests
+
+SwiftPM has a hidden env variable `_SWIFTPM_SKIP_TESTS_LIST` that can be used
+to skip a list of tests. This value of the variable is either a file path that contains a
+newline separated list of tests to skip, or a colon-separated list of tests.
+
+This is only a development feature and should be considered _unsupported_.
+
+## Making changes in TSC targets
+
+All targets with the prefix TSC define the interface for the tools support core. Those APIs might be used in other projects as well and need to be updated in this repository by copying their sources directories to the TSC repository. The repository can be found [here](https://github.com/apple/swift-tools-support-core).