[Erp5-report] r43089 rafael - in /erp5/release/candidate: instance-profiles/ profiles/ soft...
nobody at svn.erp5.org
nobody at svn.erp5.org
Sat Feb 5 00:47:35 CET 2011
Author: rafael
Date: Sat Feb 5 00:47:34 2011
New Revision: 43089
URL: http://svn.erp5.org?rev=43089&view=rev
Log:
Update candidate to use buildout at revision 43008 (trunk).
Added:
erp5/release/candidate/profiles/bt5.cfg
erp5/release/candidate/software-profiles/m2crypto.cfg
erp5/release/candidate/software-profiles/opensp.cfg
erp5/release/candidate/software-profiles/perl-Class-Accessor.cfg
erp5/release/candidate/software-profiles/perl-Config-General.cfg
erp5/release/candidate/software-profiles/perl-Encode-HanExtra.cfg
erp5/release/candidate/software-profiles/perl-HTML-Encoding.cfg
erp5/release/candidate/software-profiles/perl-HTML-Parser.cfg
erp5/release/candidate/software-profiles/perl-HTML-Tagset.cfg
erp5/release/candidate/software-profiles/perl-HTML-Template.cfg
erp5/release/candidate/software-profiles/perl-JSON.cfg
erp5/release/candidate/software-profiles/perl-Net-IP.cfg
erp5/release/candidate/software-profiles/perl-SGML-Parser-OpenSP.cfg
erp5/release/candidate/software-profiles/perl-URI.cfg
erp5/release/candidate/software-profiles/perl-XML-LibXML.cfg
erp5/release/candidate/software-profiles/perl-XML-NamespaceSupport.cfg
erp5/release/candidate/software-profiles/perl-XML-SAX.cfg
erp5/release/candidate/software-profiles/perl-libwww-perl.cfg
erp5/release/candidate/software-profiles/perl.cfg
erp5/release/candidate/software-profiles/swig.cfg
erp5/release/candidate/software-profiles/tesseract.cfg
erp5/release/candidate/software-profiles/w3-validator.cfg
Modified:
erp5/release/candidate/instance-profiles/testrunner.cfg
erp5/release/candidate/profiles/development-2.12.cfg
erp5/release/candidate/profiles/development.cfg
erp5/release/candidate/profiles/official-2.12.cfg
erp5/release/candidate/profiles/official.cfg
erp5/release/candidate/profiles/software-common.cfg
erp5/release/candidate/profiles/versions-2.12.cfg
erp5/release/candidate/profiles/versions-common.cfg
erp5/release/candidate/profiles/versions.cfg
erp5/release/candidate/software-profiles/autoconf.cfg
erp5/release/candidate/software-profiles/automake.cfg
erp5/release/candidate/software-profiles/erp5-2.12.cfg
erp5/release/candidate/software-profiles/erp5.cfg
erp5/release/candidate/software-profiles/fonts.cfg
erp5/release/candidate/software-profiles/git.cfg
erp5/release/candidate/software-profiles/mysql-python.cfg
erp5/release/candidate/software-profiles/stunnel.cfg
erp5/release/candidate/software-profiles/varnish.cfg
erp5/release/candidate/tests/assertSoftware.py
Modified: erp5/release/candidate/instance-profiles/testrunner.cfg
URL: http://svn.erp5.org/erp5/release/candidate/instance-profiles/testrunner.cfg?rev=43089&r1=43088&r2=43089&view=diff
==============================================================================
--- erp5/release/candidate/instance-profiles/testrunner.cfg [utf8] (original)
+++ erp5/release/candidate/instance-profiles/testrunner.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -20,10 +20,10 @@ location = ${create-test-runner-place:te
# when this template be used.
products =
${software_definition:products-zope}
-
-bt5_path =
-instance-home =
+bt5_path =
+
+instance-home =
# MySQL
# below could be set in configuration
@@ -41,6 +41,3 @@ initialization =
import os
os.environ['PATH'] = ':'.join(['${buildout:data-bin-directory}','${buildout:bin-directory}'] + os.environ.get('PATH','').split(':'))
sys.argv.insert(1, '--conversion_server_port=${configuration:oood_port}')
- sys.argv.insert(1, '--use_dummy_mail_host')
- os.environ['REAL_INSTANCE_HOME'] = '${:location}'
-
Added: erp5/release/candidate/profiles/bt5.cfg
URL: http://svn.erp5.org/erp5/release/candidate/profiles/bt5.cfg?rev=43089&view=auto
==============================================================================
--- erp5/release/candidate/profiles/bt5.cfg (added)
+++ erp5/release/candidate/profiles/bt5.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -0,0 +1,23 @@
+# Independent profile (disconnect from others) which can be used to
+# create private business template repositories. This profile is
+# experimental and we highly recommend use default repositories.
+[buildout]
+extends =
+ versions-common.cfg
+ software-definition.cfg
+ common.cfg
+
+parts = bt5
+
+[bt5]
+recipe = erp5.recipe.btrepository
+preserve-download = 0
+url =
+ https://svn.erp5.org/repos/public/erp5/trunk/products/ERP5/bootstrap/
+ https://svn.erp5.org/repos/public/erp5/trunk/bt5
+
+download-command-extra = -r ${versions:erp5_bt5_revision}
+
+# Use svn compiled from software.
+svn-params = --trust-server-cert --non-interactive --quiet
+download-command = ${software_definition:software_home}/parts/subversion/bin/svn co ${:svn-params}
Modified: erp5/release/candidate/profiles/development-2.12.cfg
URL: http://svn.erp5.org/erp5/release/candidate/profiles/development-2.12.cfg?rev=43089&r1=43088&r2=43089&view=diff
==============================================================================
--- erp5/release/candidate/profiles/development-2.12.cfg [utf8] (original)
+++ erp5/release/candidate/profiles/development-2.12.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -2,7 +2,9 @@
# You should build a software home before use this recipe.
[buildout]
-extends = deployment-2.12.cfg
+extends =
+ bt5.cfg
+ deployment-2.12.cfg
parts +=
development-site
@@ -26,9 +28,6 @@ extra-paths = ${development-site:extra-p
products = ${configuration:development_site_products}
instance-home = ${configuration:development_site_instancehome}
-initialization =
- import os
- os.environ['PATH'] = ':'.join(['${buildout:data-bin-directory}','${buildout:bin-directory}'] + os.environ.get('PATH','').split(':'))
mysql_create_database = false
mysql_database_name = test212
mysql_user = test
Modified: erp5/release/candidate/profiles/development.cfg
URL: http://svn.erp5.org/erp5/release/candidate/profiles/development.cfg?rev=43089&r1=43088&r2=43089&view=diff
==============================================================================
--- erp5/release/candidate/profiles/development.cfg [utf8] (original)
+++ erp5/release/candidate/profiles/development.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -2,7 +2,9 @@
# You should build a software home before use this recipe.
[buildout]
-extends = deployment.cfg
+extends =
+ bt5.cfg
+ deployment.cfg
parts +=
development-site
Modified: erp5/release/candidate/profiles/official-2.12.cfg
URL: http://svn.erp5.org/erp5/release/candidate/profiles/official-2.12.cfg?rev=43089&r1=43088&r2=43089&view=diff
==============================================================================
--- erp5/release/candidate/profiles/official-2.12.cfg [utf8] (original)
+++ erp5/release/candidate/profiles/official-2.12.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -19,6 +19,7 @@ extends =
../software-profiles/libevent.cfg
../software-profiles/libpng.cfg
../software-profiles/libtool.cfg
+ ../software-profiles/m2crypto.cfg
../software-profiles/mariadb.cfg
../software-profiles/memcached.cfg
../software-profiles/messagepack.cfg
@@ -26,6 +27,7 @@ extends =
../software-profiles/mysql-tritonn-5.0.cfg
../software-profiles/sphinx.cfg
../software-profiles/stunnel.cfg
+ ../software-profiles/w3-validator.cfg
../software-profiles/oood.cfg
../software-profiles/openoffice-bin.cfg
../software-profiles/python-2.6.cfg
@@ -58,9 +60,7 @@ parts =
imagemagick
kumo
messagepack
- products-deps
- products-erp5
- products-erp5-development
+ w3-validator
openoffice-bin
oood
eggs
@@ -73,6 +73,11 @@ parts =
liberation-fonts
ipaex-fonts
+# Zope products
+ products-deps
+ products-erp5
+ products-erp5-development
+
[bootstrap2.6]
# as bootstrap in python software does not know that slapos.rebootstrap >= 2.0
# is used it is required to go back to default -- use own version of python
Modified: erp5/release/candidate/profiles/official.cfg
URL: http://svn.erp5.org/erp5/release/candidate/profiles/official.cfg?rev=43089&r1=43088&r2=43089&view=diff
==============================================================================
--- erp5/release/candidate/profiles/official.cfg [utf8] (original)
+++ erp5/release/candidate/profiles/official.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -19,6 +19,7 @@ extends =
../software-profiles/libevent.cfg
../software-profiles/libpng.cfg
../software-profiles/libtool.cfg
+ ../software-profiles/m2crypto.cfg
../software-profiles/mariadb.cfg
../software-profiles/memcached.cfg
../software-profiles/messagepack.cfg
@@ -26,6 +27,7 @@ extends =
../software-profiles/mysql-tritonn-5.0.cfg
../software-profiles/sphinx.cfg
../software-profiles/stunnel.cfg
+ ../software-profiles/w3-validator.cfg
../software-profiles/oood.cfg
../software-profiles/openoffice-bin.cfg
../software-profiles/python-2.4.cfg
@@ -64,10 +66,7 @@ parts =
itools
bootstrap2.4
mysql-python
- products-deps
- products-erp5
- products-erp5-development
- products-other
+ w3-validator
openoffice-bin
oood
precache-eggs
@@ -79,6 +78,12 @@ parts =
liberation-fonts
ipaex-fonts
+# Zope products
+ products-deps
+ products-erp5
+ products-erp5-development
+ products-other
+
[bootstrap2.4]
# as bootstrap in python software does not know that slapos.rebootstrap >= 2.0
# is used it is required to go back to default -- use own version of python
Modified: erp5/release/candidate/profiles/software-common.cfg
URL: http://svn.erp5.org/erp5/release/candidate/profiles/software-common.cfg?rev=43089&r1=43088&r2=43089&view=diff
==============================================================================
--- erp5/release/candidate/profiles/software-common.cfg [utf8] (original)
+++ erp5/release/candidate/profiles/software-common.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -22,6 +22,7 @@ eggs =
erp5.recipe.apache
erp5.recipe.cloudoooinstance
erp5.recipe.genbt5list
+ erp5.recipe.btrepository
erp5.recipe.memcachedserver
erp5.recipe.mysqldatabase
erp5.recipe.mysqlserver
Modified: erp5/release/candidate/profiles/versions-2.12.cfg
URL: http://svn.erp5.org/erp5/release/candidate/profiles/versions-2.12.cfg?rev=43089&r1=43088&r2=43089&view=diff
==============================================================================
--- erp5/release/candidate/profiles/versions-2.12.cfg [utf8] (original)
+++ erp5/release/candidate/profiles/versions-2.12.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -17,7 +17,7 @@ Products.Zelenium >= 1.0.3
erp5.recipe.zope2instance >= 2.0
###### RELEASE DEFINITION #######
-erp5_products_revision = 42600
+erp5_products_revision = 43008
MySQL-python = 1.2.3
Paste = 1.7.5.1
Products.CMFActionIcons = 2.1.3
@@ -39,12 +39,12 @@ chardet = 1.0.1
cloudooo = 1.2.1
collective.recipe.supervisor = 0.14
collective.recipe.template = 1.8
-distribute = 0.6.14
elementtree = 1.2.7-20070827-preview
erp5.conflictresolver = 0.3
-erp5.extension.sectionextender = 0.2
+erp5.extension.sectionextender = 0.3
erp5.recipe.apache = 1.0.dev-r41446
-erp5.recipe.cloudoooinstance = 0.0.2
+erp5.recipe.btrepository = 0.0.1
+erp5.recipe.cloudoooinstance = 0.0.4
erp5.recipe.cmmiforcei686 = 0.1.1
erp5.recipe.genbt5list = 1.0.1
erp5.recipe.memcachedserver = 0.0.4
@@ -52,16 +52,17 @@ erp5.recipe.mysqldatabase = 1.0.3
erp5.recipe.mysqlserver = 1.1.8
erp5.recipe.ooodinstance = 0.0.1
erp5.recipe.sphinxserver = 1.0.2
-erp5.recipe.testrunner = 1.0.7
+erp5.recipe.testrunner = 1.0.8
+erp5.recipe.w3validator = 1.0.0
erp5.recipe.zope2instance = 2.0.1
-erp5diff = 0.8.1.0
-feedparser = 4.1
+erp5diff = 0.8.1.3
+feedparser = 5.0
five.localsitemanager = 2.0.4
hexagonit.recipe.cmmi = 1.5.0
-hexagonit.recipe.download = 1.4.1
+hexagonit.recipe.download = 1.5.0
ipdb = 0.3
meld3 = 0.6.7
-mr.developer = 1.16
+mr.developer = 1.17
ordereddict = 1.1
paramiko = 1.7.6
plone.recipe.command = 1.1
@@ -96,11 +97,15 @@ PasteScript = 1.7.3
WSGIUtils = 0.7
#Required by:
-#mr.developer 1.16
+#mr.developer 1.17
#cloudooo 1.2.1
argparse = 1.1
#Required by:
+#erp5.recipe.btrepository 0.0.1
+erp5.utils.dists = 0.0.1dev-r42989
+
+#Required by:
#SOAPpy 0.12.0nxd001
fpconst = 0.7.2
@@ -117,11 +122,15 @@ mailinglogger = 3.3.3
python-magic = 0.4.0.1
#Required by:
-#erp5.recipe.cloudoooinstance 0.0.2
+#zc.buildout 1.5.2
+setuptools = 0.6c12dev-r88124
+
+#Required by:
+#erp5.recipe.cloudoooinstance 0.0.4
z3c.recipe.template = 0.1
#Required by:
-#mr.developer 1.16
+#mr.developer 1.17
#z3c.recipe.mkdir 0.3.1
#collective.recipe.supervisor 0.14
#plone.recipe.command 1.1
Modified: erp5/release/candidate/profiles/versions-common.cfg
URL: http://svn.erp5.org/erp5/release/candidate/profiles/versions-common.cfg?rev=43089&r1=43088&r2=43089&view=diff
==============================================================================
--- erp5/release/candidate/profiles/versions-common.cfg [utf8] (original)
+++ erp5/release/candidate/profiles/versions-common.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -1,10 +1,11 @@
# Common packages versions for all flavours
[versions]
# XXX refactor parts shared with versions.cfg into a common file
-PyXML = 0.8.4
erp5_bt5_revision = ${:erp5_products_revision}
erp5_products_revision = HEAD
numpy = 1.3.0
+# Patched version which support python 2.6
+PyXML = 0.8.4nxd001
# modified version that works fine for buildout installation
SOAPpy = 0.12.0nxd001
# we are still using this old stable version.
@@ -31,7 +32,7 @@ setuptools =
# Use version of slapos.rebootstrap, with stabilised prefix
slapos.rebootstrap >= 2.1
-slapos.tool.networkcache >= 0.1.3
+slapos.tool.networkcache = 0.1.4.dev-r3877
# official pysvn egg does not supports --include-dirs and
# --library-dirs, so we use our modified version
Modified: erp5/release/candidate/profiles/versions.cfg
URL: http://svn.erp5.org/erp5/release/candidate/profiles/versions.cfg?rev=43089&r1=43088&r2=43089&view=diff
==============================================================================
--- erp5/release/candidate/profiles/versions.cfg [utf8] (original)
+++ erp5/release/candidate/profiles/versions.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -21,7 +21,7 @@ zc.recipe.egg = 1.2.2
erp5.recipe.zope2instance = 1.3.1
###### RELEASE DEFINITION #######
-erp5_products_revision = 42600
+erp5_products_revision = 43008
ClientForm = 0.2.10
MySQL-python = 1.2.3
Paste = 1.7.5.1
@@ -31,11 +31,11 @@ cloudooo = 1.2.1
collective.recipe.supervisor = 0.14
collective.recipe.template = 1.8
ctypes = 1.0.2.1
-distribute = 0.6.14
erp5.conflictresolver = 0.3
-erp5.extension.sectionextender = 0.2
+erp5.extension.sectionextender = 0.3
erp5.recipe.apache = 1.0.dev-r41446
-erp5.recipe.cloudoooinstance = 0.0.2
+erp5.recipe.btrepository = 0.0.1
+erp5.recipe.cloudoooinstance = 0.0.4
erp5.recipe.cmmiforcei686 = 0.1.1
erp5.recipe.genbt5list = 1.0.1
erp5.recipe.memcachedserver = 0.0.4
@@ -43,16 +43,17 @@ erp5.recipe.mysqldatabase = 1.0.3
erp5.recipe.mysqlserver = 1.1.8
erp5.recipe.ooodinstance = 0.0.1
erp5.recipe.sphinxserver = 1.0.2
-erp5.recipe.testrunner = 1.0.7
+erp5.recipe.testrunner = 1.0.8
+erp5.recipe.w3validator = 1.0.0
erp5.recipe.zope2install = 1.0
-erp5diff = 0.8.1.0
-feedparser = 4.1
+erp5diff = 0.8.1.3
+feedparser = 5.0
hexagonit.recipe.cmmi = 1.5.0
invokepython = 0.4
ipdb = 0.3
mechanize = 0.2.4
meld3 = 0.6.7
-mr.developer = 1.16
+mr.developer = 1.17
ordereddict = 1.1
paramiko = 1.7.6
plone.recipe.command = 1.1
@@ -88,22 +89,26 @@ PasteScript = 1.7.3
WSGIUtils = 0.7
#Required by:
-#mr.developer 1.16
+#mr.developer 1.17
#cloudooo 1.2.1
argparse = 1.1
#Required by:
-#mr.developer 1.16
+#mr.developer 1.17
#supervisor 3.0a9
elementtree = 1.2.7-20070827-preview
#Required by:
+#erp5.recipe.btrepository 0.0.1
+erp5.utils.dists = 0.0.1dev-r42989
+
+#Required by:
#SOAPpy 0.12.0nxd001
fpconst = 0.7.2
#Required by:
#hexagonit.recipe.cmmi 1.5.0
-hexagonit.recipe.download = 1.4.1
+hexagonit.recipe.download = 1.5.0
#Required by:
#ipdb 0.3
@@ -118,11 +123,15 @@ plone.recipe.zope2install = 3.3
python-magic = 0.4.0.1
#Required by:
-#erp5.recipe.cloudoooinstance 0.0.2
+#zc.buildout 1.5.2
+setuptools = 0.6c12dev-r88124
+
+#Required by:
+#erp5.recipe.cloudoooinstance 0.0.4
z3c.recipe.template = 0.1
#Required by:
-#mr.developer 1.16
+#mr.developer 1.17
#z3c.recipe.mkdir 0.3.1
#collective.recipe.supervisor 0.14
#plone.recipe.command 1.1
Modified: erp5/release/candidate/software-profiles/autoconf.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/autoconf.cfg?rev=43089&r1=43088&r2=43089&view=diff
==============================================================================
--- erp5/release/candidate/software-profiles/autoconf.cfg [utf8] (original)
+++ erp5/release/candidate/software-profiles/autoconf.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -1,6 +1,7 @@
[buildout]
extends =
m4.cfg
+ perl.cfg
parts =
autoconf
@@ -10,3 +11,4 @@ url = http://ftp.gnu.org/gnu/autoconf/au
md5sum = c3b5247592ce694f7097873aa07d66fe
environment =
M4=${m4:location}/bin/m4
+ PATH=${perl:location}/bin:%(PATH)s
Modified: erp5/release/candidate/software-profiles/automake.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/automake.cfg?rev=43089&r1=43088&r2=43089&view=diff
==============================================================================
--- erp5/release/candidate/software-profiles/automake.cfg [utf8] (original)
+++ erp5/release/candidate/software-profiles/automake.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -1,12 +1,13 @@
[buildout]
-parts =
- automake-1.11
extends =
autoconf.cfg
+ perl.cfg
+parts =
+ automake-1.11
[automake-1.11]
recipe = hexagonit.recipe.cmmi
md5sum = c2972c4d9b3e29c03d5f2af86249876f
url = http://ftp.gnu.org/gnu/automake/automake-1.11.1.tar.bz2
environment =
- PATH =${autoconf:location}/bin:%(PATH)s
+ PATH =${autoconf:location}/bin:${perl:location}/bin:%(PATH)s
Modified: erp5/release/candidate/software-profiles/erp5-2.12.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/erp5-2.12.cfg?rev=43089&r1=43088&r2=43089&view=diff
==============================================================================
--- erp5/release/candidate/software-profiles/erp5-2.12.cfg [utf8] (original)
+++ erp5/release/candidate/software-profiles/erp5-2.12.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -54,9 +54,11 @@ command =
${subversion:location}/bin/svn checkout ${:svn_param} https://svn.plone.org/svn/collective/ExtFile/trunk ${:location}/ExtFile &&
${git:location}/bin/git clone --quiet git://git.hforge.org/Localizer.git ${:location}/Localizer
update-command =
- ${subversion:location}/bin/svn checkout ${:svn_param} https://svn.plone.org/svn/collective/ExtFile/trunk ${:location}/ExtFile &&
- cd ${:location}/Localizer &&
- ${git:location}/bin/git pull --quiet
+ if ${buildout:newest}; then
+ ${subversion:location}/bin/svn checkout ${:svn_param} https://svn.plone.org/svn/collective/ExtFile/trunk ${:location}/ExtFile &&
+ cd ${:location}/Localizer &&
+ ${git:location}/bin/git pull --quiet
+ fi
[eggs]
recipe = zc.recipe.egg
Modified: erp5/release/candidate/software-profiles/erp5.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/erp5.cfg?rev=43089&r1=43088&r2=43089&view=diff
==============================================================================
--- erp5/release/candidate/software-profiles/erp5.cfg [utf8] (original)
+++ erp5/release/candidate/software-profiles/erp5.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -84,8 +84,8 @@ eggs =
${lxml-python:egg}
${pysvn-python:egg}
${python-ldap-python:egg}
- ClientForm
PyXML
+ ClientForm
SOAPpy
cElementTree
chardet
@@ -94,7 +94,6 @@ eggs =
erp5.recipe.mysqldatabase
erp5diff
ipdb
- lxml
mechanize
numpy
ordereddict
Modified: erp5/release/candidate/software-profiles/fonts.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/fonts.cfg?rev=43089&r1=43088&r2=43089&view=diff
==============================================================================
--- erp5/release/candidate/software-profiles/fonts.cfg [utf8] (original)
+++ erp5/release/candidate/software-profiles/fonts.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -21,6 +21,6 @@ destination = ${fonts:location}/${:_buil
[ipaex-fonts]
recipe = hexagonit.recipe.download
strip-top-level-dir = true
-url = http://info.openlab.ipa.go.jp/ipafont/fontdata/IPAexfont00102.zip
-md5sum = 3523edc3ef24f99c6d10781ad87c497a
+url = http://info.openlab.ipa.go.jp/ipafont/fontdata/IPAexfont00103.zip
+md5sum = ac67b2fc3aab7f683d89f0070df284e7
destination = ${fonts:location}/${:_buildout_section_name_}
Modified: erp5/release/candidate/software-profiles/git.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/git.cfg?rev=43089&r1=43088&r2=43089&view=diff
==============================================================================
--- erp5/release/candidate/software-profiles/git.cfg [utf8] (original)
+++ erp5/release/candidate/software-profiles/git.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -6,6 +6,7 @@ extends =
curl.cfg
libexpat.cfg
openssl.cfg
+ perl.cfg
zlib.cfg
parts =
git
@@ -19,6 +20,7 @@ configure-options =
--with-openssl=${openssl:location}
--with-zlib=${zlib:location}
--with-expat=${libexpat:location}
+ --with-perl=${perl:location}/bin/perl
--without-python
--without-tcltk
Added: erp5/release/candidate/software-profiles/m2crypto.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/m2crypto.cfg?rev=43089&view=auto
==============================================================================
--- erp5/release/candidate/software-profiles/m2crypto.cfg (added)
+++ erp5/release/candidate/software-profiles/m2crypto.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -0,0 +1,23 @@
+# M2Crypto - A Python crypto and SSL toolkit
+# http://chandlerproject.org/Projects/MeTooCrypto
+
+[buildout]
+extends =
+ openssl.cfg
+ swig.cfg
+parts =
+ M2Crypto
+
+[M2Crypto]
+recipe = zc.recipe.egg:custom
+egg = M2Crypto
+environment = M2Crypto-env
+rpath =
+ ${openssl:location}/lib/
+include-dirs =
+ ${openssl:location}/include
+library-dirs =
+ ${openssl:location}/lib
+
+[M2Crypto-env]
+PATH = ${swig:location}/bin:%(PATH)s
Modified: erp5/release/candidate/software-profiles/mysql-python.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/mysql-python.cfg?rev=43089&r1=43088&r2=43089&view=diff
==============================================================================
--- erp5/release/candidate/software-profiles/mysql-python.cfg [utf8] (original)
+++ erp5/release/candidate/software-profiles/mysql-python.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -1,6 +1,6 @@
[buildout]
extends =
- mysql-tritonn-5.0.cfg
+ mariadb.cfg
openssl.cfg
zlib.cfg
@@ -8,13 +8,13 @@ parts =
mysql-python
[mysql-python-env]
-PATH =${mysql-tritonn-5.0:location}/bin:%(PATH)s
+PATH =${mariadb:location}/bin:%(PATH)s
[mysql-python]
recipe = zc.recipe.egg:custom
egg = MySQL-python
environment = mysql-python-env
rpath =
- ${mysql-tritonn-5.0:location}/lib/mysql/
+ ${mariadb:location}/lib/mysql/
${zlib:location}/lib/
${openssl:location}/lib/
Added: erp5/release/candidate/software-profiles/opensp.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/opensp.cfg?rev=43089&view=auto
==============================================================================
--- erp5/release/candidate/software-profiles/opensp.cfg (added)
+++ erp5/release/candidate/software-profiles/opensp.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -0,0 +1,7 @@
+[buildout]
+[opensp]
+recipe = hexagonit.recipe.cmmi
+url = http://prdownloads.sourceforge.net/openjade/OpenSP-1.5.2.tar.gz
+md5sum = 670b223c5d12cee40c9137be86b6c39b
+configure-options =
+ --disable-doc-build
Added: erp5/release/candidate/software-profiles/perl-Class-Accessor.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/perl-Class-Accessor.cfg?rev=43089&view=auto
==============================================================================
--- erp5/release/candidate/software-profiles/perl-Class-Accessor.cfg (added)
+++ erp5/release/candidate/software-profiles/perl-Class-Accessor.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -0,0 +1,11 @@
+[buildout]
+extends =
+ perl.cfg
+parts =
+ perl-Class-Accessor
+
+[perl-Class-Accessor]
+recipe = hexagonit.recipe.cmmi
+url = http://search.cpan.org/CPAN/authors/id/K/KA/KASEI/Class-Accessor-0.34.tar.gz
+configure-command =
+ ${perl:location}/bin/perl Makefile.PL
Added: erp5/release/candidate/software-profiles/perl-Config-General.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/perl-Config-General.cfg?rev=43089&view=auto
==============================================================================
--- erp5/release/candidate/software-profiles/perl-Config-General.cfg (added)
+++ erp5/release/candidate/software-profiles/perl-Config-General.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -0,0 +1,11 @@
+[buildout]
+extends =
+ perl.cfg
+parts =
+ perl-Config-General
+
+[perl-Config-General]
+recipe = hexagonit.recipe.cmmi
+url = http://search.cpan.org/CPAN/authors/id/T/TL/TLINDEN/Config-General-2.50.tar.gz
+configure-command =
+ ${perl:location}/bin/perl Makefile.PL
Added: erp5/release/candidate/software-profiles/perl-Encode-HanExtra.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/perl-Encode-HanExtra.cfg?rev=43089&view=auto
==============================================================================
--- erp5/release/candidate/software-profiles/perl-Encode-HanExtra.cfg (added)
+++ erp5/release/candidate/software-profiles/perl-Encode-HanExtra.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -0,0 +1,11 @@
+[buildout]
+extends =
+ perl.cfg
+parts =
+ perl-Encode-HanExtra
+
+[perl-Encode-HanExtra]
+recipe = hexagonit.recipe.cmmi
+url = http://search.cpan.org/CPAN/authors/id/A/AU/AUDREYT/Encode-HanExtra-0.23.tar.gz
+configure-command =
+ ${perl:location}/bin/perl Makefile.PL
Added: erp5/release/candidate/software-profiles/perl-HTML-Encoding.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/perl-HTML-Encoding.cfg?rev=43089&view=auto
==============================================================================
--- erp5/release/candidate/software-profiles/perl-HTML-Encoding.cfg (added)
+++ erp5/release/candidate/software-profiles/perl-HTML-Encoding.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -0,0 +1,11 @@
+[buildout]
+extends =
+ perl.cfg
+parts =
+ perl-HTML-Encoding
+
+[perl-HTML-Encoding]
+recipe = hexagonit.recipe.cmmi
+url = http://search.cpan.org/CPAN/authors/id/B/BJ/BJOERN/HTML-Encoding-0.61.tar.gz
+configure-command =
+ ${perl:location}/bin/perl Makefile.PL
Added: erp5/release/candidate/software-profiles/perl-HTML-Parser.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/perl-HTML-Parser.cfg?rev=43089&view=auto
==============================================================================
--- erp5/release/candidate/software-profiles/perl-HTML-Parser.cfg (added)
+++ erp5/release/candidate/software-profiles/perl-HTML-Parser.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -0,0 +1,14 @@
+[buildout]
+extends =
+ perl.cfg
+ perl-HTML-Tagset.cfg
+parts =
+ perl-HTML-Parser
+
+[perl-HTML-Parser]
+recipe = hexagonit.recipe.cmmi
+depends =
+ ${perl-HTML-Tagset:location}
+url = http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTML-Parser-3.68.tar.gz
+configure-command =
+ ${perl:location}/bin/perl Makefile.PL
Added: erp5/release/candidate/software-profiles/perl-HTML-Tagset.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/perl-HTML-Tagset.cfg?rev=43089&view=auto
==============================================================================
--- erp5/release/candidate/software-profiles/perl-HTML-Tagset.cfg (added)
+++ erp5/release/candidate/software-profiles/perl-HTML-Tagset.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -0,0 +1,11 @@
+[buildout]
+extends =
+ perl.cfg
+parts =
+ perl-HTML-Tagset
+
+[perl-HTML-Tagset]
+recipe = hexagonit.recipe.cmmi
+url = http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/HTML-Tagset-3.20.tar.gz
+configure-command =
+ ${perl:location}/bin/perl Makefile.PL
Added: erp5/release/candidate/software-profiles/perl-HTML-Template.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/perl-HTML-Template.cfg?rev=43089&view=auto
==============================================================================
--- erp5/release/candidate/software-profiles/perl-HTML-Template.cfg (added)
+++ erp5/release/candidate/software-profiles/perl-HTML-Template.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -0,0 +1,11 @@
+[buildout]
+extends =
+ perl.cfg
+parts =
+ perl-HTML-Template
+
+[perl-HTML-Template]
+recipe = hexagonit.recipe.cmmi
+url = http://search.cpan.org/CPAN/authors/id/S/SA/SAMTREGAR/HTML-Template-2.9.tar.gz
+configure-command =
+ ${perl:location}/bin/perl Makefile.PL
Added: erp5/release/candidate/software-profiles/perl-JSON.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/perl-JSON.cfg?rev=43089&view=auto
==============================================================================
--- erp5/release/candidate/software-profiles/perl-JSON.cfg (added)
+++ erp5/release/candidate/software-profiles/perl-JSON.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -0,0 +1,11 @@
+[buildout]
+extends =
+ perl.cfg
+parts =
+ perl-JSON
+
+[perl-JSON]
+recipe = hexagonit.recipe.cmmi
+url = http://search.cpan.org/CPAN/authors/id/M/MA/MAKAMAKA/JSON-2.50.tar.gz
+configure-command =
+ ${perl:location}/bin/perl Makefile.PL
Added: erp5/release/candidate/software-profiles/perl-Net-IP.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/perl-Net-IP.cfg?rev=43089&view=auto
==============================================================================
--- erp5/release/candidate/software-profiles/perl-Net-IP.cfg (added)
+++ erp5/release/candidate/software-profiles/perl-Net-IP.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -0,0 +1,11 @@
+[buildout]
+extends =
+ perl.cfg
+parts =
+ perl-Net-IP
+
+[perl-Net-IP]
+recipe = hexagonit.recipe.cmmi
+url = http://search.cpan.org/CPAN/authors/id/M/MA/MANU/Net-IP-1.25.tar.gz
+configure-command =
+ ${perl:location}/bin/perl Makefile.PL
Added: erp5/release/candidate/software-profiles/perl-SGML-Parser-OpenSP.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/perl-SGML-Parser-OpenSP.cfg?rev=43089&view=auto
==============================================================================
--- erp5/release/candidate/software-profiles/perl-SGML-Parser-OpenSP.cfg (added)
+++ erp5/release/candidate/software-profiles/perl-SGML-Parser-OpenSP.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -0,0 +1,18 @@
+[buildout]
+extends =
+ opensp.cfg
+ perl.cfg
+ perl-Class-Accessor.cfg
+parts =
+ perl-SGML-Parser-OpenSP
+
+[perl-SGML-Parser-OpenSP]
+recipe = hexagonit.recipe.cmmi
+depends =
+ ${perl-Class-Accessor:location}
+url = http://search.cpan.org/CPAN/authors/id/B/BJ/BJOERN/SGML-Parser-OpenSP-0.994.tar.gz
+configure-command =
+ ${perl:location}/bin/perl Makefile.PL
+make-options =
+ INC=-I${opensp:location}/include
+ OTHERLDFLAGS="-L${opensp:location}/lib -Wl,-rpath -Wl,${opensp:location}/lib"
Added: erp5/release/candidate/software-profiles/perl-URI.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/perl-URI.cfg?rev=43089&view=auto
==============================================================================
--- erp5/release/candidate/software-profiles/perl-URI.cfg (added)
+++ erp5/release/candidate/software-profiles/perl-URI.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -0,0 +1,11 @@
+[buildout]
+extends =
+ perl.cfg
+parts =
+ perl-URI
+
+[perl-URI]
+recipe = hexagonit.recipe.cmmi
+url = http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/URI-1.58.tar.gz
+configure-command =
+ ${perl:location}/bin/perl Makefile.PL
Added: erp5/release/candidate/software-profiles/perl-XML-LibXML.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/perl-XML-LibXML.cfg?rev=43089&view=auto
==============================================================================
--- erp5/release/candidate/software-profiles/perl-XML-LibXML.cfg (added)
+++ erp5/release/candidate/software-profiles/perl-XML-LibXML.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -0,0 +1,24 @@
+[buildout]
+extends =
+ libxml2.cfg
+ perl.cfg
+ perl-XML-NamespaceSupport.cfg
+ perl-XML-SAX.cfg
+ zlib.cfg
+parts =
+ perl-XML-LibXML
+
+[perl-XML-LibXML]
+recipe = hexagonit.recipe.cmmi
+depends =
+ ${perl-XML-NamespaceSupport:location}
+ ${perl-XML-SAX:location}
+url = http://search.cpan.org/CPAN/authors/id/P/PA/PAJAS/XML-LibXML-1.70.tar.gz
+configure-command =
+ ${perl:location}/bin/perl Makefile.PL DEBUG=1 \
+ INC=-I${libxml2:location}/include/libxml2 \
+ LIBS="-L${libxml2:location}/lib -L${zlib:location}/lib"
+make-options =
+ OTHERLDFLAGS=" -Wl,-rpath -Wl,${libxml2:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib"
+environment =
+ LD_LIBRARY_PATH=${libxml2:location}/lib:${zlib:location}/lib
Added: erp5/release/candidate/software-profiles/perl-XML-NamespaceSupport.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/perl-XML-NamespaceSupport.cfg?rev=43089&view=auto
==============================================================================
--- erp5/release/candidate/software-profiles/perl-XML-NamespaceSupport.cfg (added)
+++ erp5/release/candidate/software-profiles/perl-XML-NamespaceSupport.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -0,0 +1,11 @@
+[buildout]
+extends =
+ perl.cfg
+parts =
+ perl-XML-NamespaceSupport
+
+[perl-XML-NamespaceSupport]
+recipe = hexagonit.recipe.cmmi
+url = http://search.cpan.org/CPAN/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-1.11.tar.gz
+configure-command =
+ ${perl:location}/bin/perl Makefile.PL
Added: erp5/release/candidate/software-profiles/perl-XML-SAX.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/perl-XML-SAX.cfg?rev=43089&view=auto
==============================================================================
--- erp5/release/candidate/software-profiles/perl-XML-SAX.cfg (added)
+++ erp5/release/candidate/software-profiles/perl-XML-SAX.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -0,0 +1,14 @@
+[buildout]
+extends =
+ perl.cfg
+ perl-XML-NamespaceSupport.cfg
+parts =
+ perl-XML-SAX
+
+[perl-XML-SAX]
+recipe = hexagonit.recipe.cmmi
+depends =
+ ${perl-XML-NamespaceSupport:location}
+url = http://search.cpan.org/CPAN/authors/id/G/GR/GRANTM/XML-SAX-0.96.tar.gz
+configure-command =
+ ${perl:location}/bin/perl Makefile.PL
Added: erp5/release/candidate/software-profiles/perl-libwww-perl.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/perl-libwww-perl.cfg?rev=43089&view=auto
==============================================================================
--- erp5/release/candidate/software-profiles/perl-libwww-perl.cfg (added)
+++ erp5/release/candidate/software-profiles/perl-libwww-perl.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -0,0 +1,14 @@
+[buildout]
+extends =
+ perl.cfg
+ perl-HTML-Parser.cfg
+parts =
+ perl-libwww-perl
+
+[perl-libwww-perl]
+recipe = hexagonit.recipe.cmmi
+depends =
+ ${perl-HTML-Parser:location}
+url = http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-5.837.tar.gz
+configure-command =
+ ${perl:location}/bin/perl Makefile.PL
Added: erp5/release/candidate/software-profiles/perl.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/perl.cfg?rev=43089&view=auto
==============================================================================
--- erp5/release/candidate/software-profiles/perl.cfg (added)
+++ erp5/release/candidate/software-profiles/perl.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -0,0 +1,32 @@
+[buildout]
+extends =
+ gdbm.cfg
+ patch.cfg
+parts =
+ perl
+
+[perl-keep-linker-flags-in-ldflags.patch]
+recipe = hexagonit.recipe.download
+url = http://www.nexedi.org/static/patches/${:_buildout_section_name_}
+md5sum = 9873a89c969bd5a478434c3b8b2d57d8
+download-only = true
+filename = ${:_buildout_section_name_}
+
+[perl]
+recipe = hexagonit.recipe.cmmi
+version = 5.12.3
+url = http://www.cpan.org/src/5.0/perl-${:version}.tar.gz
+md5sum = 29975a69dce54e47fcd6331c085c6c99
+patch-options = -p1
+patches =
+ ${perl-keep-linker-flags-in-ldflags.patch:location}/${perl-keep-linker-flags-in-ldflags.patch:filename}
+configure-command =
+ sh Configure -des \
+ -Dprefix=${buildout:parts-directory}/${:_buildout_section_name_} \
+ -Dsiteprefix=${buildout:parts-directory}/site_${:_buildout_section_name_} \
+ -Dcflags=-I${gdbm:location}/include \
+ -Dldflags="-L${gdbm:location}/lib -Wl,-rpath -Wl,${gdbm:location}/lib" \
+ -Ui_db \
+ -Dnoextensions=ODBM_File
+environment =
+ PATH=${patch:location}/bin:%(PATH)s
Modified: erp5/release/candidate/software-profiles/stunnel.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/stunnel.cfg?rev=43089&r1=43088&r2=43089&view=diff
==============================================================================
--- erp5/release/candidate/software-profiles/stunnel.cfg [utf8] (original)
+++ erp5/release/candidate/software-profiles/stunnel.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -17,7 +17,7 @@ filename = stunnel-4-hooks.py
[stunnel-4]
recipe = hexagonit.recipe.cmmi
-url = http://www.stunnel.org/download/stunnel/src/stunnel-4.34.tar.gz
+url = ftp://ftp.stunnel.org/stunnel/stunnel-4.34.tar.gz
md5sum = bbd274e8364ea3ceca0ee5190e13edd1
pre-configure-hook = ${stunnel-4-hook-download:location}/${stunnel-4-hook-download:filename}:pre_configure_hook
configure-options =
Added: erp5/release/candidate/software-profiles/swig.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/swig.cfg?rev=43089&view=auto
==============================================================================
--- erp5/release/candidate/software-profiles/swig.cfg (added)
+++ erp5/release/candidate/software-profiles/swig.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -0,0 +1,36 @@
+# swig - Generate scripting interfaces to C/C++ code
+# http://www.swig.org/
+
+[buildout]
+extends =
+ bison.cfg
+parts =
+ swig
+
+[swig]
+recipe = hexagonit.recipe.cmmi
+url = http://downloads.sourceforge.net/project/swig/swig/swig-1.3.40/swig-1.3.40.tar.gz
+md5sum = 2df766c9e03e02811b1ab4bba1c7b9cc
+configure-options =
+ --disable-ccache
+ --with-python=${buildout:executable}
+ --without-allegrocl
+ --without-chicken
+ --without-clisp
+ --without-csharp
+ --without-gcj
+ --without-guile
+ --without-java
+ --without-lua
+ --without-mzscheme
+ --without-ocaml
+ --without-octave
+ --without-perl5
+ --without-php
+ --without-pike
+ --without-python3
+ --without-r
+ --without-ruby
+ --without-tcl
+environment =
+ PATH = ${bison:location}/bin:%(PATH)s
Added: erp5/release/candidate/software-profiles/tesseract.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/tesseract.cfg?rev=43089&view=auto
==============================================================================
--- erp5/release/candidate/software-profiles/tesseract.cfg (added)
+++ erp5/release/candidate/software-profiles/tesseract.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -0,0 +1,21 @@
+[buildout]
+parts += tesseract
+ tesseract-eng-traineddata
+ tesseract-eng-traineddata-unzip
+
+[tesseract]
+recipe = hexagonit.recipe.cmmi
+url = http://tesseract-ocr.googlecode.com/files/tesseract-3.00.tar.gz
+md5sum = cc812a261088ea0c3d2da735be35d09f
+
+[tesseract-eng-traineddata]
+recipe = hexagonit.recipe.download
+download-only = true
+url = http://tesseract-ocr.googlecode.com/files/eng.traineddata.gz
+md5sum = d91041ad156cf2db36664e91ef799451
+
+[tesseract-eng-traineddata-unzip]
+recipe = plone.recipe.command
+command = gunzip parts/tesseract-eng-traineddata/eng.traineddata.gz -c > parts/tesseract/share/tessdata/eng.traineddata
+update-command = ${:command}
+stop-on-error = yes
Modified: erp5/release/candidate/software-profiles/varnish.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/varnish.cfg?rev=43089&r1=43088&r2=43089&view=diff
==============================================================================
--- erp5/release/candidate/software-profiles/varnish.cfg [utf8] (original)
+++ erp5/release/candidate/software-profiles/varnish.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -8,7 +8,6 @@ parts =
extends =
ncurses.cfg
- patch.cfg
pcre.cfg
pkgconfig.cfg
@@ -23,23 +22,12 @@ environment =
CPPFLAGS=-I${ncurses:location}/include
LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib
-# http://www.varnish-cache.org/trac/ticket/801
-[varnish-2.1.4-r5467-patch]
-recipe = hexagonit.recipe.download
-url = http://www.varnish-cache.org/trac/changeset/a53a8a1c60f844eb62d047b62116fa7cb436cf5f?format=diff&new=a53a8a1c60f844eb62d047b62116fa7cb436cf5f
-md5sum = 0948d6c4ac64f197b362c17496f77a14
-filename = changeset_r5467.diff
-download-only = true
-
[varnish-2.1]
recipe = hexagonit.recipe.cmmi
-url = http://www.varnish-software.com/sites/default/files/varnish-2.1.4.tar.gz
-md5sum = e794a37b6fbb786a083c0946103ae103
-patch-options = -p0
-patches =
- ${varnish-2.1.4-r5467-patch:location}/${varnish-2.1.4-r5467-patch:filename}
+url = http://repo.varnish-cache.org/source/varnish-2.1.5.tar.gz
+md5sum = 2d2f227da36a2a240c475304c717b8e3
environment =
- PATH=${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+ PATH=${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${pcre:location}/lib/pkgconfig
CPPFLAGS=-I${ncurses:location}/include
LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib
Added: erp5/release/candidate/software-profiles/w3-validator.cfg
URL: http://svn.erp5.org/erp5/release/candidate/software-profiles/w3-validator.cfg?rev=43089&view=auto
==============================================================================
--- erp5/release/candidate/software-profiles/w3-validator.cfg (added)
+++ erp5/release/candidate/software-profiles/w3-validator.cfg [utf8] Sat Feb 5 00:47:34 2011
@@ -0,0 +1,32 @@
+[buildout]
+extends =
+ perl.cfg
+ perl-Config-General.cfg
+ perl-Encode-HanExtra.cfg
+ perl-HTML-Encoding.cfg
+ perl-HTML-Parser.cfg
+ perl-HTML-Template.cfg
+ perl-JSON.cfg
+ perl-Net-IP.cfg
+ perl-SGML-Parser-OpenSP.cfg
+ perl-URI.cfg
+ perl-XML-LibXML.cfg
+ perl-libwww-perl.cfg
+
+parts = w3-validator
+
+[w3-validator]
+recipe = erp5.recipe.w3validator
+depends =
+ ${perl-Config-General:location}
+ ${perl-Encode-HanExtra:location}
+ ${perl-HTML-Encoding:location}
+ ${perl-HTML-Parser:location}
+ ${perl-HTML-Template:location}
+ ${perl-JSON:location}
+ ${perl-Net-IP:location}
+ ${perl-SGML-Parser-OpenSP:location}
+ ${perl-URI:location}
+ ${perl-XML-LibXML:location}
+ ${perl-libwww-perl:location}
+perl-path = ${perl:location}/bin/perl
Modified: erp5/release/candidate/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/release/candidate/tests/assertSoftware.py?rev=43089&r1=43088&r2=43089&view=diff
==============================================================================
--- erp5/release/candidate/tests/assertSoftware.py [utf8] (original)
+++ erp5/release/candidate/tests/assertSoftware.py [utf8] Sat Feb 5 00:47:34 2011
@@ -758,13 +758,13 @@ class AssertPythonMysql(AssertSoftwareMi
if d.startswith('MySQL_python'):
path = os.path.join('develop-eggs', d, '_mysql.so')
elf_dict = readElfAsDict(path)
- self.assertEqual(sorted(['libc', 'libcrypt', 'libcrypto', 'libm',
- 'libmysqlclient_r', 'libnsl', 'libpthread', 'libssl', 'libz']),
+ self.assertEqual(sorted(['libc', 'libcrypt', 'libm',
+ 'libmysqlclient_r', 'libnsl', 'libpthread', 'librt', 'libz']),
elf_dict['library_list'])
soft_dir = os.path.join(os.path.abspath(os.curdir), 'parts')
expected_rpath_list = [os.path.join(soft_dir, software, 'lib') for
software in ['zlib', 'openssl']]
- expected_rpath_list.append(os.path.join(os.path.abspath(os.curdir), 'parts', 'mysql-tritonn-5.0', 'lib', 'mysql'))
+ expected_rpath_list.append(os.path.join(os.path.abspath(os.curdir), 'parts', 'mariadb', 'lib', 'mysql'))
self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
class AssertApache(AssertSoftwareMixin):
More information about the Erp5-report
mailing list