Merge branch 'master' into hd/tests/string_utils

# Conflicts:
#	Tests/Utility/FileTests.swift

Author: czechboy0

Fixtures/DependencyResolution/External/CUsingCDep2/Bar/Package.swift

@@ -0,0 +1,8 @@
+import PackageDescription
+
+let package = Package(
+    name: "Bar",
+    dependencies: [
+        .Package(url: "../Foo", majorVersion: 1)
+	]
+)

Fixtures/DependencyResolution/External/CUsingCDep2/Bar/Sources/SeaLover/Sea.c

@@ -0,0 +1,5 @@
+#include <Foo/Foo.h>
+
+void cool() {
+    foo();
+}

Fixtures/DependencyResolution/External/CUsingCDep2/Bar/Sources/SeaLover/include/Sea.h

@@ -0,0 +1,5 @@
+module SeaLover {
+  header "Sea/Sea.h"
+  link "SeaLover"
+  export *
+}

Fixtures/DependencyResolution/External/CUsingCDep2/Bar/Sources/SeaLover/include/module.modulemap

@@ -0,0 +1,3 @@
+import Foo
+
+foo()

Fixtures/DependencyResolution/External/CUsingCDep2/Bar/Sources/SwiftExec/main.swift

@@ -0,0 +1,3 @@
+void foo() {
+    
+}

Fixtures/DependencyResolution/External/CUsingCDep2/Foo/Package.swift

@@ -0,0 +1 @@
+void foo();

Fixtures/DependencyResolution/External/CUsingCDep2/Foo/Sources/Foo.c

@@ -0,0 +1,5 @@
+module Foo {
+  header "Foo/Foo.h"
+  link "Foo"
+  export *
+}

Fixtures/DependencyResolution/External/CUsingCDep2/Foo/Sources/include/Foo/Foo.h

@@ -0,0 +1,3 @@
+public class Foo {
+    var bar: Int = 0
+}

Fixtures/DependencyResolution/External/CUsingCDep2/Foo/Sources/include/module.modulemap

@@ -0,0 +1,7 @@
+import PackageDescription
+
+let package = Package(name: "Foo")
+
+let archive = Product(name: "Bar", type: .Library(.Static), modules: "Foo")
+
+products.append(archive)

Fixtures/Miscellaneous/StaticProduct/Foo.swift

@@ -0,0 +1,5 @@
+import PackageDescription
+
+let package = Package(
+    name: "CExecutable"
+)

Fixtures/Miscellaneous/StaticProduct/Package.swift

@@ -0,0 +1,6 @@
+#include <stdio.h>
+
+int main() {
+    int a = 5;
+    printf("hello %d", a);
+}

Fixtures/ValidLayouts/SingleModule/CExecutable/Package.swift

@@ -23,25 +23,31 @@ Additionally, it is important to note that the Swift language syntax is not stab
 
 ## Installing
 
