Update CMakeLists

Author: rauhul

Package.swift

@@ -184,7 +184,9 @@ let package = Package(
 
         .systemLibrary(name: "SPMSQLite3", pkgConfig: systemSQLitePkgConfig),
 
-        .target(name: "Environment"),
+        .target(
+            name: "Environment",
+            exclude: ["CMakeLists.txt"]),
 
         .target(
             name: "Basics",

Sources/Basics/CMakeLists.txt

@@ -25,7 +25,7 @@ add_library(Basics
   Concurrency/ThreadSafeKeyValueStore.swift
   Concurrency/TokenBucket.swift
   DispatchTimeInterval+Extensions.swift
-  Environment.swift
+  EnvironmentVariables.swift
   Errors.swift
   FileSystem/AbsolutePath.swift
   FileSystem/FileSystem+Extensions.swift
@@ -73,6 +73,7 @@ add_library(Basics
   Vendor/Triple.swift
   Vendor/Triple+Platforms.swift)
 target_link_libraries(Basics PUBLIC
+  Environment
   SwiftCollections::DequeModule
   SwiftCollections::OrderedCollections
   SwiftSystem::SystemPackage

Sources/Basics/EnvironmentVariables.swift

@@ -60,7 +60,7 @@ extension TSCBasic.Process {
 }
 
 extension TSCBasic.Process {
-    static package func popen(
+    package static func popen(
         arguments: [String],
         environment: Environment,
         loggingHandler: LoggingHandler? = nil,
@@ -71,7 +71,7 @@ extension TSCBasic.Process {
     }
 
     @discardableResult
-    static package func popen(
+    package static func popen(
         arguments: [String],
         environment: Environment,
         loggingHandler: LoggingHandler? = nil
@@ -80,23 +80,23 @@ extension TSCBasic.Process {
     }
 
     @discardableResult
-    static package func popen(
+    package static func popen(
         args: String...,
         environment: Environment,
         loggingHandler: LoggingHandler? = nil
     ) throws -> ProcessResult {
         try popen(arguments: args, environmentBlock: .init(environment), loggingHandler: loggingHandler)
     }
 
-    static package func popen(
+    package static func popen(
         arguments: [String],
         environment: Environment,
         loggingHandler: LoggingHandler? = nil
     ) async throws -> ProcessResult {
         try await popen(arguments: arguments, environmentBlock: .init(environment), loggingHandler: loggingHandler)
     }
 
-    static package func popen(
+    package static func popen(
         args: String...,
         environment: Environment,
         loggingHandler: LoggingHandler? = nil
@@ -107,7 +107,7 @@ extension TSCBasic.Process {
 
 extension TSCBasic.Process {
     @discardableResult
-    static package func checkNonZeroExit(
+    package static func checkNonZeroExit(
         arguments: [String],
         environment: Environment,
         loggingHandler: LoggingHandler? = nil
@@ -116,7 +116,7 @@ extension TSCBasic.Process {
     }
 
     @discardableResult
-    static package func checkNonZeroExit(
+    package static func checkNonZeroExit(
         arguments: [String],
         environment: Environment,
         loggingHandler: LoggingHandler? = nil
@@ -125,7 +125,7 @@ extension TSCBasic.Process {
     }
 
     @discardableResult
-    static package func checkNonZeroExit(
+    package static func checkNonZeroExit(
         args: String...,
         environment: Environment,
         loggingHandler: LoggingHandler? = nil
@@ -135,7 +135,7 @@ extension TSCBasic.Process {
 
 
     @discardableResult
-    static package func checkNonZeroExit(
+    package static func checkNonZeroExit(
         args: String...,
         environment: Environment,
         loggingHandler: LoggingHandler? = nil

Sources/CMakeLists.txt

@@ -15,6 +15,7 @@ add_subdirectory(Commands)
 add_subdirectory(CompilerPluginSupport)
 add_subdirectory(CoreCommands)
 add_subdirectory(DriverSupport)
+add_subdirectory(Environment)
 add_subdirectory(LLBuildManifest)
 add_subdirectory(PackageDescription)
 add_subdirectory(PackageFingerprint)

Sources/Environment/CMakeLists.txt

@@ -0,0 +1,33 @@
+# This source file is part of the Swift open source project
+#
+# 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
+# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+
+add_library(Environment
+  Environment.swift
+  EnvironmentKey.swift)
+target_link_libraries(Build PUBLIC
+  TSCBasic
+  Basics
+  PackageGraph
+  SPMBuildCore)
+target_link_libraries(Build PRIVATE
+  DriverSupport
+  LLBuildManifest
+  SPMLLBuild
+  SwiftDriver)
+target_link_libraries(Build INTERFACE
+  llbuildSwift)
+
+# NOTE(compnerd) workaround for CMake not setting up include flags yet
+set_target_properties(Build PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
+
+install(TARGETS Build
+  ARCHIVE DESTINATION lib
+  LIBRARY DESTINATION lib
+  RUNTIME DESTINATION bin)
+set_property(GLOBAL APPEND PROPERTY SwiftPM_EXPORTS Environment)

Sources/Environment/Environment.swift

@@ -53,15 +53,15 @@ extension Environment {
         self.storage = .init()
     }
 
-    public subscript(_ key: EnvironmentKey) -> String? {
+    package subscript(_ key: EnvironmentKey) -> String? {
         _read { yield self.storage[key] }
         _modify { yield &self.storage[key] }
     }
 }
 
 // MARK: - Conversions between Dictionary<String, String>
 extension Environment {
-    public init(_ dictionary: [String: String]) {
+    package init(_ dictionary: [String: String]) {
         self.storage = .init()
         let sorted = dictionary.sorted { $0.key < $1.key }
         for (key, value) in sorted {
@@ -71,7 +71,7 @@ extension Environment {
 }
 
 extension Dictionary<String, String> {
-    public init(_ environment: Environment) {
+    package init(_ environment: Environment) {
         self.init()
         let sorted = environment.sorted { $0.key < $1.key }
         for (key, value) in sorted {
@@ -82,7 +82,7 @@ extension Dictionary<String, String> {
 
 // MARK: - Path Modification
 extension Environment {
-    public mutating func prependPath(key: EnvironmentKey, value: String) {
+    package mutating func prependPath(key: EnvironmentKey, value: String) {
         guard !value.isEmpty else { return }
         if let existing = self[key] {
             self[key] = "\(value)\(Self.pathValueDelimiter)\(existing)"
@@ -91,7 +91,7 @@ extension Environment {
         }
     }
 
-    public mutating func appendPath(key: EnvironmentKey, value: String) {
+    package mutating func appendPath(key: EnvironmentKey, value: String) {
         guard !value.isEmpty else { return }
         if let existing = self[key] {
             self[key] = "\(existing)\(Self.pathValueDelimiter)\(value)"
@@ -100,7 +100,7 @@ extension Environment {
         }
     }
 
-    public static var pathValueDelimiter: String {
+    package static var pathValueDelimiter: String {
         #if os(Windows)
         ";"
         #else
@@ -239,7 +239,7 @@ extension Environment {
     /// Returns a copy of `self` with known non-cacheable keys removed.
     ///
     /// - Issue: rdar://107029374
-    public var cachable: Environment {
+    package var cachable: Environment {
         var cachable = Environment()
         for (key, value) in self {
             if !EnvironmentKey.nonCachable.contains(key) {