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

[nobody at svn.erp5.org]

Author: luke
Date: Mon Jun  7 14:52:47 2010
New Revision: 36021

URL: http://svn.erp5.org?rev=36021&view=rev
Log:
 - implement working ocropus recipe for 0.4.4 from tag
Note: Those package is pre-patched in Nexedi repository to mimic configure and
make for hexagonit.recipe.cmmi.

Modified:
    erp5/trunk/buildout/helpers/debian.lenny.sh
    erp5/trunk/buildout/helpers/mandriva2010.0.sh
    erp5/trunk/buildout/profiles/official.cfg
    erp5/trunk/buildout/software-profiles/ocropus.cfg

Modified: erp5/trunk/buildout/helpers/debian.lenny.sh
URL: http://svn.erp5.org/erp5/trunk/buildout/helpers/debian.lenny.sh?rev=36021&r1=36020&r2=36021&view=diff
==============================================================================
--- erp5/trunk/buildout/helpers/debian.lenny.sh [utf8] (original)
+++ erp5/trunk/buildout/helpers/debian.lenny.sh [utf8] Mon Jun  7 14:52:47 2010
@@ -7,7 +7,6 @@
 cpio
 flex
 gcc
-jam
 libbz2-dev
 libgdbm-dev
 libglib2.0-dev
@@ -26,6 +25,7 @@
 patch
 python-setuptools
 rpm
+scons
 subversion
 subversion-tools
 tesseract-ocr-dev

Modified: erp5/trunk/buildout/helpers/mandriva2010.0.sh
URL: http://svn.erp5.org/erp5/trunk/buildout/helpers/mandriva2010.0.sh?rev=36021&r1=36020&r2=36021&view=diff
==============================================================================
--- erp5/trunk/buildout/helpers/mandriva2010.0.sh [utf8] (original)
+++ erp5/trunk/buildout/helpers/mandriva2010.0.sh [utf8] Mon Jun  7 14:52:47 2010
@@ -17,7 +17,6 @@
 bison
 cpio
 flex
-ftjam
 gcc
 gcc-c++
 groff
@@ -39,6 +38,7 @@
 python-devel
 python-setuptools
 rpm
+scons
 subversion
 subversion-devel
 subversion-tools

Modified: erp5/trunk/buildout/profiles/official.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/official.cfg?rev=36021&r1=36020&r2=36021&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/official.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/official.cfg [utf8] Mon Jun  7 14:52:47 2010
@@ -27,7 +27,7 @@
   eggs
   apache
   memcached
-#  ocropus
+  ocropus
 #  haproxy
   varnish
   mysql-tritonn-5.0

Modified: erp5/trunk/buildout/software-profiles/ocropus.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/ocropus.cfg?rev=36021&r1=36020&r2=36021&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/ocropus.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/ocropus.cfg [utf8] Mon Jun  7 14:52:47 2010
@@ -1,21 +1,26 @@
 [buildout]
 parts = ocropus
 
+[ocropus-patch-scons]
+recipe = hexagonit.recipe.download
+download-only = true
+filename = ocropus.SConstruct-local-installation.patch
+url = http://www.nexedi.org/static/packages/source/ocropus/${:filename}
+
 [ocropus]
 recipe = hexagonit.recipe.cmmi
-url = http://ocropus.googlecode.com/files/ocropus-0.1.1.tar.gz
-md5sum = 91a0e9b44d5599f22a42139a93ed0127
+url = http://www.nexedi.org/static/packages/source/ocropus/ocropus-0.4.4.tar.gz
 configure-options =
-  --with-tesseract=/usr
-make-binary=jam
-environment-section = ocropus-environment
+  ${iulib:location}
+patches = ${ocropus-patch-scons:location}/${ocropus-patch-scons:filename}
+patch-options = -p1
 
-[ocropus-environment]
-# fix compilation on debian: http://code.google.com/p/ocropus/issues/detail?id=27#c5
-LIBS=-lpthread
+[iulib]
+recipe = hexagonit.recipe.cmmi
+url = http://www.nexedi.org/static/packages/source/ocropus/iulib-0.4.4.tar.gz
 
 [requirements]
 development =
   tesseract/baseapi.h
 binary =
-  jam
+  scons