Deprecate enablement of explicit modules with an environment variable

Author: artemcm

Sources/SwiftDriver/Jobs/Job.swift

@@ -96,7 +96,11 @@ public struct Job: Codable, Equatable, Hashable {
   public var outputs: [TypedVirtualPath]
 
   /// Any extra environment variables which should be set while running the job.
-  public var extraEnvironment: ProcessEnvironmentBlock
+  @available(*, deprecated, message: "use extraEnvironmentBlock")
+  public var extraEnvironment: [String: String]
+
+  /// Any extra environment variables which should be set while running the job.
+  public var extraEnvironmentBlock: ProcessEnvironmentBlock
 
   /// Whether or not the job must be executed in place, replacing the current driver process.
   public var requiresInPlaceExecution: Bool

Sources/SwiftDriver/ToolingInterface/SimpleExecutor.swift

@@ -38,7 +38,7 @@ import typealias TSCBasic.ProcessEnvironmentBlock
     let arguments: [String] = try resolver.resolveArgumentList(for: job,
                                                                useResponseFiles: .heuristic)
     var childEnv = env
-    childEnv.merge(job.extraEnvironment, uniquingKeysWith: { (_, new) in new })
+    childEnv.merge(job.extraEnvironmentBlock, uniquingKeysWith: { (_, new) in new })
     let process = try Process.launchProcess(arguments: arguments, env: childEnv)
     return try process.waitUntilExit()
   }

Sources/SwiftDriverExecution/MultiJobExecutor.swift

@@ -584,7 +584,7 @@ class ExecuteJobRule: LLBuildRule {
     let context = self.context
     let resolver = context.argsResolver
     let job = myJob
-    let env = context.env.merging(job.extraEnvironment, uniquingKeysWith: { $1 })
+    let env = context.env.merging(job.extraEnvironmentBlock, uniquingKeysWith: { $1 })
 
     let value: DriverBuildValue
     var pendingFinish = false

Sources/SwiftDriverExecution/SwiftDriverExecutor.swift

@@ -51,14 +51,14 @@ public final class SwiftDriverExecutor: DriverExecutor {
                                     fileSystem: fileSystem)
 
     if job.requiresInPlaceExecution {
-      for (envVar, value) in job.extraEnvironment {
+      for (envVar, value) in job.extraEnvironmentBlock {
         try ProcessEnv.setVar(envVar.value, value: value)
       }
 
       try exec(path: arguments[0], args: arguments)
     } else {
       var childEnv = env
-      childEnv.merge(job.extraEnvironment, uniquingKeysWith: { (_, new) in new })
+      childEnv.merge(job.extraEnvironmentBlock, uniquingKeysWith: { (_, new) in new })
       let process : ProcessProtocol
       if job.inputs.contains(TypedVirtualPath(file: .standardInput, type: .swift)) {
         process = try Process.launchProcessAndWriteInput(

Sources/swift-driver/main.swift

@@ -113,10 +113,6 @@ do {
     }
   }
 
-  if ProcessEnv.block["SWIFT_ENABLE_EXPLICIT_MODULE"] != nil {
-    CommandLine.arguments.append("-explicit-module-build")
-  }
-
   let (mode, arguments) = try Driver.invocationRunMode(forArgs: CommandLine.arguments)
   if case .subcommand(let subcommand) = mode {
     // We are running as a subcommand, try to find the subcommand adjacent to the executable we are running as.