Commit e86095ac authored by Łukasz Nowak's avatar Łukasz Nowak

Merge remote-tracking branch 'origin/proactive'

Conflicts:
	software/erp5/software.cfg
	software/erp5testnode/software.cfg

Both files reverted back to master.
parents c7032ccd 89e31689
[buildout]
parts =
proactive
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
[proactive]
recipe = slapos.recipe.proactive
proactive_location = ${proactive:location}
java_home = ${java:location}
[buildout]
versions = versions
# Should we use a local version of java.cfg before we change git structure?
extends = ../java/software.cfg
find-links += http://www.nexedi.org/static/packages/source/slapos.buildout/
parts =
template
eggs
proactive
java
unzip = true
[versions]
zc.buildout = 1.5.3-dev-SlapOS-001
[proactive]
recipe = hexagonit.recipe.download
url = http://www-sop.inria.fr/oasis/amedro/public/PABundle.tar.gz
#url = http://www.activeeon.com/public_content/releases/ProActive/Scheduling/3.0.3/ProActiveScheduling-3.0.3_server.tar.gz
#md5sum = 776f78e9058d4b5dc86351bf45305c45
#[java-download]
#recipe = slapos.recipe.download
## 64bit self extracting
##url = http://javadl.sun.com/webapps/download/AutoDL?BundleId=43875
##md5sum = e4143387e31838a51df76774d102f49a
## This is jre1.6.0_25 32 bits self-extracting
#url = http://javadl.sun.com/webapps/download/AutoDL?BundleId=48334
#md5sum = 377456da9fa4d867d4bdf4c655a16dce
#
#[java]
#recipe = plone.recipe.command
#location = ${buildout:parts-directory}/${:_buildout_section_name_}
#command = rm -fr ${:location} && mkdir -p ${:location} && cd ${:location} && /bin/sh ${java-download:target}
#update-command = ${:command}
[eggs]
recipe = zc.recipe.egg
eggs =
slapos.recipe.proactive
[template]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
#md5sum = 88fe7e2d1e04618b1b4fcafde683d75a
output = ${buildout:directory}/template.cfg
mode = 0644
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment