From 7bee746b96b730970f338931c17c49090fdc1419 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Wed, 10 Nov 2010 16:13:06 +0000 Subject: [PATCH] - use inline template to make buildout possible to run with external extension Note: It is not possible to download input file for collective.recipe.template git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40179 20353a03-c40f-0410-a6d1-a30d3c3de9de --- buildout/profiles/common.cfg | 20 ++++++++++---------- buildout/templates/software-home.inc.in | 10 ---------- 2 files changed, 10 insertions(+), 20 deletions(-) delete mode 100644 buildout/templates/software-home.inc.in diff --git a/buildout/profiles/common.cfg b/buildout/profiles/common.cfg index 2311011875..9eed061061 100644 --- a/buildout/profiles/common.cfg +++ b/buildout/profiles/common.cfg @@ -84,16 +84,16 @@ urls = http://www.erp5.org/dists/snapshot/products/ZMySQLDDA.tgz http://www.erp5.org/dists/snapshot/products/ZSQLCatalog.tgz -[download-software-home-template] -recipe = hexagonit.recipe.download -filename = software-home.inc.in -url = https://svn.erp5.org/repos/public/erp5/trunk/buildout/templates/${:filename} -download-only = true - [software_home] recipe = collective.recipe.template -# does not work because of bug in collective.recipe.template (input have to be -# available in __init__) -#input = ${download-software-home-template:location}/${download-software-home-template:filename} -input = ${buildout:software_home}/templates/software-home.inc.in +input = inline: + [buildout] + software_home = ${buildout:software_home} + eggs-directory = ${buildout:eggs-directory} + develop-eggs-directory = ${buildout:develop-eggs-directory} + + [software_definition] + software_home = ${buildout:software_home} + executable = ${software_definition:executable} + mysql_software = ${software_definition:mysql_software} output = ${buildout:software_home}/instance-profiles/software-home.inc diff --git a/buildout/templates/software-home.inc.in b/buildout/templates/software-home.inc.in deleted file mode 100644 index 61f922c36c..0000000000 --- a/buildout/templates/software-home.inc.in +++ /dev/null @@ -1,10 +0,0 @@ -[buildout] -software_home = ${buildout:software_home} -eggs-directory = ${buildout:eggs-directory} -develop-eggs-directory = ${buildout:develop-eggs-directory} - -[software_definition] -software_home = ${buildout:software_home} -executable = ${software_definition:executable} -mysql_software = ${software_definition:mysql_software} - -- 2.30.9