[GSoC] SwiftPM PR

Package.swift

@@ -100,6 +100,10 @@ let package = Package(
                 "PackageModel",
             ]
         ),
+        .executable(
+            name: "package-parser",
+            targets: ["package-parser"]
+        ),
     ],
     targets: [
         // The `PackageDescription` target provides the API that is available
@@ -152,6 +156,10 @@ let package = Package(
             /** Package model conventions and loading support */
             name: "PackageLoading",
             dependencies: ["SwiftToolsSupport-auto", "Basics", "PackageModel", "SourceControl"]),
+        .target(
+            name: "ScriptingCore",
+            /** Package models for scripting support */
+            dependencies: ["SwiftToolsSupport-auto", "Basics"]),
 
         // MARK: Package Dependency Resolution
 
@@ -186,6 +194,12 @@ let package = Package(
 
         // MARK: Package Manager Functionality
 
+        .target(
+            /** Parse `@package` marks */
+            name: "ScriptParse",
+            dependencies: ["SwiftToolsSupport-auto", "ArgumentParser", "SwiftSyntax"]
+        ),
+
         .target(
             /** Builds Modules and Products */
             name: "SPMBuildCore",
@@ -213,7 +227,7 @@ let package = Package(
         .target(
             /** High-level commands */
             name: "Commands",
-            dependencies: ["SwiftToolsSupport-auto", "Basics", "Build", "PackageGraph", "SourceControl", "Xcodeproj", "Workspace", "XCBuildSupport", "ArgumentParser", "PackageCollections"]),
+            dependencies: ["SwiftToolsSupport-auto", "Basics", "Build", "PackageGraph", "SourceControl", "Xcodeproj", "Workspace", "XCBuildSupport", "ArgumentParser", "PackageCollections", "ScriptParse", "ScriptingCore"]),
         .target(
             /** The main executable provided by SwiftPM */
             name: "swift-package",
@@ -230,6 +244,14 @@ let package = Package(
             /** Runs an executable product */
             name: "swift-run",
             dependencies: ["Commands"]),
+        .target(
+            /** Manages and runs a script */
+            name: "swift-script",
+            dependencies: ["Commands"]),
+        .target(
+            /** Parse `@package` marks */
+            name: "package-parser",
+            dependencies: ["ScriptParse"]),
         .target(
             /** Interacts with package collections */
             name: "swift-package-collection",
@@ -356,12 +378,14 @@ if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
         .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "0.4.3")),
         .package(url: "https://github.com/apple/swift-driver.git", .branch(relatedDependenciesBranch)),
         .package(url: "https://github.com/apple/swift-crypto.git", .upToNextMinor(from: "1.1.4")),
+        .package(url: "https://github.com/apple/swift-syntax.git", .branch(relatedDependenciesBranch)),
     ]
 } else {
     package.dependencies += [
         .package(path: "../swift-tools-support-core"),
         .package(path: "../swift-argument-parser"),
         .package(path: "../swift-driver"),
         .package(path: "../swift-crypto"),
+        .package(path: "../swift-syntax"),
     ]
 }

Sources/Basics/FileSystem+Extensions.swift

@@ -1,7 +1,7 @@
 /*
  This source file is part of the Swift.org open source project
 
- Copyright (c) 2020 Apple Inc. and the Swift project authors
+ Copyright (c) 2020 - 2021 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
@@ -110,3 +110,31 @@ extension FileSystem {
         return idiomaticConfigDirectory
     }
 }
+
+// MARK: - script cache
+
+extension FileSystem {
+    /// SwiftPM cache directory under user's caches directory (if exists)
+    public var swiftScriptCacheDirectory: AbsolutePath {
+        return self.dotSwiftScriptCachesDirectory
+    }
+
+    fileprivate var dotSwiftScriptCachesDirectory: AbsolutePath {
+        return self.dotSwiftPM.appending(component: "scripts")
+    }
+}
+
+extension FileSystem {
+    public func getOrCreateSwiftScriptCacheDirectory() throws -> AbsolutePath {
+        let idiomaticCacheDirectory = self.swiftScriptCacheDirectory
+        // Create idiomatic if necessary
+        if !self.exists(idiomaticCacheDirectory) {
+            try self.createDirectory(idiomaticCacheDirectory, recursive: true)
+        }
+        // Create ~/.swiftpm if necessary
+        if !self.exists(self.dotSwiftPM) {
+            try self.createDirectory(self.dotSwiftPM, recursive: true)
+        }
+        return idiomaticCacheDirectory
+    }
+}

Sources/CMakeLists.txt

@@ -22,9 +22,12 @@ add_subdirectory(PackagePlugin)
 add_subdirectory(SPMBuildCore)
 add_subdirectory(SPMLLBuild)
 add_subdirectory(SourceControl)
+#add_subdirectory(ScriptingCore)
+#add_subdirectory(ScriptParse)
 add_subdirectory(swift-build)
 add_subdirectory(swift-package)
 add_subdirectory(swift-run)
+#add_subdirectory(swift-script)
 add_subdirectory(swift-test)
 add_subdirectory(Workspace)
 add_subdirectory(XCBuildSupport)

Sources/Commands/CMakeLists.txt

@@ -1,6 +1,6 @@
 # This source file is part of the Swift.org open source project
 #
-# Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
+# Copyright (c) 2014 - 2021 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
@@ -18,6 +18,7 @@ add_library(Commands
   SwiftPackageCollectionsTool.swift
   SwiftPackageTool.swift
   SwiftRunTool.swift
+# SwiftScriptTool.swift
   SwiftTestTool.swift
   SwiftTool.swift
   SymbolGraphExtract.swift
@@ -28,6 +29,8 @@ target_link_libraries(Commands PUBLIC
   Build
   PackageCollections
   PackageGraph
+# ScriptingCore
+# ScriptParse
   SourceControl
   TSCBasic
   TSCUtility