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

[nobody at svn.erp5.org]

Author: luke
Date: Wed Feb 17 15:17:47 2010
New Revision: 32683

URL: http://svn.erp5.org?rev=32683&view=rev
Log:
 - use software_definition to have detached environments

Modified:
    erp5/trunk/buildout/official.cfg
    erp5/trunk/buildout/software-profiles/openoffice-bin.cfg
    erp5/trunk/buildout/templates/oood-runserw.in

Modified: erp5/trunk/buildout/official.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/official.cfg?rev=32683&r1=32682&r2=32683&view=diff
==============================================================================
--- erp5/trunk/buildout/official.cfg [utf8] (original)
+++ erp5/trunk/buildout/official.cfg [utf8] Wed Feb 17 15:17:47 2010
@@ -76,3 +76,5 @@
 software_home = ${buildout:directory}
 mysql_software = ${mysql-tritonn-5.0:location}
 zope_software = ${zope-2.8:location}
+openoffice_software = ${openoffice-bin:location}
+oood_software = ${oood:location}

Modified: erp5/trunk/buildout/software-profiles/openoffice-bin.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/openoffice-bin.cfg?rev=32683&r1=32682&r2=32683&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/openoffice-bin.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/openoffice-bin.cfg [utf8] Wed Feb 17 15:17:47 2010
@@ -3,9 +3,9 @@
   openoffice-bin
 
 [configuration]
-openoffice_python = ${openoffice-bin:location}/basis-link/program/python.bin
-openoffice_program = ${openoffice-bin:location}/program
-openoffice_uno = ${openoffice-bin:location}/basis-link/program/
+openoffice_python = ${software_definition:openoffice_software}/basis-link/program/python.bin
+openoffice_program = ${software_definition:openoffice_software}/program
+openoffice_uno = ${software_definition:openoffice_software}/basis-link/program/
 
 [openoffice-bin]
 recipe = z3c.recipe.openoffice

Modified: erp5/trunk/buildout/templates/oood-runserw.in
URL: http://svn.erp5.org/erp5/trunk/buildout/templates/oood-runserw.in?rev=32683&r1=32682&r2=32683&view=diff
==============================================================================
--- erp5/trunk/buildout/templates/oood-runserw.in [utf8] (original)
+++ erp5/trunk/buildout/templates/oood-runserw.in [utf8] Wed Feb 17 15:17:47 2010
@@ -1,2 +1,2 @@
 #!/bin/sh
-cd ${buildout:etc-directory} && ${configuration:openoffice_python} ${oood:location}/runserw.py $@
+cd ${buildout:etc-directory} && ${configuration:openoffice_python} ${software_definition:oood_software}/runserw.py $@