Skip to content

Fix findIVerilog Method to Resolve Symbolic Links on macOS #1369

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix findIVerilog Method to Resolve Symbolic Links on macOS #1369

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 28 additions & 3 deletions src/main/java/de/neemann/digital/core/extern/ApplicationIVerilog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,16 @@
import java.nio.file.Paths;
import java.util.LinkedList;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* Abstraction of the iverilog Application.
* See http://iverilog.icarus.com/
*/
public class ApplicationIVerilog extends ApplicationVerilogStdIO {
private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationIVerilog.class);

private final ElementAttributes attr;
private final boolean hasIverilog;
private String iverilogFolder;
Expand Down Expand Up @@ -131,27 +136,44 @@ private boolean findIVerilog() {
ivp = p;
if (Files.isSymbolicLink(p)) {
try {
ivp = Files.readSymbolicLink(ivp);
Path resolvedLink = Files.readSymbolicLink(p);

// Resolve relative symbolic links to absolute paths
if (!resolvedLink.isAbsolute()) {
resolvedLink = p.getParent().resolve(resolvedLink).normalize();
}

ivp = resolvedLink;
} catch (IOException ex) {
LOGGER.error("Failed to resolve symbolic link: {}", p, ex);
return false;
}
}
}
}

if (ivp == null) {
// Let's try to find iverilog in the system path
// Try to find iverilog in the system path
String[] strPaths = System.getenv("PATH").split(File.pathSeparator);

for (String sp : strPaths) {
Path p = Paths.get(sp, "iverilog");
LOGGER.debug("Checking path: {}", p); // Debugging output

if (Files.isExecutable(p)) {
ivp = p;
if (Files.isSymbolicLink(p)) {
try {
ivp = Files.readSymbolicLink(ivp);
Path resolvedLink = Files.readSymbolicLink(p);

// Resolve relative symbolic links to absolute paths
if (!resolvedLink.isAbsolute()) {
resolvedLink = p.getParent().resolve(resolvedLink).normalize();
}

ivp = resolvedLink;
} catch (IOException ex) {
LOGGER.error("Failed to resolve symbolic link: {}", p, ex);
return false;
}
}
Expand All @@ -161,12 +183,15 @@ private boolean findIVerilog() {
}

if (ivp != null) {
// Set paths for iverilog and vvp
iverilogFolder = ivp.getParent().getParent().toString();
iverilog = ivp.getParent().resolve("iverilog").toString();
vvp = ivp.getParent().resolve("vvp").toString();

LOGGER.info("Found iverilog: {}", iverilog);
return true;
} else {
LOGGER.error("iverilog not found");
return false;
}
}
Expand Down