[Pkg-ocaml-maint-commits] r6463 - in /trunk/tools/build-dep-graph: build_order.txt ocaml_build_deps.dot ocaml_build_deps.png ocaml_build_deps.ps ocaml_src_pkgs.html ocaml_src_pkgs.txt slice.ml update_src_list.exclude

[gildor at users.alioth.debian.org]

Author: gildor
Date: Wed May 19 22:36:32 2010
New Revision: 6463

URL: http://svn.debian.org/wsvn/?sc=1&rev=6463
Log:
* Re-enable llvm-2.7: add a "visited" check in function neighbours to prevent cycle.
* Remove generated files for SVN
-- SLG

Removed:
    trunk/tools/build-dep-graph/build_order.txt
    trunk/tools/build-dep-graph/ocaml_build_deps.dot
    trunk/tools/build-dep-graph/ocaml_build_deps.png
    trunk/tools/build-dep-graph/ocaml_build_deps.ps
    trunk/tools/build-dep-graph/ocaml_src_pkgs.html
    trunk/tools/build-dep-graph/ocaml_src_pkgs.txt
Modified:
    trunk/tools/build-dep-graph/slice.ml
    trunk/tools/build-dep-graph/update_src_list.exclude

Modified: trunk/tools/build-dep-graph/slice.ml
URL: http://svn.debian.org/wsvn/trunk/tools/build-dep-graph/slice.ml?rev=6463&op=diff
==============================================================================
--- trunk/tools/build-dep-graph/slice.ml (original)
+++ trunk/tools/build-dep-graph/slice.ml Wed May 19 22:36:32 2010
@@ -11,16 +11,21 @@
   * @return a list of all paths connecting src to dst
   *)
 let all_paths src dst edges =
-  let rec neighbours src' = function
-    | (src, dst) :: rest when src = src' -> dst :: neighbours src' rest
-    | _ :: rest -> neighbours src' rest
+  let rec neighbours visited src' = function
+    | (src, dst) :: rest when src = src' && not (List.mem dst visited) -> 
+        dst :: neighbours visited src' rest
+    | _ :: rest -> 
+        neighbours visited src' rest
     | [] -> []
   in
   let rec aux_single acc src =
     if src = dst then
       [dst::acc]
     else
-      aux_multi (src :: acc) (neighbours src edges)
+      let visited = 
+        src :: acc
+      in
+        aux_multi visited (neighbours visited src edges)
   and aux_multi acc = function
     | [] -> []
     | src :: rest -> aux_single acc src @ aux_multi acc rest

Modified: trunk/tools/build-dep-graph/update_src_list.exclude
URL: http://svn.debian.org/wsvn/trunk/tools/build-dep-graph/update_src_list.exclude?rev=6463&op=diff
==============================================================================
--- trunk/tools/build-dep-graph/update_src_list.exclude (original)
+++ trunk/tools/build-dep-graph/update_src_list.exclude Wed May 19 22:36:32 2010
@@ -5,4 +5,3 @@
 langscan
 mediawiki1\.10
 swig1\.3
-llvm-2\.7