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

[nobody at svn.erp5.org]

Author: luke
Date: Fri Feb 19 18:45:44 2010
New Revision: 32874

URL: http://svn.erp5.org?rev=32874&view=rev
Log:
 - use zc.recipe.egg to generate python2.4 instead of just linking (thanks Leonardo)
 - reuse such generated python in deployment
 - assert if such generated python is able to import all needed libraries

Modified:
    erp5/trunk/buildout/Makefile
    erp5/trunk/buildout/profiles/deployment.cfg
    erp5/trunk/buildout/profiles/official.cfg
    erp5/trunk/buildout/software-profiles/python-2.4.cfg

Modified: erp5/trunk/buildout/Makefile
URL: http://svn.erp5.org/erp5/trunk/buildout/Makefile?rev=32874&r1=32873&r2=32874&view=diff
==============================================================================
--- erp5/trunk/buildout/Makefile [utf8] (original)
+++ erp5/trunk/buildout/Makefile [utf8] Fri Feb 19 18:45:44 2010
@@ -7,7 +7,7 @@
 # run make assert to check that all is working
 assert: assert-software
 
-assert-software: assert-python2.4 assert-eggs-2.4 assert-parts-libs
+assert-software: assert-python2.4 assert-parts-libs
 
 assert-python2.4: bin/python2.4
 	bin/python2.4 -c 'import _ssl'
@@ -15,27 +15,24 @@
 	bin/python2.4 -c 'import dbm'
 	bin/python2.4 -c 'import xml.parsers.expat'
 	bin/python2.4 -c 'import zlib'
-
-assert-eggs-2.4:
-	ls -d eggs/erp5diff-*-py2.4.egg
-	ls -d eggs/fpconst-*-py2.4.egg
-	ls -d eggs/lxml-*-py2.4-*-*.egg
-	ls -d eggs/numpy-*-py2.4-*-*.egg
-	ls -d eggs/python_ldap-*-py2.4-*-*.egg
-	ls -d eggs/python_memcached-*-py2.4.egg
-	ls -d eggs/pytz-*-py2.4.egg
-	ls -d eggs/PyXML-*-py2.4-*-*.egg
-	ls -d eggs/simplejson-*-py2.4-*-*.egg
-	ls -d eggs/SOAPpy-*-py2.4.egg
-	ls -d eggs/threadframe-*-py2.4-*-*.egg
-	ls -d eggs/timerserver-*-py2.4.egg
-	ls -d develop-eggs/itools-*-py2.4-*-*.egg
-	ls -d develop-eggs/itools-*-py2.4-*-*.egg
-	ls -d develop-eggs/MySQL_python-*-py2.4-*-*.egg
-	ldd develop-eggs/MySQL_python-1.2.3c1-py2.4-linux-x86_64.egg/_mysql.so | grep 'parts/mysql-tritonn-5.0/lib/mysql/libmysqlclient_r.so'
+	bin/python2.4 -c 'import lxml'
+	bin/python2.4 -c 'import numpy'
+	bin/python2.4 -c 'import ldap'
+	bin/python2.4 -c 'import pytz'
+	bin/python2.4 -c 'import fpconst'
+	bin/python2.4 -c 'import memcache'
+	bin/python2.4 -c 'import threadframe'
+	bin/python2.4 -c 'import itools'
+	bin/python2.4 -c 'import MySQLdb'
+	# erp5diff
+	# elementtree
+	# PyXML
+	# simplejson
+	# SOAPpy
 
 assert-parts-libs:
 	ldd parts/mysql-tritonn-5.0/libexec/mysqld | grep 'parts/senna/lib/libsenna.so.0'
+	ldd develop-eggs/MySQL_python-1.2.3c1-py2.4-linux-x86_64.egg/_mysql.so | grep 'parts/mysql-tritonn-5.0/lib/mysql/libmysqlclient_r.so'
 	ldd parts/memcached/bin/memcached | grep 'parts/libevent/lib/libevent'
 
 create-mandriva2010-rpm: bin/buildout

Modified: erp5/trunk/buildout/profiles/deployment.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/deployment.cfg?rev=32874&r1=32873&r2=32874&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/deployment.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/deployment.cfg [utf8] Fri Feb 19 18:45:44 2010
@@ -23,3 +23,4 @@
 
 [software_definition]
 software_home = /opt/erp5
+executable = ${:software_home}/bin/python2.4

Modified: erp5/trunk/buildout/profiles/official.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/official.cfg?rev=32874&r1=32873&r2=32874&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/official.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/official.cfg [utf8] Fri Feb 19 18:45:44 2010
@@ -28,7 +28,6 @@
     http://www.nexedi.org/static/packages/source/
 
 parts =
-  pythonbin
   eggs
   apache
   memcached
@@ -47,6 +46,7 @@
   bt5-erp5
   openoffice-bin
   oood
+  pythonbin
 
 [show-requirements]
 recipe = plone.recipe.command

Modified: erp5/trunk/buildout/software-profiles/python-2.4.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/python-2.4.cfg?rev=32874&r1=32873&r2=32874&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/python-2.4.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/python-2.4.cfg [utf8] Fri Feb 19 18:45:44 2010
@@ -31,9 +31,13 @@
 patches = ${python2.4-dbm-patch:location}/${python2.4-dbm-patch:filename}
 
 [pythonbin]
-depends = ${python:recipe}
-recipe = plone.recipe.command
-command = ln -sf ${software_definition:executable} ${software_definition:software_home}/bin/python${buildout:python_version}
+recipe = zc.recipe.egg
+eggs = ${eggs:eggs}
+interpreter = python${buildout:python_version}
+dependent-scripts = true
+scripts =
+  python=${:interpreter}
+  ipython=ipython${buildout:python_version}
 
 [requirements]
 binary =