Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 49 additions & 3 deletions Benchmarks/Package.swift
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
// swift-tools-version: 6.0

import PackageDescription

import class Foundation.FileManager
import class Foundation.ProcessInfo
import Foundation

// Note: the JAVA_HOME environment variable must be set to point to where
// Java is installed, e.g.,
Expand All @@ -24,8 +22,56 @@ func findJavaHome() -> String {
return home
}

if let home = getJavaHomeFromSDKMAN() {
return home
}

if let home = getJavaHomeFromPath() {
return home
}

fatalError("Please set the JAVA_HOME environment variable to point to where Java is installed.")
}

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"
Expand Down
48 changes: 48 additions & 0 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@ func findJavaHome() -> String {
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 {
// Just ignore that we're missing a JAVA_HOME when building in Swift Package Index during general processing where no Java is needed. However, do _not_ suppress the error during SPI's compatibility build stage where Java is required.
Expand Down Expand Up @@ -80,6 +88,46 @@ func getJavaHomeFromLibexecJavaHome() -> String? {
}
}

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"
Expand Down
48 changes: 48 additions & 0 deletions Plugins/PluginsShared/PluginUtils.swift
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@ func findJavaHome() -> String {
return home
}

if let home = getJavaHomeFromSDKMAN() {
return home
}

if let home = getJavaHomeFromPath() {
return home
}

fatalError("Please set the JAVA_HOME environment variable to point to where Java is installed.")
}

Expand Down Expand Up @@ -77,3 +85,43 @@ extension PluginContext {
.appending(path: "\(swiftModule)", directoryHint: .notDirectory)
}
}

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
}
}
52 changes: 49 additions & 3 deletions Samples/JavaDependencySampleApp/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@

import CompilerPluginSupport
import PackageDescription

import class Foundation.FileManager
import class Foundation.ProcessInfo
import Foundation

// Note: the JAVA_HOME environment variable must be set to point to where
// Java is installed, e.g.,
Expand All @@ -26,8 +24,56 @@ func findJavaHome() -> String {
return home
}

if let home = getJavaHomeFromSDKMAN() {
return home
}

if let home = getJavaHomeFromPath() {
return home
}

fatalError("Please set the JAVA_HOME environment variable to point to where Java is installed.")
}

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"
Expand Down
52 changes: 49 additions & 3 deletions Samples/JavaKitSampleApp/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@

import CompilerPluginSupport
import PackageDescription

import class Foundation.FileManager
import class Foundation.ProcessInfo
import Foundation

// Note: the JAVA_HOME environment variable must be set to point to where
// Java is installed, e.g.,
Expand All @@ -26,8 +24,56 @@ func findJavaHome() -> String {
return home
}

if let home = getJavaHomeFromSDKMAN() {
return home
}

if let home = getJavaHomeFromPath() {
return home
}

fatalError("Please set the JAVA_HOME environment variable to point to where Java is installed.")
}

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"
Expand Down
52 changes: 49 additions & 3 deletions Samples/JavaSieve/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription

import class Foundation.FileManager
import class Foundation.ProcessInfo
import Foundation

// Note: the JAVA_HOME environment variable must be set to point to where
// Java is installed, e.g.,
Expand All @@ -25,8 +23,56 @@ func findJavaHome() -> String {
return home
}

if let home = getJavaHomeFromSDKMAN() {
return home
}

if let home = getJavaHomeFromPath() {
return home
}

fatalError("Please set the JAVA_HOME environment variable to point to where Java is installed.")
}

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"
Expand Down
Loading
Loading