-The package manager is bundled with the [developer snapshots available at swift.org](https://swift.org/download/).
-**Please note the package manager does not come with the 2.2 release snapshots, ensure you download a 
-developer snapshot.**
+The package manager is bundled with the [**Trunk Development** Snapshots available at swift.org](https://swift.org/download/). Following installation you will need to do one of the following to use the package manager on the command line:
 
-If you want to verify you already have the package manager installed, enter the following in a terminal:
+* Xcode 7.3:
+
+        export TOOLCHAINS=swift
+
+* Xcode 7.2:
+
+        export PATH=/Library/Toolchains/swift-latest.xctoolchain/usr/bin:$PATH
+
+* Linux:
+
+        export PATH=path/to/toolchain/usr/bin:$PATH
+
+You can verify your installation by typing `swift build --version` in a terminal:
 
 ```sh
-swift build --help
+$ swift build --version
+Apple Swift Package Manager
 ```
 
-If you get usage output, it is installed, otherwise you will see an error such as:
+The following indicates you have not installed a snapshot successfully:
 
     <unknown>:0: error: no such file or directory: 'build'
 
-After installing a downloadable toolchain on OS X, by default you will probably see this error.
-To execute the swift from your download you either need to put that `swift` first in your `PATH`,
-or you need to set the `TOOLCHAINS` environment variable: see the next section.
-
-
 ### Managing Swift Environments
 
 The `TOOLCHAINS` environment variable on OS X can be used to control which
@@ -66,7 +72,7 @@ your `TOOLCHAINS` enivonment variable.
 To use a specific toolchain you can set `TOOLCHAINS` to the `CFBundleIdentifier`
 in an `.xctoolchain`’s Info.plist.
 
-Please note, this feature may by a little flakey with Xcode prior to 7.3.
+This feature requires Xcode 7.3.
 
 
 ## Development

Fixtures/ValidLayouts/SingleModule/CExecutable/Sources/main.c

@@ -0,0 +1,58 @@
+/*
+ This source file is part of the Swift.org open source project
+
+ Copyright 2015 - 2016 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
+*/
+
+import PackageType
+
+protocol Buildable {
+    var targetName: String { get }
+    var isTest: Bool { get }
+}
+
+extension Module: Buildable {
+    var isTest: Bool {
+        return self is TestModule
+    }
+
+    var Xcc: [String] {
+        return recursiveDependencies.flatMap { module -> [String] in
+            if let module = module as? CModule {
+                return ["-Xcc", "-fmodule-map-file=\(module.moduleMapPath)"]
+            } else {
+                return []
+            }
+        }
+    }
+
+    var targetName: String {
+        return "<\(name).module>"
+    }
+}
+
+extension Product: Buildable {
+    var isTest: Bool {
+        if case .Test = type {
+            return true
+        }
+        return false
+    }
+
+    var targetName: String {
+        switch type {
+        case .Library(.Dynamic):
+            return "<\(name).dylib>"
+        case .Test:
+            return "<\(name).test>"
+        case .Library(.Static):
+            return "<\(name).a>"
+        case .Executable:
+            return "<\(name).exe>"
+        }
+    }
+}

README.md

@@ -0,0 +1,70 @@
+/*
+ This source file is part of the Swift.org open source project
+
+ Copyright 2015 - 2016 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
+*/
+
+import PackageType
+import Utility
+import POSIX
+
+//FIXME: Incremental builds
+
+extension Command {
+    static func compile(clangModule module: ClangModule, externalModules: Set<Module>, configuration conf: Configuration, prefix: String) -> (Command, Command) {
+
+        let wd = Path.join(prefix, "\(module.c99name).build")
+        let mkdir = Command.createDirectory(wd)
+
+        let inputs = module.dependencies.map{ $0.targetName } + module.sources.paths + [mkdir.node]
+        let productPath = Path.join(prefix, module.type == .Library ? "lib\(module.c99name).so" : module.c99name)
+
+        var args: [String] = []
+    #if os(Linux)
+        args += ["-fPIC"]
+    #endif
+        args += ["-fmodules", "-fmodule-name=\(module.name)"]
+        args += ["-L\(prefix)"]
+
+        for case let dep as ClangModule in module.dependencies {
+            let includeFlag: String
+            //add `-iquote` argument to the include directory of every target in the package in the
+            //transitive closure of the target being built allowing the use of `#include "..."`
+            //add `-I` argument to the include directory of every target outside the package in the
+            //transitive closure of the target being built allowing the use of `#include <...>`
+
+            includeFlag = externalModules.contains(dep) ? "-I" : "-iquote"
+            args += [includeFlag, dep.path]
+            args += ["-l\(dep.c99name)"] //FIXME: giving path to other module's -fmodule-map-file is not linking that module
+        }
+
+        switch conf {
+        case .Debug:
+            args += ["-g", "-O0"]
+        case .Release:
+            args += ["-O2"]
+        }
+
+        args += module.sources.paths
+        
+        if module.type == .Library {
+            args += ["-shared"]
+        }
+        
+        args += ["-o", productPath]
+
+        let clang = ShellTool(
+            description: "Compiling \(module.name)",
+            inputs: inputs,
+            outputs: [productPath, module.targetName],
+            args: [Toolchain.clang] + args)
+
+        let command = Command(node: module.targetName, tool: clang)
+
+        return (command, mkdir)
+    }
+}

Sources/Build/Buildable.swift

@@ -0,0 +1,57 @@
+/*
+ This source file is part of the Swift.org open source project
+
+ Copyright 2015 - 2016 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
+*/
+
+import PackageType
+import Utility
+
+extension Command {
+    static func compile(swiftModule module: SwiftModule, configuration conf: Configuration, prefix: String, otherArgs: [String]) throws -> (Command, [Command]) {
+
+        let otherArgs = otherArgs + module.Xcc
+
+        func cmd(tool: ToolProtocol) -> Command {
+            return Command(node: module.targetName, tool: tool)
+        }
+
+        switch conf {
+        case .Debug:
+            var args = ["-j8","-Onone","-g","-D","SWIFT_PACKAGE", "-enable-testing"]
+
+        #if os(OSX)
+            if let platformPath = Toolchain.platformPath {
+                let path = Path.join(platformPath, "Developer/Library/Frameworks")
+                args += ["-F", path]
+            } else {
+                throw Error.InvalidPlatformPath
+            }
+        #endif
+            let tool = SwiftcTool(module: module, prefix: prefix, otherArgs: args + otherArgs)
+            let mkdirs = Set(tool.objects.map{ $0.parentDirectory }).map(Command.createDirectory)
+            return (cmd(tool), mkdirs)
+
+        case .Release:
+            let inputs = module.dependencies.map{ $0.targetName } + module.sources.paths
+            var args = ["-c", "-emit-module", "-D", "SWIFT_PACKAGE", "-O", "-whole-module-optimization", "-I", prefix] + otherArgs
+            let productPath = Path.join(prefix, "\(module.c99name).o")
+
+            if module.type == .Library {
+                args += ["-parse-as-library"]
+            }
+
+            let tool = ShellTool(
+                description: "Compiling \(module.name)",
+                inputs: inputs,
+                outputs: [productPath, module.targetName],
+                args: [Toolchain.swiftc, "-o", productPath] + args + module.sources.paths + otherArgs)
+
+            return (cmd(tool), [])
+        }
+    }
+}