[Pkg-ocaml-maint-commits] r5223 - in /trunk/tools/build-dep-graph: Makefile build-dep-graph.py

Sat Mar 1 15:38:11 UTC 2008

Author: glondu-guest
Date: Sat Mar  1 15:38:11 2008
New Revision: 5223

URL: http://svn.debian.org/wsvn/?sc=1&rev=5223
Log:
Clarifying the Makefile and fixing the regexp for splitting dependencies.

Modified:
    trunk/tools/build-dep-graph/Makefile
    trunk/tools/build-dep-graph/build-dep-graph.py

Modified: trunk/tools/build-dep-graph/Makefile
URL: http://svn.debian.org/wsvn/trunk/tools/build-dep-graph/Makefile?rev=5223&op=diff
==============================================================================

--- trunk/tools/build-dep-graph/Makefile (original)
+++ trunk/tools/build-dep-graph/Makefile Sat Mar  1 15:38:11 2008
@@ -7,9 +7,14 @@
 	build_order.txt
 
 all: ocaml_build_deps.ps ocaml_build_deps.png ocaml_src_pkgs.html build_order.txt
+
 # to be used on alioth for updating graphs and lists linked by pkg-ocaml-maint home page
 install: download all
 	cp $(INSTALL_STUFF) ~/pkg-ocaml-maint/htdocs/
+
+download:
+	./update_src_list.sh
+
 ocaml_src_pkgs.html: ocaml_src_pkgs.txt
 	echo "<html><head><title>OCaml Source Packages</title></head><body>" > $@
 	echo "<b>OCaml Source Packages</b><br />" >> $@
@@ -17,12 +22,15 @@
 		echo "<a href='http://packages.qa.debian.org/$$l'>$$l</a><br />" >> $@;	\
 	done
 	echo "</body></html>" >> $@
-download:
-	./update_src_list.sh
+
 ocaml_build_deps.dot: ocaml_src_pkgs.txt
 	./build-dep-graph.py < $< > $@
+
 build_order.txt: ocaml_build_deps.dot
 	./slice.ml ocaml $< > $@
+
+ocaml_src_pkgs.txt: download
+
 %.png: %.dot
 	dot -Tpng $< > $@
 %.ps: %.dot

Modified: trunk/tools/build-dep-graph/build-dep-graph.py
URL: http://svn.debian.org/wsvn/trunk/tools/build-dep-graph/build-dep-graph.py?rev=5223&op=diff
==============================================================================
--- trunk/tools/build-dep-graph/build-dep-graph.py (original)
+++ trunk/tools/build-dep-graph/build-dep-graph.py Sat Mar  1 15:38:11 2008
@@ -31,7 +31,7 @@
 arcs = set()
 for name, stanza in ocaml_sources.iteritems():
     def explode_deps(s):
-        parts = re.split(r' *, *', s)
+        parts = re.split(r' *[,|] *', s)
         return map(lambda s: re.sub(r' *(\(|\[)[^\)\]]*(\)|\])', '', s).strip(),
                 parts)  # strip versioned deps and arch-specific deps
 


