Merge branch 'master' into feature/easier-install

Author: BrandonMathis

CMakeLists.txt

@@ -54,10 +54,6 @@ option(SWIFT_INCLUDE_DOCS
     "Create targets for building docs."
     TRUE)
 
-option(SWIFT_ENABLE_TARGET_LINUX
-    "Enable compiler support for targeting Linux"
-    TRUE)
-
 set(SWIFT_VERSION "2.2" CACHE STRING
     "The user-visible version of the Swift compiler")
 set(SWIFT_VENDOR "" CACHE STRING
@@ -401,6 +397,19 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
 
   set(SWIFT_PRIMARY_VARIANT_SDK_default "LINUX")
   set(SWIFT_PRIMARY_VARIANT_ARCH_default "x86_64")
+elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
+  configure_sdk_unix(FREEBSD "FreeBSD" "freebsd" "freebsd" "x86_64" "x86_64-freebsd10")
+
+  set(CMAKE_EXECUTABLE_FORMAT "ELF")
+
+  set(SWIFT_HOST_VARIANT "freebsd" CACHE STRING
+      "Deployment OS for Swift host tools (the compiler) [freebsd].")
+
+  set(SWIFT_HOST_VARIANT_SDK "FREEBSD")
+  set(SWIFT_HOST_VARIANT_ARCH "x86_64")
+
+  set(SWIFT_PRIMARY_VARIANT_SDK_default "FREEBSD")
+  set(SWIFT_PRIMARY_VARIANT_ARCH_default "x86_64")
 elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
   # Set defaults.
 

CONTRIBUTING.md

@@ -0,0 +1,10 @@
+By submitting a pull request, you represent that you have the right to license
+your contribution to Apple and the community, and agree by submitting the patch
+that your contributions are licensed under the [Swift
+license](https://swift.org/LICENSE.txt).
+
+---
+
+Before submitting the pull request, please make sure you have tested your
+changes and that they follow the Swift project [guidelines for contributing
+code](https://swift.org/contributing/#contributing-code).

README.md

@@ -1,9 +1,10 @@
+<img src="https://swift.org/assets/images/swift.svg" alt="Swift logo" height="70" >
 # Swift Programming Language
 
 **Welcome to Swift!**
 
 Swift is a high-performance system programming language.  It has a clean
-and modern syntax, and offers seamless access to existing C and Objective-C code
+and modern syntax, offers seamless access to existing C and Objective-C code
 and frameworks, and is memory safe (by default).
 
 Although inspired by Objective-C and many other languages, Swift is not itself a
@@ -15,12 +16,12 @@ modules, eliminating the need for headers and the code duplication they entail.
 
 ## Documentation
 
-To read the documentation, start by installing the Sphinx documentation
-generator tool (http://sphinx-doc.org, just run `easy_install -U Sphinx` from
-the command line and you're good to go).  Once you have that, you can build the
-Swift documentation by going into `docs` and typing `make`.  This compiles
-the `.rst` files in the `docs` directory into HTML in the `docs/_build/html`
-directory.
+To read the documentation, start by installing the 
+[Sphinx](http://sphinx-doc.org) documentation generator tool (just run 
+`easy_install -U Sphinx` from the command line and you're good to go). Once you
+ have that, you can build the Swift documentation by going into `docs` and 
+typing `make`.  This compiles the `.rst` files in the `docs` directory into 
+HTML in the `docs/_build/html` directory.
 
 Once built, the best place to start is with the Swift white paper, which gives a
 tour of the language (in `docs/_build/html/whitepaper/index.html`).
@@ -66,7 +67,7 @@ compiler for C++14 support and create a symlink:
 
 ### Getting Sources for Swift and Related Projects
 
-	For those checking out sources as read-only:
+For those checking out sources as read-only:
 
      git clone https://github.com/apple/swift.git swift
      git clone https://github.com/apple/swift-llvm.git llvm
@@ -78,9 +79,9 @@ compiler for C++14 support and create a symlink:
      git clone https://github.com/apple/swift-corelibs-xctest.git
      git clone https://github.com/apple/swift-corelibs-foundation.git
 
-	For those who plan on regular making direct commits, cloning over
-	SSH may provide a better experience (which requires uploading 
-	SSH keys to GitHub):
+For those who plan on regularly making direct commits, cloning over
+SSH may provide a better experience (which requires uploading 
+SSH keys to GitHub):
 
      git clone [email protected]:apple/swift.git swift
      git clone [email protected]:apple/swift-llvm.git llvm
@@ -106,6 +107,10 @@ for building Swift and is the default configuration generated by CMake. If
 you're on OS X or don't install it as part of your Linux distribution, clone
 it next to the other projects and it will be bootstrapped automatically:
 
+    git clone https://github.com/martine/ninja.git
+
+or
+
     git clone [email protected]:martine/ninja.git
 
 You can also install CMake and Ninja on OS X using a third-party

apinotes/README.md

@@ -25,7 +25,7 @@ Swift signatures of imported Objective-C APIs. Compiled API notes
 files reside in the Swift module directory, i.e., the same directory
 where the `.swiftmodule` file would reside for the Swift overlay of
 that module. For system modules, the path depends on the platform
-and architecture
+and architecture.
 
 Platform  | Path
 :------------- | :-------------

cmake/modules/AddSwift.cmake

@@ -151,6 +151,8 @@ function(_add_variant_link_flags
 
   if("${sdk}" STREQUAL "LINUX")
     list(APPEND result "-lpthread" "-ldl")
+  elseif("${sdk}" STREQUAL "FREEBSD")
+    # No extra libraries required.
   else()
     list(APPEND result "-lobjc")
   endif()

docs/DriverInternals.rst

@@ -114,7 +114,7 @@ Analysis` for more information.
 The Compilation's TaskQueue controls the low-level aspects of managing
 subprocesses. Multiple Jobs may execute simultaneously, but communication with
 the parent process (the driver) is handled on a single thread. The level of
-parellelism may be controlled by a compiler flag.
+parallelism may be controlled by a compiler flag.
 
 If a Job does not finish successfully, the Compilation needs to record which
 jobs have failed, so that they get rebuilt next time the user tries to build

docs/TextFormatting.rst

@@ -129,8 +129,7 @@ Debug Printing
 
 Via compiler magic, *everything* conforms to the ``CustomDebugStringConvertible``
 protocol. To change the debug representation for a type, you don't
-need to declare conformance: simply give the type a ``debugFormat()``
-::
+need to declare conformance: simply give the type a ``debugFormat()``::
 
   /// \brief A thing that can be printed in the REPL and the Debugger
   protocol CustomDebugStringConvertible {
@@ -199,7 +198,7 @@ Because it's not always efficient to construct a ``String``
 representation before writing an object to a stream, we provide a
 ``Streamable`` protocol, for types that can write themselves into an
 ``OutputStream``. Every ``Streamable`` is also a ``CustomStringConvertible``,
-naturally ::
+naturally::
 
   protocol Streamable : CustomStringConvertible {
     func writeTo<T: OutputStream>(target: [inout] T)
@@ -426,7 +425,7 @@ would also make ``OutputStream`` adapters a *bit* simpler to use
 because you'd never need to “write back” explicitly onto the target
 stream. However, stateful ``OutputStream`` adapters would still need a
 ``close()`` method, which makes a perfect place to return a copy of
-the underlying stream, which can then be “written back.”  :
+the underlying stream, which can then be “written back”:
 
 .. parsed-literal::
 

docs/TypeChecker.rst

@@ -319,7 +319,7 @@ and types generated from the primary expression kinds are:
   of some type.
 
 **Ternary operator**
-  A ternary operator``x ? y : z`` generates a number of
+  A ternary operator ``x ? y : z`` generates a number of
   constraints. The type ``T(x)`` must conform to the ``LogicValue``
   protocol to determine which branch is taken. Then, a new type
   variable ``T0`` is introduced to capture the result type, and the
@@ -805,7 +805,7 @@ an overloaded function. Additionally, when comparing two solutions to
 the same constraint system, overload sets present in both solutions
 can be found by comparing the locators for each of the overload
 choices made in each solution. Naturally, all of these operations
-require locators to be uniqued, which occurs in the constraint system
+require locators to be unique, which occurs in the constraint system
 itself.
 
 Simplifying Locators

docs/proposals/Error Handling.rst

@@ -20,7 +20,7 @@ Introduction
 This document formalizes the effects that functions have on program
 state for the purpose of facilitating compiler optimization. By
 modeling more precise function effects, the optimizer can make more
-assumptions leading to more agressive transformation of the program.
+assumptions leading to more aggressive transformation of the program.
 
 Function effects may be deduced by the compiler during program
 analyis. However, in certain situations it is helpful to directly
@@ -919,5 +919,5 @@ Generally, a default-safe policy provides a much better user model
 from some effects. For example, we could decide that functions cannot
 affect unspecified state by default. If the user accesses globals,
 they then need to annotate their function. However, default safety
-dictates that any neccessary annotations should be introduced before
+dictates that any necessary annotations should be introduced before
 declaring API stability.