Using "xdot" instead of "yosys-svgviewer" in show command

diff --git a/README b/README
index 2e713ffef40c1639b611c6a44a699236b75a65f0..2c7703a15fe1a7a2ac5d7031b12ecdd5a7ca805f 100644 (file)
--- a/README
+++ b/README
@@ -58,7 +58,7 @@ will install all prerequisites for building yosys:
 
        $ yosys_deps="git g++ clang make bison flex libreadline-dev
                      tcl8.5-dev zlib1g-dev libqt4-dev libffi-dev
-                     mercurial iverilog graphviz"
+                     mercurial iverilog graphviz xdot"
        $ sudo apt-get install $yosys_deps
 
 There are also pre-compiled packages for Yosys on Ubuntu. Visit the Yosys

diff --git a/passes/cmds/show.cc b/passes/cmds/show.cc
index 3468eae78a18f2db0924d12f0987eab98a2062ef..6ab0e1ba1a5a25a752312fc83cef103522999498 100644 (file)
--- a/passes/cmds/show.cc
+++ b/passes/cmds/show.cc
@@ -751,8 +751,8 @@ struct ShowPass : public Pass {
                if (worker.page_counter == 0)
                        log_cmd_error("Nothing there to show.\n");
 
-               if (format != "dot") {
-                       std::string cmd = stringf("dot -T%s -o '%s' '%s'", format.empty() ? "svg" : format.c_str(), out_file.c_str(), dot_file.c_str());
+               if (format != "dot" && !format.empty()) {
+                       std::string cmd = stringf("dot -T%s -o '%s' '%s'", format.c_str(), out_file.c_str(), dot_file.c_str());
                        log("Exec: %s\n", cmd.c_str());
                        if (system(cmd.c_str()) != 0)
                                log_cmd_error("Shell command failed!\n");
@@ -765,8 +765,7 @@ struct ShowPass : public Pass {
                                log_cmd_error("Shell command failed!\n");
                } else
                if (format.empty()) {
-                       std::string svgviewer = proc_self_dirname() + "yosys-svgviewer";
-                       std::string cmd = stringf("fuser -s '%s' || '%s' '%s' &", out_file.c_str(), svgviewer.c_str(), out_file.c_str());
+                       std::string cmd = stringf("fuser -s '%s' || xdot '%s' < '%s' &", dot_file.c_str(), dot_file.c_str(), dot_file.c_str());
                        log("Exec: %s\n", cmd.c_str());
                        if (system(cmd.c_str()) != 0)
                                log_cmd_error("Shell command failed!\n");