Commit 3cfa3508 authored by Kirill Smelkov's avatar Kirill Smelkov

wendelin.core: Add support for wendelin.core 2 build

The component remains on wendelin.core 1, but the build environment is
adjusted so that both (any of) wendelin.core 1 or wendelin.core 2 could
be built:

- Add zodbtools that wendelin.core 2 requires,
- Add Go and zlib to gowork that are neede to build WCFS.
parent 44faa493
Pipeline #13960 passed with stage
...@@ -3,7 +3,10 @@ ...@@ -3,7 +3,10 @@
[buildout] [buildout]
extends = extends =
../pygolang/buildout.cfg ../pygolang/buildout.cfg
../zodbtools/buildout.cfg
../numpy/buildout.cfg ../numpy/buildout.cfg
../golang/buildout.cfg
../zlib/buildout.cfg
../git/buildout.cfg ../git/buildout.cfg
parts = parts =
...@@ -21,12 +24,18 @@ environment = wendelin.core-env ...@@ -21,12 +24,18 @@ environment = wendelin.core-env
# dependent eggs that must come through in-tree recipes # dependent eggs that must come through in-tree recipes
depends = depends =
${zodbtools:egg}
${numpy:egg} ${numpy:egg}
[wendelin.core-env] [wendelin.core-env]
# wendelin.core needs git(dev) to build # wendelin.core needs git(dev) and go to build
PATH = ${git:location}/bin:%(PATH)s PATH = ${git:location}/bin:%(PATH)s
GO = ${go:exe}
# wcfs needs this:
[gowork]
cpkgpath += ${zlib:location}/lib/pkgconfig
[wendelin.core-repository] [wendelin.core-repository]
......
...@@ -32,11 +32,12 @@ eggs = ...@@ -32,11 +32,12 @@ eggs =
neoppod[tests] neoppod[tests]
ZEO[test] ZEO[test]
# env.sh for that python to be on $PATH # env.sh for that python + go to be on $PATH
[wendelin.core-env.sh] [wendelin.core-env.sh]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
rendered = ${buildout:directory}/${:_buildout_section_name_} rendered = ${buildout:directory}/${:_buildout_section_name_}
template = inline: template = inline:
. ${gowork:env.sh}
export PS1="(wendelin.core-env) $PS1" export PS1="(wendelin.core-env) $PS1"
export PATH=${buildout:bin-directory}:${gdb:location}/bin:$PATH export PATH=${buildout:bin-directory}:${gdb:location}/bin:$PATH
......
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