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

[nobody at svn.erp5.org]

Author: luke
Date: Thu Aug 26 08:14:33 2010
New Revision: 38018

URL: http://svn.erp5.org?rev=38018&view=rev
Log:
 - download and use local scons instead of using system provided

Modified:
    erp5/trunk/buildout/helpers/debian.lenny.sh
    erp5/trunk/buildout/helpers/fedora.sh
    erp5/trunk/buildout/helpers/mandriva2010.0.sh
    erp5/trunk/buildout/helpers/opensuse.sh
    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=38018&r1=38017&r2=38018&view=diff
==============================================================================
--- erp5/trunk/buildout/helpers/debian.lenny.sh [utf8] (original)
+++ erp5/trunk/buildout/helpers/debian.lenny.sh [utf8] Thu Aug 26 08:14:33 2010
@@ -37,7 +37,6 @@ make
 patch
 python-setuptools
 rpm
-scons
 subversion
 subversion-tools
 tesseract-ocr-dev

Modified: erp5/trunk/buildout/helpers/fedora.sh
URL: http://svn.erp5.org/erp5/trunk/buildout/helpers/fedora.sh?rev=38018&r1=38017&r2=38018&view=diff
==============================================================================
--- erp5/trunk/buildout/helpers/fedora.sh [utf8] (original)
+++ erp5/trunk/buildout/helpers/fedora.sh [utf8] Thu Aug 26 08:14:33 2010
@@ -53,7 +53,6 @@ patch
 python-devel
 python-setuptools
 rpm
-scons
 subversion
 subversion-devel
 tesseract-devel

Modified: erp5/trunk/buildout/helpers/mandriva2010.0.sh
URL: http://svn.erp5.org/erp5/trunk/buildout/helpers/mandriva2010.0.sh?rev=38018&r1=38017&r2=38018&view=diff
==============================================================================
--- erp5/trunk/buildout/helpers/mandriva2010.0.sh [utf8] (original)
+++ erp5/trunk/buildout/helpers/mandriva2010.0.sh [utf8] Thu Aug 26 08:14:33 2010
@@ -48,7 +48,6 @@ patch
 python-devel
 python-setuptools
 rpm
-scons
 subversion
 subversion-devel
 subversion-tools

Modified: erp5/trunk/buildout/helpers/opensuse.sh
URL: http://svn.erp5.org/erp5/trunk/buildout/helpers/opensuse.sh?rev=38018&r1=38017&r2=38018&view=diff
==============================================================================
--- erp5/trunk/buildout/helpers/opensuse.sh [utf8] (original)
+++ erp5/trunk/buildout/helpers/opensuse.sh [utf8] Thu Aug 26 08:14:33 2010
@@ -51,7 +51,6 @@ python-setuptools
 python-xml
 readline-devel
 rpm
-scons
 sqlite3-devel
 subversion
 subversion-devel

Modified: erp5/trunk/buildout/software-profiles/ocropus.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/ocropus.cfg?rev=38018&r1=38017&r2=38018&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/ocropus.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/ocropus.cfg [utf8] Thu Aug 26 08:14:33 2010
@@ -20,6 +20,17 @@ patch-options = -p1
 # in typical buildout run
 environment =
   LDFLAGS =
+  PATH =${scons-bin:destination_directory}:%(PATH)s
+
+[scons-local]
+recipe = hexagonit.recipe.download
+url = http://prdownloads.sourceforge.net/scons/scons-local-2.0.1.tar.gz
+
+[scons-bin]
+recipe = plone.recipe.command
+destination_directory = ${scons-local:location}
+command =
+  ln -sf ${scons-local:location}/scons.py ${:destination_directory}/scons
 
 [iulib-patch-scons]
 recipe = hexagonit.recipe.download
@@ -35,10 +46,10 @@ md5sum = 3d9754dbd64c56029ce1cd7c2f61894
 # workaround http://code.google.com/p/iulib/issues/detail?id=27
 patches = ${iulib-patch-scons:location}/${iulib-patch-scons:filename}
 patch-options = -p1
+environment =
+  PATH =${scons-bin:destination_directory}:%(PATH)s
 
 [requirements]
 development =
   tesseract/baseapi.h
   include/omp.h
-binary =
-  scons