From 2588212f6fadbe50a070b97d8dc6f7429cccc02c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Fri, 27 Aug 2010 05:51:06 +0000 Subject: [PATCH] - drop using requirements, as it does not provide global overview in favor of helpers and implementing what is needed as buildout profiles git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@38045 20353a03-c40f-0410-a6d1-a30d3c3de9de --- buildout/README-2.12.txt | 9 --------- buildout/README.txt | 8 -------- buildout/instance-profiles/kvm.cfg | 5 ----- buildout/profiles/development-2.12.cfg | 7 ------- buildout/profiles/development.cfg | 7 ------- buildout/profiles/official-2.12.cfg | 7 ------- buildout/profiles/official.cfg | 7 ------- buildout/software-profiles/erp5-2.12.cfg | 13 ------------- buildout/software-profiles/erp5.cfg | 12 ------------ buildout/software-profiles/mysql-5.1.cfg | 4 ---- buildout/software-profiles/mysql-tritonn-5.0.cfg | 4 ---- buildout/software-profiles/ocropus.cfg | 5 ----- buildout/software-profiles/oood.cfg | 3 --- buildout/software-profiles/openoffice-bin.cfg | 5 ----- buildout/software-profiles/python-common.cfg | 15 --------------- buildout/software-profiles/sphinx.cfg | 3 --- buildout/software-profiles/varnish.cfg | 4 ---- 17 files changed, 118 deletions(-) diff --git a/buildout/README-2.12.txt b/buildout/README-2.12.txt index 48fdc76ddf..7d5dfe3e02 100644 --- a/buildout/README-2.12.txt +++ b/buildout/README-2.12.txt @@ -47,15 +47,6 @@ Acquisition with _aq_dynamic patch) and CMF 2.2 plus dependencies. Note on -S: this switch is overridden by PYTHON_PATH environment variable. In doubt, unset it before invoking that command. -System dependency check ------------------------ - -Each software component in this buildout might require some system -dependencies, including development libraries and executables. -To query what is required for all components, please run: - - $ bin/buildout install show-requirements - Minimal requirements -------------------- diff --git a/buildout/README.txt b/buildout/README.txt index 3477730a72..6a5cf8364e 100644 --- a/buildout/README.txt +++ b/buildout/README.txt @@ -45,14 +45,6 @@ Zope, etc. Choosing and modifying proper profile allows to control how much software will be build in place. -System dependency check ------------------------ - -As each software component this buildout requires something to be installed. -To query what is required please use: - -bin/buildout install show-requirements - Minimal requirements -------------------- diff --git a/buildout/instance-profiles/kvm.cfg b/buildout/instance-profiles/kvm.cfg index 0cfccaa343..5b4347d0be 100644 --- a/buildout/instance-profiles/kvm.cfg +++ b/buildout/instance-profiles/kvm.cfg @@ -11,8 +11,3 @@ kvm_snapshot = true # ssh Information ssh_key_file = <DEFINE YOUR IMAGE HERE> ssh_port = 13456 - -[requirements] -binary = - gunzip - kvm diff --git a/buildout/profiles/development-2.12.cfg b/buildout/profiles/development-2.12.cfg index 5cad646e86..e144b55b59 100644 --- a/buildout/profiles/development-2.12.cfg +++ b/buildout/profiles/development-2.12.cfg @@ -73,10 +73,3 @@ products = ${:instancehome}/Products/ ${configuration:development_site_products} # zope.conf template part ENDS - -[requirements] -binary += - svn - svnadmin -development += - /usr/include.*/svn_client.h diff --git a/buildout/profiles/development.cfg b/buildout/profiles/development.cfg index 56b090964b..90e88ce7ae 100644 --- a/buildout/profiles/development.cfg +++ b/buildout/profiles/development.cfg @@ -63,10 +63,3 @@ products = ${:instancehome}/Products/ ${configuration:development_site_products} # zope.conf template part ENDS - -[requirements] -binary += - svn - svnadmin -development += - /usr/include.*/svn_client.h diff --git a/buildout/profiles/official-2.12.cfg b/buildout/profiles/official-2.12.cfg index b184c363b3..c253a82907 100644 --- a/buildout/profiles/official-2.12.cfg +++ b/buildout/profiles/official-2.12.cfg @@ -61,13 +61,6 @@ parts = precache-eggs software_home -[show-requirements] -recipe = plone.recipe.command -command = - echo "Required binary files: ${requirements:binary}" - echo "Required header files: ${requirements:development}" -update-command = ${:command} - [software_definition] software_home = ${buildout:software_home} executable = ${python2.6:executable} diff --git a/buildout/profiles/official.cfg b/buildout/profiles/official.cfg index 4cfa897455..1c89f500ca 100644 --- a/buildout/profiles/official.cfg +++ b/buildout/profiles/official.cfg @@ -64,13 +64,6 @@ parts = oood software_home -[show-requirements] -recipe = plone.recipe.command -command = - echo "Required binary files: ${requirements:binary}" - echo "Required header files: ${requirements:development}" -update-command = ${:command} - [software_definition] software_home = ${buildout:software_home} # as mysql-python part, which uses mysql-python-env is not depending directly diff --git a/buildout/software-profiles/erp5-2.12.cfg b/buildout/software-profiles/erp5-2.12.cfg index 19ab6b3587..73c0610d3a 100644 --- a/buildout/software-profiles/erp5-2.12.cfg +++ b/buildout/software-profiles/erp5-2.12.cfg @@ -176,16 +176,3 @@ paths = ${bt5-erp5-core:location},${bt5-erp5:location},${bt5-erp5-extra:location command = echo "Business Template Paths: ${:paths}" update-command = ${:command} - -[requirements] -development = - /usr/include/glib-2.0/glib.h - /usr/include/ldap.h - /usr/include/libxml2/libxml/xmlversion.h - /usr/include/libxslt/xsltconfig.h - /usr/include/neon - /usr/include/sasl/sasl.h - -binary = - zip - pkg-config diff --git a/buildout/software-profiles/erp5.cfg b/buildout/software-profiles/erp5.cfg index 24cebcc468..54d1e4fdb4 100644 --- a/buildout/software-profiles/erp5.cfg +++ b/buildout/software-profiles/erp5.cfg @@ -105,15 +105,3 @@ extra-paths = # shut down script generation. Other parts can generate scripts as needed by # reusing ${eggs:eggs} scripts = - -[requirements] -development = - /usr/include/glib-2.0/glib.h - /usr/include/ldap.h - /usr/include/libxml2/libxml/xmlversion.h - /usr/include/libxslt/xsltconfig.h - /usr/include/neon - /usr/include/sasl/sasl.h - -binary = - zip diff --git a/buildout/software-profiles/mysql-5.1.cfg b/buildout/software-profiles/mysql-5.1.cfg index e7f53414f4..6852133eae 100644 --- a/buildout/software-profiles/mysql-5.1.cfg +++ b/buildout/software-profiles/mysql-5.1.cfg @@ -40,7 +40,3 @@ configure-options = patch-options = -p1 patches = ${mysql-5.1-sphinx-patch:location}/${mysql-5.1-sphinx-patch:filename} - -[requirements] -binary = automake flex bison patch gcc g++ libtool -development = /usr/include/termcap.h /usr/include/curses.h diff --git a/buildout/software-profiles/mysql-tritonn-5.0.cfg b/buildout/software-profiles/mysql-tritonn-5.0.cfg index cc8b3b6026..6e128e4c6d 100644 --- a/buildout/software-profiles/mysql-tritonn-5.0.cfg +++ b/buildout/software-profiles/mysql-tritonn-5.0.cfg @@ -63,7 +63,3 @@ environment = CFLAGS =-I${senna:location}/include/senna CXXFLAGS =-I${senna:location}/include/senna LDFLAGS =-L${senna:location}/lib - -[requirements] -binary = automake flex bison patch gcc g++ libtool -development = /usr/include/termcap.h /usr/include/curses.h diff --git a/buildout/software-profiles/ocropus.cfg b/buildout/software-profiles/ocropus.cfg index 913e890cad..d8bf910cff 100644 --- a/buildout/software-profiles/ocropus.cfg +++ b/buildout/software-profiles/ocropus.cfg @@ -45,8 +45,3 @@ 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 diff --git a/buildout/software-profiles/oood.cfg b/buildout/software-profiles/oood.cfg index 0194a12016..aaec02140c 100644 --- a/buildout/software-profiles/oood.cfg +++ b/buildout/software-profiles/oood.cfg @@ -8,6 +8,3 @@ recipe = hexagonit.recipe.download url = http://www.nexedi.org/static/tarballs/oood/oood-r36294.tar.gz md5sum = 9e71251eea4b310fd6bd4ebf8abf890e strip-top-level-dir = true - -[requirements] -binary = Xvfb diff --git a/buildout/software-profiles/openoffice-bin.cfg b/buildout/software-profiles/openoffice-bin.cfg index afb4a332de..b9cea91401 100644 --- a/buildout/software-profiles/openoffice-bin.cfg +++ b/buildout/software-profiles/openoffice-bin.cfg @@ -16,8 +16,3 @@ hack-openoffice-python = no #unpack-name = OOO320_m12_native_packed-1_en-US.9483 # below version is internally used in recipe version = 3 - -[requirements] -binary = - cpio - rpm2cpio diff --git a/buildout/software-profiles/python-common.cfg b/buildout/software-profiles/python-common.cfg index f737cb0171..e670466c34 100644 --- a/buildout/software-profiles/python-common.cfg +++ b/buildout/software-profiles/python-common.cfg @@ -27,18 +27,3 @@ configure-options = --with-zlib --with-ssl --with-bz2 - -[requirements] -binary = - g++ - gcc - make - -development = - /usr/include/bzlib.h - /usr/include/curses.h - /usr/include/gdbm.h - /usr/include/jpeglib.h - /usr/include/openssl/ssl.h - /usr/include/termcap.h - /usr/include/zlib.h diff --git a/buildout/software-profiles/sphinx.cfg b/buildout/software-profiles/sphinx.cfg index cc3821ce8f..c6c785ee3c 100644 --- a/buildout/software-profiles/sphinx.cfg +++ b/buildout/software-profiles/sphinx.cfg @@ -31,6 +31,3 @@ patches = ${sphinx-1.10-fix_nosigpipe.patch:location}/${sphinx-1.10-fix_nosigpipe.patch:filename} ${sphinx-1.10-beta-snowball.patch:location}/${sphinx-1.10-beta-snowball.patch:filename} environment = - -[requirements] -binary = patch gcc g++ diff --git a/buildout/software-profiles/varnish.cfg b/buildout/software-profiles/varnish.cfg index fe319ce253..0badb5950d 100644 --- a/buildout/software-profiles/varnish.cfg +++ b/buildout/software-profiles/varnish.cfg @@ -13,7 +13,3 @@ md5sum = d91dc21c636db61c69b5e8f061c5bb95 recipe = hexagonit.recipe.cmmi url = http://sourceforge.net/projects/varnish/files/varnish/2.1.3/varnish-2.1.3.tar.gz/download md5sum = 357d99a760de173d841ac37bf2052be8 - -[requirements] -binary = - groff -- 2.30.9