[Erp5-report] r36167 luke - in /erp5/trunk/buildout: profiles/ software-profiles/ tests/

[nobody at svn.erp5.org]

Author: luke
Date: Wed Jun  9 16:31:21 2010
New Revision: 36167

URL: http://svn.erp5.org?rev=36167&view=rev
Log:
 - add tokyocabinet and flare software

Added:
    erp5/trunk/buildout/software-profiles/tokyocabinet.cfg
Modified:
    erp5/trunk/buildout/profiles/official-2.12.cfg
    erp5/trunk/buildout/profiles/official.cfg
    erp5/trunk/buildout/software-profiles/flare.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=36167&r1=36166&r2=36167&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/official-2.12.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/official-2.12.cfg [utf8] Wed Jun  9 16:31:21 2010
@@ -9,6 +9,7 @@ extends =
   ../profiles/software-definition.cfg
   ../software-profiles/apache.cfg
   ../software-profiles/erp5-2.12.cfg
+  ../software-profiles/tokyocabinet.cfg
   ../software-profiles/flare.cfg
   ../software-profiles/haproxy.cfg
   ../software-profiles/imagemagick.cfg
@@ -36,6 +37,7 @@ parts =
   memcached
   ocropus
   haproxy
+  flare
   varnish
   mysql-tritonn-5.0
   mysql-python

Modified: erp5/trunk/buildout/profiles/official.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/official.cfg?rev=36167&r1=36166&r2=36167&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/official.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/official.cfg [utf8] Wed Jun  9 16:31:21 2010
@@ -6,6 +6,7 @@ extends =
   ../profiles/software-definition.cfg
   ../software-profiles/apache.cfg
   ../software-profiles/erp5.cfg
+  ../software-profiles/tokyocabinet.cfg
   ../software-profiles/flare.cfg
   ../software-profiles/haproxy.cfg
   ../software-profiles/imagemagick.cfg
@@ -30,6 +31,7 @@ parts =
   ocropus
   haproxy
   varnish
+  flare
   mysql-tritonn-5.0
   zope-2.8
   cmf15

Modified: erp5/trunk/buildout/software-profiles/flare.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/flare.cfg?rev=36167&r1=36166&r2=36167&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/flare.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/flare.cfg [utf8] Wed Jun  9 16:31:21 2010
@@ -0,0 +1,19 @@
+[buildout]
+parts = flare
+
+[flare-daemonize-timing]
+recipe = hexagonit.recipe.download
+filename = flare-1.0.8-daemonize-timing.patch
+url = http://www.nexedi.org/static/patches/flare-1.0.8-daemonize-timing.patch
+download-only=true
+
+[flare]
+recipe = hexagonit.recipe.cmmi
+url = http://labs.gree.jp/data/source/flare-1.0.9.tgz
+patch-options = -p1
+patches =
+  ${flare-daemonize-timing:location}/${flare-daemonize-timing:filename}
+configure-options =
+  --with-tokyocabinet=${tokyocabinet:location}
+environment =
+  LDFLAGS =-Wl,-rpath=${tokyocabinet:location}/lib

Added: erp5/trunk/buildout/software-profiles/tokyocabinet.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/tokyocabinet.cfg?rev=36167&view=auto
==============================================================================
--- erp5/trunk/buildout/software-profiles/tokyocabinet.cfg (added)
+++ erp5/trunk/buildout/software-profiles/tokyocabinet.cfg [utf8] Wed Jun  9 16:31:21 2010
@@ -0,0 +1,13 @@
+[buildout]
+parts = tokyocabinet
+
+[tokyocabinet]
+recipe = hexagonit.recipe.cmmi
+url = http://1978th.net/tokyocabinet/tokyocabinet-1.4.45.tar.gz
+#patch = ${flare-daemonize-timing:location}/${flare-daemonize-timing:filename}
+configure-options =
+  --enable-zlib
+  --enable-bzip
+# disabled for now - those libraries have to be provided by buildout itself
+#  --enable-pthread
+#  --enable-exlzma

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=36167&r1=36166&r2=36167&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Wed Jun  9 16:31:21 2010
@@ -134,6 +134,19 @@ class AssertSoftwareRunable(unittest.Tes
     self.assertEqual(stdout, '')
     self.assertTrue('splitting books' in stderr)
 
+  def test_TokyoCabinet(self):
+    stdout, stderr = subprocess.Popen(["parts/tokyocabinet/bin/tcamgr",
+      "version"],
+        stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+    self.assertEqual(stderr, '')
+    self.assertTrue(stdout.startswith('Tokyo Cabinet'))
+
+  def test_Flare(self):
+    stdout, stderr = subprocess.Popen(["parts/flare/bin/flarei", "-v"],
+        stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+    self.assertEqual(stderr, '')
+    self.assertTrue(stdout.startswith('flare'))
+
 class AssertApache(unittest.TestCase):
   """Tests for built apache"""