Do not require JAVA_HOME at build time

Author: marcprux

Package.swift

@@ -5,126 +5,6 @@ import CompilerPluginSupport
 import Foundation
 import PackageDescription
 
-// Note: the JAVA_HOME environment variable must be set to point to where
-// Java is installed, e.g.,
-//   Library/Java/JavaVirtualMachines/openjdk-21.jdk/Contents/Home.
-func findJavaHome() -> String {
-  if let home = ProcessInfo.processInfo.environment["JAVA_HOME"] {
-    return home
-  }
-
-  // This is a workaround for envs (some IDEs) which have trouble with
-  // picking up env variables during the build process
-  let path = "\(FileManager.default.homeDirectoryForCurrentUser.path()).java_home"
-  if let home = try? String(contentsOfFile: path, encoding: .utf8) {
-    if let lastChar = home.last, lastChar.isNewline {
-      return String(home.dropLast())
-    }
-    return home
-  }
-
-  if let home = getJavaHomeFromLibexecJavaHome(), !home.isEmpty {
-    return home
-  }
-
-  if let home = getJavaHomeFromSDKMAN() {
-    return home
-  }
-
-  if let home = getJavaHomeFromPath() {
-    return home
-  }
-
-  if ProcessInfo.processInfo.environment["SPI_PROCESSING"] == "1"
-    && ProcessInfo.processInfo.environment["SPI_BUILD"] == nil
-  {
-    return ""
-  }
-  fatalError("Please set the JAVA_HOME environment variable to point to where Java is installed.")
-}
-
-func getJavaHomeFromLibexecJavaHome() -> String? {
-  let task = Process()
-  task.executableURL = URL(fileURLWithPath: "/usr/libexec/java_home")
-
-  guard FileManager.default.fileExists(atPath: task.executableURL!.path) else {
-    return nil
-  }
-
-  let pipe = Pipe()
-  task.standardOutput = pipe
-  task.standardError = pipe
-
-  do {
-    try task.run()
-    task.waitUntilExit()
-
-    let data = pipe.fileHandleForReading.readDataToEndOfFile()
-    let output = String(data: data, encoding: .utf8)?.trimmingCharacters(in: .whitespacesAndNewlines)
-
-    if task.terminationStatus == 0 {
-      return output
-    } else {
-      return nil
-    }
-  } catch {
-    return nil
-  }
-}
-
-func getJavaHomeFromSDKMAN() -> String? {
-  let home = FileManager.default.homeDirectoryForCurrentUser
-    .appendingPathComponent(".sdkman/candidates/java/current")
-
-  let javaBin = home.appendingPathComponent("bin/java").path
-  if FileManager.default.isExecutableFile(atPath: javaBin) {
-    return home.path
-  }
-  return nil
-}
-
-func getJavaHomeFromPath() -> String? {
-  let task = Process()
-  task.executableURL = URL(fileURLWithPath: "/usr/bin/which")
-  task.arguments = ["java"]
-
-  let pipe = Pipe()
-  task.standardOutput = pipe
-
-  do {
-    try task.run()
-    task.waitUntilExit()
-    guard task.terminationStatus == 0 else { return nil }
-
-    let data = pipe.fileHandleForReading.readDataToEndOfFile()
-    guard
-      let javaPath = String(data: data, encoding: .utf8)?
-        .trimmingCharacters(in: .whitespacesAndNewlines),
-      !javaPath.isEmpty
-    else { return nil }
-
-    let resolved = URL(fileURLWithPath: javaPath).resolvingSymlinksInPath()
-    return
-      resolved
-      .deletingLastPathComponent()
-      .deletingLastPathComponent()
-      .path
-  } catch {
-    return nil
-  }
-}
-
-let javaHome = findJavaHome()
-
-let javaIncludePath = "\(javaHome)/include"
-#if os(Linux)
-let javaPlatformIncludePath = "\(javaIncludePath)/linux"
-#elseif os(macOS)
-let javaPlatformIncludePath = "\(javaIncludePath)/darwin"
-#elseif os(Windows)
-let javaPlatformIncludePath = "\(javaIncludePath)/win32"
-#endif
-
 let swiftJavaJNICoreDep: Package.Dependency
 if let localPath = ProcessInfo.processInfo.environment["SWIFT_JAVA_JNI_CORE_PATH"] {
   print("Using upstream 'swift-java-jni-core' from override path SWIFT_JAVA_JNI_CORE_PATH = \(localPath)")
@@ -280,27 +160,8 @@ let package = Package(
       swiftSettings: [
         .swiftLanguageMode(.v5),
         .enableUpcomingFeature("ImplicitOpenExistentials"),
-        .unsafeFlags(
-          ["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"],
-          .when(platforms: [.macOS, .linux, .windows])
-        ),
         .unsafeFlags(["-Xfrontend", "-sil-verify-none"], .when(configuration: .release)), // Workaround for https://github.com/swiftlang/swift/issues/84899
       ],
-      linkerSettings: [
-        .unsafeFlags(
-          [
-            "-L\(javaHome)/lib/server",
-            "-Xlinker", "-rpath",
-            "-Xlinker", "\(javaHome)/lib/server",
-          ],
-          .when(platforms: [.linux, .macOS])
-        ),
-        .unsafeFlags(
-          ["-L\(javaHome)/lib"],
-          .when(platforms: [.windows])
-        ),
-        .linkedLibrary("jvm", .when(platforms: [.linux, .macOS, .windows])),
-      ]
     ),
     .target(
       name: "JavaUtil",
@@ -309,7 +170,6 @@ let package = Package(
       exclude: ["swift-java.config"],
       swiftSettings: [
         .swiftLanguageMode(.v5),
-        .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"], .when(platforms: [.macOS, .linux, .windows])),
       ]
     ),
     .target(
@@ -319,7 +179,6 @@ let package = Package(
       exclude: ["swift-java.config"],
       swiftSettings: [
         .swiftLanguageMode(.v5),
-        .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"], .when(platforms: [.macOS, .linux, .windows])),
       ]
     ),
     .target(
@@ -329,7 +188,6 @@ let package = Package(
       exclude: ["swift-java.config"],
       swiftSettings: [
         .swiftLanguageMode(.v5),
-        .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"], .when(platforms: [.macOS, .linux, .windows])),
       ]
     ),
     .target(
@@ -339,7 +197,6 @@ let package = Package(
       exclude: ["swift-java.config"],
       swiftSettings: [
         .swiftLanguageMode(.v5),
-        .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"], .when(platforms: [.macOS, .linux, .windows])),
       ]
     ),
     .target(
@@ -349,7 +206,6 @@ let package = Package(
       exclude: ["swift-java.config"],
       swiftSettings: [
         .swiftLanguageMode(.v5),
-        .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"], .when(platforms: [.macOS, .linux, .windows])),
       ]
     ),
     .target(
@@ -359,7 +215,6 @@ let package = Package(
       exclude: ["swift-java.config"],
       swiftSettings: [
         .swiftLanguageMode(.v5),
-        .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"], .when(platforms: [.macOS, .linux, .windows])),
       ]
     ),
 
@@ -381,7 +236,6 @@ let package = Package(
       dependencies: [],
       swiftSettings: [
         .swiftLanguageMode(.v5),
-        .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"], .when(platforms: [.macOS, .linux, .windows])),
       ]
     ),
     .target(
@@ -392,15 +246,13 @@ let package = Package(
       exclude: ["swift-java.config"],
       swiftSettings: [
         .swiftLanguageMode(.v5),
-        .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"], .when(platforms: [.macOS, .linux, .windows])),
       ]
     ),
 
     .target(
       name: "SwiftRuntimeFunctions",
       swiftSettings: [
         .swiftLanguageMode(.v5),
-        .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"], .when(platforms: [.macOS, .linux, .windows])),
       ]
     ),
 
@@ -430,7 +282,6 @@ let package = Package(
       ],
       swiftSettings: [
         .swiftLanguageMode(.v5),
-        .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"], .when(platforms: [.macOS, .linux, .windows])),
         .enableUpcomingFeature("BareSlashRegexLiterals"),
       ]
     ),
@@ -453,7 +304,6 @@ let package = Package(
       ],
       swiftSettings: [
         .swiftLanguageMode(.v5),
-        .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"], .when(platforms: [.macOS, .linux, .windows])),
         .enableUpcomingFeature("BareSlashRegexLiterals"),
         .define(
           "SYSTEM_PACKAGE_DARWIN",
@@ -478,7 +328,6 @@ let package = Package(
       ],
       swiftSettings: [
         .swiftLanguageMode(.v5),
-        .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"], .when(platforms: [.macOS, .linux, .windows])),
       ]
     ),
 
@@ -498,7 +347,6 @@ let package = Package(
       ],
       swiftSettings: [
         .swiftLanguageMode(.v5),
-        .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"], .when(platforms: [.macOS, .linux, .windows])),
       ]
     ),
 
@@ -520,7 +368,6 @@ let package = Package(
       ],
       swiftSettings: [
         .swiftLanguageMode(.v5),
-        .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"], .when(platforms: [.macOS, .linux, .windows])),
       ]
     ),
 
@@ -529,7 +376,6 @@ let package = Package(
       dependencies: ["SwiftJavaConfigurationShared"],
       swiftSettings: [
         .swiftLanguageMode(.v5),
-        .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"], .when(platforms: [.macOS, .linux, .windows])),
       ]
     ),
 
@@ -540,7 +386,6 @@ let package = Package(
       ],
       swiftSettings: [
         .swiftLanguageMode(.v5),
-        .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"], .when(platforms: [.macOS, .linux, .windows])),
       ]
     ),
   ]