[Erp5-report] r43591 gabriel - in /erp5/trunk/buildout: instance-profiles/ software-profiles/

[nobody at svn.erp5.org]

Author: gabriel
Date: Wed Feb 23 02:28:35 2011
New Revision: 43591

URL: http://svn.erp5.org?rev=43591&view=rev
Log:
don't overwrite instance.inc because it is not used to erp5 setup and is breaking this setup

Modified:
    erp5/trunk/buildout/instance-profiles/cloudooo.cfg
    erp5/trunk/buildout/software-profiles/cloudooo.cfg

Modified: erp5/trunk/buildout/instance-profiles/cloudooo.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/instance-profiles/cloudooo.cfg?rev=43591&r1=43590&r2=43591&view=diff
==============================================================================
--- erp5/trunk/buildout/instance-profiles/cloudooo.cfg [utf8] (original)
+++ erp5/trunk/buildout/instance-profiles/cloudooo.cfg [utf8] Wed Feb 23 02:28:35 2011
@@ -55,8 +55,8 @@ memory-limit = 3000
 uno-path = ${software_definition:openoffice_software}/basis-link/program/
 office-binary-path = ${software_definition:openoffice_software}/program/
 openoffice-port = 4062
-env-PATH = ${software_definition:xpdf-path} 
-env-LD_LIBRARY_PATH = ${software_definition:file-path}
+env-PATH = ${software_definition:software_home}/parts/xpdf/bin
+env-LD_LIBRARY_PATH = ${software_definition:software_home}/parts/file/lib
 server-hostname = 0.0.0.0
 server-port = ${configuration:oood_port}
 supervisor-priority = 30

Modified: erp5/trunk/buildout/software-profiles/cloudooo.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/cloudooo.cfg?rev=43591&r1=43590&r2=43591&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/cloudooo.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/cloudooo.cfg [utf8] Wed Feb 23 02:28:35 2011
@@ -36,6 +36,7 @@ eggs = 
 
 [sources]
 cloudooo = svn https://svn.erp5.org/repos/public/erp5/trunk/utils/cloudooo
+erp5.recipe.cloudoooinstance = svn https://svn.erp5.org/repos/public/erp5/trunk/utils/erp5.recipe.cloudoooinstance
 
 [cloudooo]
 recipe = zc.recipe.egg
@@ -53,15 +54,3 @@ eggs =
 [software_definition]
 software_home = ${buildout:directory}
 executable = ${python2.6:executable}
-
-[instance_template]
-input = inline:
-  [buildout]
-  eggs-directory = ${buildout:eggs-directory}
-  develop-eggs-directory = ${buildout:develop-eggs-directory}
-
-  [software_definition]
-  software_home = ${software_definition:software_home}
-  xpdf-path = ${xpdf:location}/bin
-  file-path = ${file:location}/lib
-