Skip to content

Compile the package manifest properly on Windows #2821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 12, 2020
Merged

Compile the package manifest properly on Windows #2821

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e836457
Avoid passing -rpath linker argument on Windows
egorzhdan Jul 19, 2020
a7498b6
Compile the package manifest into a proper executable on Windows
egorzhdan Jul 19, 2020
cb47d6f
Pass the PackageDescription location as a PATH component on Windows
egorzhdan Jul 20, 2020
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
20 changes: 17 additions & 3 deletions Sources/PackageLoading/ManifestLoader.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,8 +578,12 @@ public final class ManifestLoader: ManifestLoaderProtocol {
cmd += [
"-L", runtimePath.pathString,
"-lPackageDescription",
"-Xlinker", "-rpath", "-Xlinker", runtimePath.pathString
]
#if !os(Windows)
// -rpath argument is not supported on Windows,
// so we add runtimePath to PATH when executing the manifest instead
cmd += ["-Xlinker", "-rpath", "-Xlinker", runtimePath.pathString]
#endif

// note: this is not correct for all platforms, but we only actually use it on macOS.
macOSPackageDescriptionPath = runtimePath.appending(RelativePath("libPackageDescription.dylib"))
Expand Down Expand Up @@ -612,7 +616,12 @@ public final class ManifestLoader: ManifestLoaderProtocol {

try withTemporaryDirectory(removeTreeOnDeinit: true) { tmpDir in
// Set path to compiled manifest executable.
let compiledManifestFile = tmpDir.appending(component: "\(packageIdentity)-manifest")
#if os(Windows)
let executableSuffix = ".exe"
#else
let executableSuffix = ""
#endif
let compiledManifestFile = tmpDir.appending(component: "\(packageIdentity)-manifest\(executableSuffix)")
cmd += ["-o", compiledManifestFile.pathString]

// Compile the manifest.
Expand Down Expand Up @@ -647,7 +656,12 @@ public final class ManifestLoader: ManifestLoaderProtocol {
#endif

// Run the compiled manifest.
let runResult = try Process.popen(arguments: cmd)
var environment = ProcessEnv.vars
#if os(Windows)
let windowsPathComponent = runtimePath.pathString.replacingOccurrences(of: "/", with: "\\")
environment["Path"] = "\(windowsPathComponent);\(environment["Path"] ?? "")"
#endif
let runResult = try Process.popen(arguments: cmd, environment: environment)
fclose(jsonOutputFileDesc)
let runOutput = try (runResult.utf8Output() + runResult.utf8stderrOutput()).spm_chuzzle()
if let runOutput = runOutput {
Expand Down