From 24308a8196327d32fa67ba1bb891ebdfcbc96423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
Date: Thu, 26 Aug 2010 09:48:43 +0000
Subject: [PATCH] - put software_home part in common, download instead of
relying on fact of being checkouted
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@38026 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
buildout/profiles/common.cfg | 10 +++++++++-
buildout/profiles/official-2.12.cfg | 6 ------
buildout/profiles/official.cfg | 7 -------
3 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/buildout/profiles/common.cfg b/buildout/profiles/common.cfg
index 8ec7f2a3a1..4c17d84020 100644
--- a/buildout/profiles/common.cfg
+++ b/buildout/profiles/common.cfg
@@ -227,4 +227,12 @@ urls =
${:base}/ZMySQLDDA/${:revision} ZMySQLDDA
${:base}/ZSQLCatalog/${:revision} ZSQLCatalog
-
+[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}
+
+[software_home]
+recipe = collective.recipe.template
+input = ${download-software-home-template:filename}
+output = ${buildout:software_home}/instance-profiles/software-home.inc
diff --git a/buildout/profiles/official-2.12.cfg b/buildout/profiles/official-2.12.cfg
index 54c3f488b4..b184c363b3 100644
--- a/buildout/profiles/official-2.12.cfg
+++ b/buildout/profiles/official-2.12.cfg
@@ -71,9 +71,3 @@ update-command = ${:command}
[software_definition]
software_home = ${buildout:software_home}
executable = ${python2.6:executable}
-
-[software_home]
-recipe = collective.recipe.template
-input = ${buildout:software_home}/templates/software-home.inc.in
-output = ${buildout:software_home}/instance-profiles/software-home.inc
-
diff --git a/buildout/profiles/official.cfg b/buildout/profiles/official.cfg
index 65cbdf6e40..4cfa897455 100644
--- a/buildout/profiles/official.cfg
+++ b/buildout/profiles/official.cfg
@@ -80,10 +80,3 @@ software_home = ${buildout:software_home}
# with local mysql, but by default buildout mysql will be used.
mysql_software = ${mysql-tritonn-5.0:location}
executable = ${python2.4:executable}
-
-
-[software_home]
-recipe = collective.recipe.template
-input = ${buildout:software_home}/templates/software-home.inc.in
-output = ${buildout:software_home}/instance-profiles/software-home.inc
-
--
2.30.9