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

[nobody at svn.erp5.org]

Author: luke
Date: Tue Jun 15 10:43:58 2010
New Revision: 36340

URL: http://svn.erp5.org?rev=36340&view=rev
Log:
 - build rdiff-backup 1.0.5 using zc.recipe.egg
 - pin version to 1.0.5
 - move binary to buildout:bin-directory
 - reflect new location in assertion, and fix assertion (-V is to check for version)

Modified:
    erp5/trunk/buildout/profiles/official-2.12.cfg
    erp5/trunk/buildout/profiles/official.cfg
    erp5/trunk/buildout/profiles/versions-2.12.cfg
    erp5/trunk/buildout/profiles/versions.cfg
    erp5/trunk/buildout/software-profiles/rdiff-backup.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=36340&r1=36339&r2=36340&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/official-2.12.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/official-2.12.cfg [utf8] Tue Jun 15 10:43:58 2010
@@ -20,6 +20,7 @@ extends =
   ../software-profiles/oood.cfg
   ../software-profiles/openoffice-bin.cfg
   ../software-profiles/python-2.6.cfg
+  ../software-profiles/rdiff-backup.cfg
   ../software-profiles/varnish.cfg
   ../profiles/common.cfg
 
@@ -35,6 +36,7 @@ parts =
   itools-build
   apache
   memcached
+  rdiff-backup
   ocropus
   haproxy
   flare

Modified: erp5/trunk/buildout/profiles/official.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/official.cfg?rev=36340&r1=36339&r2=36340&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/official.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/official.cfg [utf8] Tue Jun 15 10:43:58 2010
@@ -12,12 +12,12 @@ extends =
   ../software-profiles/imagemagick.cfg
   ../software-profiles/libevent.cfg
   ../software-profiles/memcached.cfg
-  ../software-profiles/rdiff-backup.cfg
   ../software-profiles/mysql-tritonn-5.0.cfg
   ../software-profiles/ocropus.cfg
   ../software-profiles/oood.cfg
   ../software-profiles/openoffice-bin.cfg
   ../software-profiles/python-2.4.cfg
+  ../software-profiles/rdiff-backup.cfg
   ../software-profiles/varnish.cfg
   ../software-profiles/zope-2.8.cfg
   ../profiles/common.cfg

Modified: erp5/trunk/buildout/profiles/versions-2.12.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/versions-2.12.cfg?rev=36340&r1=36339&r2=36340&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/versions-2.12.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/versions-2.12.cfg [utf8] Tue Jun 15 10:43:58 2010
@@ -14,6 +14,7 @@ ipython = 0.10
 numpy = 1.3.0
 plone.recipe.zope2instance = 3.6
 erp5.recipe.standaloneinstance >= 0.4
+rdiff-backup = 1.0.5
 pysvn = 1.7.2
 xml-marshaller = 0.9a
 # Use SOAPpy from http://ibid.omnia.za.net/eggs/ instead of

Modified: erp5/trunk/buildout/profiles/versions.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/versions.cfg?rev=36340&r1=36339&r2=36340&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/versions.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/versions.cfg [utf8] Tue Jun 15 10:43:58 2010
@@ -10,6 +10,6 @@ erp5.recipe.standaloneinstance >= 0.4
 erp5.recipe.mysqlserver >= 1.1.1
 pysvn = 1.7.2
 xml-marshaller = 0.9a
-
+rdiff-backup = 1.0.5
 erp5_products_revision =
 erp5_bt5_revision = ${:erp5_products_revision}

Modified: erp5/trunk/buildout/software-profiles/rdiff-backup.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/rdiff-backup.cfg?rev=36340&r1=36339&r2=36340&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/rdiff-backup.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/rdiff-backup.cfg [utf8] Tue Jun 15 10:43:58 2010
@@ -1,18 +1,12 @@
 [buildout]
-parts = rdiff-backup
+parts =
+  rdiff-backup
 
 [rdiff-backup]
-<= rdiff-backup-1.0.5
-
-[rdiff-backup-1.0.5-download]
-recipe = hexagonit.recipe.download
-url = http://download.savannah.nongnu.org/releases/rdiff-backup/rdiff-backup-1.0.5.tar.gz
-
-[rdiff-backup-1.0.5]
-recipe = plone.recipe.command
-command =
-  cd ${rdiff-backup-1.0.5-download:location}/rdiff-backup-1.0.5
-  ${python2.4:executable} setup.py build
-  ${python2.4:executable} setup.py install --prefix=${buildout:directory}/parts/rdiff-backup
-
-update-command = ${:command}
+# Note: To avoid system dependency on librsync-devel this egg can be split
+# into custom part to build against local librsync and part to generate
+# scripts
+recipe = zc.recipe.egg
+entry-points =
+  rdiff-backup=rdiff_backup.Main:Main
+arguments = sys.argv[1:]

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=36340&r1=36339&r2=36340&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Tue Jun 15 10:43:58 2010
@@ -150,8 +150,8 @@ class AssertSoftwareRunable(unittest.Tes
     self.assertTrue(stdout.startswith('flare'))
 
   def test_rdiff_backup(self):
-    stdout, stderr = subprocess.Popen(["parts/rdiff-backup/bin/rdiff-backup",
-      "-v"], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+    stdout, stderr = subprocess.Popen(["bin/rdiff-backup", "-V"],
+        stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
     self.assertEqual(stderr, '')
     self.assertEqual(stdout.strip(), 'rdiff-backup 1.0.5')