[Erp5-report] r40839 kazuhiko - in /erp5/trunk/buildout: profiles/ software-profiles/ tests/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Nov 29 10:16:52 2010
New Revision: 40839

URL: http://svn.erp5.org?rev=40839&view=rev
Log:
add graphviz.

Modified:
    erp5/trunk/buildout/profiles/official-2.12.cfg
    erp5/trunk/buildout/profiles/official.cfg
    erp5/trunk/buildout/software-profiles/graphviz.cfg
    erp5/trunk/buildout/tests/assertSoftware.py

Modified: erp5/trunk/buildout/profiles/official-2.12.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/official-2.12.cfg?rev=40839&r1=40838&r2=40839&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/official-2.12.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/official-2.12.cfg [utf8] Mon Nov 29 10:16:52 2010
@@ -9,6 +9,7 @@ extends =
   ../software-profiles/erp5-2.12.cfg
   ../software-profiles/file.cfg
   ../software-profiles/garbage-collector.cfg
+  ../software-profiles/graphviz.cfg
   ../software-profiles/tokyocabinet.cfg
   ../software-profiles/haproxy.cfg
   ../software-profiles/imagemagick.cfg
@@ -38,6 +39,7 @@ parts =
   rdiff-backup
   apache
   file
+  graphviz
   memcached
   haproxy
   varnish

Modified: erp5/trunk/buildout/profiles/official.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/official.cfg?rev=40839&r1=40838&r2=40839&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/official.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/official.cfg [utf8] Mon Nov 29 10:16:52 2010
@@ -11,6 +11,7 @@ extends =
   ../software-profiles/erp5.cfg
   ../software-profiles/file.cfg
   ../software-profiles/garbage-collector.cfg
+  ../software-profiles/graphviz.cfg
   ../software-profiles/tokyocabinet.cfg
   ../software-profiles/haproxy.cfg
   ../software-profiles/imagemagick.cfg
@@ -42,6 +43,7 @@ parts =
   rdiff-backup
   apache
   file
+  graphviz
   memcached
   haproxy
   varnish

Modified: erp5/trunk/buildout/software-profiles/graphviz.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/graphviz.cfg?rev=40839&r1=40838&r2=40839&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/graphviz.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/graphviz.cfg [utf8] Mon Nov 29 10:16:52 2010
@@ -1,2 +1,51 @@
+# Graphviz - Graph Visualization Software
+# http://www.graphviz.org/
+
 [buildout]
-# placeholder for graphviz software
+parts =
+  graphviz
+extends =
+  ../software-profiles/libpng.cfg
+  ../software-profiles/libtool.cfg
+  ../software-profiles/zlib.cfg
+
+[graphviz]
+recipe = hexagonit.recipe.cmmi
+url = http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.26.3.tar.gz
+md5sum = 6f45946fa622770c45609778c0a982ee
+configure-options =
+  --with-ltdl-include=${libtool:location}/include
+  --with-ltdl-lib=${libtool:location}/lib
+  --with-pngincludedir=${libpng:location}/include
+  --with-pnglibdir=${libpng:location}/lib
+  --with-zincludedir=${zlib:location}/include
+  --with-zlibdir=${zlib:location}/lib
+  --disable-swig
+  --disable-sharp
+  --disable-guile
+  --disable-io
+  --disable-java
+  --disable-lua
+  --disable-ocaml
+  --disable-perl
+  --disable-php
+  --disable-python
+  --disable-r
+  --disable-ruby
+  --disable-tcl
+  --without-x
+  --without-expat
+  --without-devil
+  --without-rsvg
+  --without-ghostscript
+  --without-visio
+  --without-pangocairo
+  --without-lasi
+  --without-glitz
+  --without-freetype2
+  --without-fontconfig
+  --without-jpeg
+  --without-glut
+environment =
+  CFLAGS =-I${zlib:location}/include
+  LDFLAGS =-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=40839&r1=40838&r2=40839&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Mon Nov 29 10:16:52 2010
@@ -2145,6 +2145,37 @@ class AssertGit(AssertSoftwareMixin):
       'zlib',
       ])
 
+class AssertGraphviz(AssertSoftwareMixin):
+  def test_ld_dot(self):
+    self.assertLibraryList('parts/graphviz/bin/dot', [
+      'libc',
+      'libcdt',
+      'libdl',
+      'libgraph',
+      'libgvc',
+      'libm',
+      'libpathplan',
+      'libxdot',
+      'libz',
+      ], [
+      'zlib',
+      'graphviz',
+      ])
+  def test_ld_libgvc(self):
+    self.assertLibraryList('parts/graphviz/lib/libgvc.so', [
+      'libc',
+      'libcdt',
+      'libdl',
+      'libgraph',
+      'libm',
+      'libpathplan',
+      'libxdot',
+      'libz',
+      ], [
+      'zlib',
+      'graphviz',
+      ])
+
 class AssertElfLinkedInternally(AssertSoftwareMixin):
   def test(self):
     result_dict = {}