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

[nobody at svn.erp5.org]

Author: luke
Date: Wed Jun  9 15:01:53 2010
New Revision: 36160

URL: http://svn.erp5.org?rev=36160&view=rev
Log:
 - build haproxy 1.4.6

Modified:
    erp5/trunk/buildout/profiles/official-2.12.cfg
    erp5/trunk/buildout/profiles/official.cfg
    erp5/trunk/buildout/software-profiles/haproxy.cfg

Modified: erp5/trunk/buildout/profiles/official-2.12.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/official-2.12.cfg?rev=36160&r1=36159&r2=36160&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/official-2.12.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/official-2.12.cfg [utf8] Wed Jun  9 15:01:53 2010
@@ -34,8 +34,8 @@ parts =
   itools-build
   apache
   memcached
-#  ocropus
-#  haproxy
+  ocropus
+  haproxy
   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=36160&r1=36159&r2=36160&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/official.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/official.cfg [utf8] Wed Jun  9 15:01:53 2010
@@ -28,7 +28,7 @@ parts =
   apache
   memcached
   ocropus
-#  haproxy
+  haproxy
   varnish
   mysql-tritonn-5.0
   zope-2.8

Modified: erp5/trunk/buildout/software-profiles/haproxy.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/haproxy.cfg?rev=36160&r1=36159&r2=36160&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/haproxy.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/haproxy.cfg [utf8] Wed Jun  9 15:01:53 2010
@@ -2,9 +2,14 @@
 parts = haproxy
 
 [haproxy]
-recipe = hexagonit.recipe.cmmi
-url = http://haproxy.1wt.eu/download/1.3/src/haproxy-1.3.23.tar.gz
-md5sum = 4ffe926ccf4f4d53f149290eb001fad5
-configure-command =
-make-targets =
-  linux26
+recipe = erp5.recipe.softwareinstance
+url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.6.tar.gz
+# source-directory-contains is a hack for zc.recipe.cmmi
+source-directory-contains = Makefile
+run-configure = false
+# XXX-Luke: autodetection shall be provided by erp5.recipe.softwareinstance
+#           with possible overriding customisation
+# linux26 might be better target, but on this level portability is a must
+make-options = TARGET=generic
+make-install-options = TARGET=generic
+make-install-destination-parameter = PREFIX=