[llvm-commits] CVS: llvm/utils/GenLibDeps.pl

[Reid Spencer]

Changes in directory llvm/utils:

GenLibDeps.pl updated: 1.4 -> 1.5
---
Log message:

Don't require the "dot" program if -flat option is given, and don't produce
any of the fancy graphs or other output. Just produce the flat, makefile
style output on stdout.


---
Diffs of the changes:  (+25 -19)

 GenLibDeps.pl |   44 +++++++++++++++++++++++++-------------------
 1 files changed, 25 insertions(+), 19 deletions(-)


Index: llvm/utils/GenLibDeps.pl
diff -u llvm/utils/GenLibDeps.pl:1.4 llvm/utils/GenLibDeps.pl:1.5
--- llvm/utils/GenLibDeps.pl:1.4	Sun Mar 19 16:08:01 2006
+++ llvm/utils/GenLibDeps.pl	Thu Apr 20 18:09:57 2006
@@ -23,8 +23,10 @@
 my $Directory = $ARGV[0];
 
 # Find the "dot" program
-chomp(my $DotPath = `which dot`);
-die "Can't find 'dot'" if (! -x "$DotPath");
+if (!$FLAT) {
+  chomp(my $DotPath = `which dot`);
+  die "Can't find 'dot'" if (! -x "$DotPath");
+}
 
 # Open the directory and read its contents, sorting by name and differentiating
 # by whether its a library (.a) or an object file (.o)
@@ -102,9 +104,9 @@
     $suffix = substr($_,length($_)-1,1);
     $_ =~ s/(.*)\.[oa]/$1/;
     if ($suffix eq "a") {
-      print DOT "$lib_ns -> $_ [ weight=0 ];\n";
+      if (!$FLAT) { print DOT "$lib_ns -> $_ [ weight=0 ];\n" };
     } else {
-      print DOT "$lib_ns -> $_ [ weight=10];\n";
+      if (!$FLAT) { print DOT "$lib_ns -> $_ [ weight=10];\n" };
     }
   }
   close DF;
@@ -121,34 +123,38 @@
 
 # Print the definition list tag
 if (!$FLAT) {
-  print "<dl>\n";
-}
+    print "<dl>\n";
 
-open DOT, "| $DotPath -Tgif > libdeps.gif";
+  open DOT, "| $DotPath -Tgif > libdeps.gif";
+
+  print DOT "digraph LibDeps {size=\"40,15\"; ratio=\"1.33333\"; margin=\"0.25\"; rankdir=\"LR\"; mclimit=\"50.0\"; ordering=\"out\"; center=\"1\";\n";
+  print DOT "node [shape=\"box\",color=\"#000088\",fillcolor=\"#FFFACD\",fontcolor=\"#5577DD\",style=\"filled\",fontsize=\"24\"];\n";
+  print DOT "edge [style=\"solid\",color=\"#000088\"];\n";
+}
 
-print DOT "digraph LibDeps {size=\"40,15\"; ratio=\"1.33333\"; margin=\"0.25\"; rankdir=\"LR\"; mclimit=\"50.0\"; ordering=\"out\"; center=\"1\";\n";
-print DOT "node [shape=\"box\",color=\"#000088\",fillcolor=\"#FFFACD\",fontcolor=\"#5577DD\",style=\"filled\",fontsize=\"24\"];\n";
-print DOT "edge [style=\"solid\",color=\"#000088\"];\n";
 # Print libraries first
 foreach $lib (@libs) {
   gen_one_entry($lib);
 }
-print DOT "}\n";
-close DOT;
-open DOT, "| $DotPath -Tgif > objdeps.gif";
-print DOT "digraph ObjDeps {size=\"40,15\"; ratio=\"1.33333\"; margin=\"0.25\"; rankdir=\"LR\"; mclimit=\"50.0\"; ordering=\"out\"; center=\"1\";\n";
-print DOT "node [shape=\"box\",color=\"#000088\",fillcolor=\"#FFFACD\",fontcolor=\"#5577DD\",style=\"filled\",fontsize=\"24\"];\n";
-print DOT "edge [style=\"solid\",color=\"#000088\"];\n";
+
+if (!$FLAT) {
+  print DOT "}\n";
+  close DOT;
+  open DOT, "| $DotPath -Tgif > objdeps.gif";
+  print DOT "digraph ObjDeps {size=\"40,15\"; ratio=\"1.33333\"; margin=\"0.25\"; rankdir=\"LR\"; mclimit=\"50.0\"; ordering=\"out\"; center=\"1\";\n";
+  print DOT "node [shape=\"box\",color=\"#000088\",fillcolor=\"#FFFACD\",fontcolor=\"#5577DD\",style=\"filled\",fontsize=\"24\"];\n";
+  print DOT "edge [style=\"solid\",color=\"#000088\"];\n";
+}
 
 # Print objects second
 foreach $obj (@objs) {
   gen_one_entry($obj);
 }
 
-print DOT "}\n";
-close DOT;
+if (!$FLAT) {
+  print DOT "}\n";
+  close DOT;
 
 # Print end tag of definition list element
-if (!$FLAT) {
   print "</dl>\n";
 }