Commit cd51c1de authored by Gabriel Monnerat's avatar Gabriel Monnerat Committed by Sebastien Robin

allow to build slaprunner inside an erp5testnode instance

parent 266129fa
...@@ -10,6 +10,7 @@ extends = ...@@ -10,6 +10,7 @@ extends =
../gettext/buildout.cfg ../gettext/buildout.cfg
../libtiff/buildout.cfg ../libtiff/buildout.cfg
../libjpeg/buildout.cfg ../libjpeg/buildout.cfg
../perl/buildout.cfg
parts = parts =
gtk-2 gtk-2
...@@ -35,6 +36,8 @@ configure-options = ...@@ -35,6 +36,8 @@ configure-options =
--disable-static --disable-static
# XXX-Cedric : Why, god, why do I have to supply the -lXrender option to linker? # XXX-Cedric : Why, god, why do I have to supply the -lXrender option to linker?
environment = environment =
PERL=${perl:location}/bin/perl
PERL5LIB=${perl:location}/lib/${perl:version}
PATH=${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s PATH=${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig::${libXrender:location}/lib/pkgconfig PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig::${libXrender:location}/lib/pkgconfig
CPPFLAGS=-I${cairo:location}/include/cairo -I${libX11:location}/include/X11 -I${libxcb:location}/include/xcb -I${libXau:location}/include/X11 -I${bzip2:location}/include -L${libXrender:location}/include -I${zlib:location}/include CPPFLAGS=-I${cairo:location}/include/cairo -I${libX11:location}/include/X11 -I${libxcb:location}/include/xcb -I${libXau:location}/include/X11 -I${bzip2:location}/include -L${libXrender:location}/include -I${zlib:location}/include
...@@ -49,6 +52,8 @@ configure-options = ...@@ -49,6 +52,8 @@ configure-options =
--disable-static --disable-static
--without-libintl-prefix --without-libintl-prefix
environment = environment =
PERL=${perl:location}/bin/perl
PERL5LIB=${perl:location}/lib/${perl:version}
PATH=${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s PATH=${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${gettext:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${gettext:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig
CPPFLAGS=-I${libtiff:location}/include -I${libjpeg:location}/include -I${libpng:location}/include CPPFLAGS=-I${libtiff:location}/include -I${libjpeg:location}/include -I${libpng:location}/include
...@@ -60,6 +65,8 @@ recipe = hexagonit.recipe.cmmi ...@@ -60,6 +65,8 @@ recipe = hexagonit.recipe.cmmi
url = http://ftp.gnome.org/pub/gnome/sources/atk/2.0/atk-2.0.1.tar.bz2 url = http://ftp.gnome.org/pub/gnome/sources/atk/2.0/atk-2.0.1.tar.bz2
md5sum = 87f20b78deaedef858ac54358c0786b1 md5sum = 87f20b78deaedef858ac54358c0786b1
environment = environment =
PERL=${perl:location}/bin/perl
PERL5LIB=${perl:location}/lib/${perl:version}
PATH=${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s PATH=${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig
LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${gettext:location}/lib LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${gettext:location}/lib
...@@ -76,6 +83,8 @@ configure-options = ...@@ -76,6 +83,8 @@ configure-options =
--enable-explicit-deps --enable-explicit-deps
--disable-xinerama --disable-xinerama
environment = environment =
PERL=${perl:location}/bin/perl
PERL5LIB=${perl:location}/lib/${perl:version}
PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xcbproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xcbproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig
CPPFLAGS=-I${libtiff:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libX11:location}/include/ -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${render:location}/include -I${libXext:location}/include -I${cairo:location}/include/cairo -I${zlib:location}/include -I${bzip2:location}/include -I${libXdmcp:location}/include -I${glib:location}/include/gio-unix-2.0 -I${glib:location}/include/glib-2.0 -I${glib:location}/include -I${atk:location}/include/atk-1.0 CPPFLAGS=-I${libtiff:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libX11:location}/include/ -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${render:location}/include -I${libXext:location}/include -I${cairo:location}/include/cairo -I${zlib:location}/include -I${bzip2:location}/include -I${libXdmcp:location}/include -I${glib:location}/include/gio-unix-2.0 -I${glib:location}/include/glib-2.0 -I${glib:location}/include -I${atk:location}/include/atk-1.0
......
...@@ -74,6 +74,13 @@ class Recipe(GenericBaseRecipe): ...@@ -74,6 +74,13 @@ class Recipe(GenericBaseRecipe):
config_repository_list.set(section_name, 'buildout_section_id', config_repository_list.set(section_name, 'buildout_section_id',
repository['buildout_section_id']) repository['buildout_section_id'])
i += 1 i += 1
software_path_list = json.loads(self.options['software-path-list'])
if software_path_list:
CONFIG["software_path_list"] = "[software_list]"
CONFIG["software_path_list"] += \
"\npath_list = %s" % ",".join(software_path_list)
value = StringIO.StringIO() value = StringIO.StringIO()
config_repository_list.write(value) config_repository_list.write(value)
CONFIG['repository_list'] = value.getvalue() CONFIG['repository_list'] = value.getvalue()
......
...@@ -26,6 +26,8 @@ zip_binary = %(zip_binary)s ...@@ -26,6 +26,8 @@ zip_binary = %(zip_binary)s
[environment] [environment]
PATH = %(PATH)s PATH = %(PATH)s
%(software_path_list)s
%(instance_dict)s %(instance_dict)s
%(repository_list)s %(repository_list)s
...@@ -44,7 +44,7 @@ test-suite-master-url = $${slap-parameter:test-suite-master-url} ...@@ -44,7 +44,7 @@ test-suite-master-url = $${slap-parameter:test-suite-master-url}
bt5-path = $${slap-parameter:additional-bt5-repository-id} bt5-path = $${slap-parameter:additional-bt5-repository-id}
instance-dict = $${slap-parameter:instance-dict} instance-dict = $${slap-parameter:instance-dict}
vcs-repository-list = $${slap-parameter:vcs-repository-list} vcs-repository-list = $${slap-parameter:vcs-repository-list}
software-path-list = $${slap-parameter:software-path-list}
git-binary = ${git:location}/bin/git git-binary = ${git:location}/bin/git
slapgrid-partition-binary = ${buildout:bin-directory}/slapgrid-cp slapgrid-partition-binary = ${buildout:bin-directory}/slapgrid-cp
slapgrid-software-binary = ${buildout:bin-directory}/slapgrid-sr slapgrid-software-binary = ${buildout:bin-directory}/slapgrid-sr
...@@ -147,4 +147,5 @@ test-suite-master-url = ...@@ -147,4 +147,5 @@ test-suite-master-url =
additional-bt5-repository-id = additional-bt5-repository-id =
instance-dict = instance-dict =
vcs-repository-list = [] vcs-repository-list = []
software-path-list = ["http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/erp5testnode:/software/seleniumrunner/software.cfg"]
test-suite-title = $${:test-suite} test-suite-title = $${:test-suite}
...@@ -51,7 +51,9 @@ eggs = ...@@ -51,7 +51,9 @@ eggs =
slapos.core slapos.core
inotifyx inotifyx
slapos.cookbook slapos.cookbook
erp5.util[testnode] erp5.util
[testnode]
scripts = scripts =
testnode = erp5.util.testnode:main testnode = erp5.util.testnode:main
...@@ -76,7 +78,7 @@ recipe = slapos.recipe.template ...@@ -76,7 +78,7 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-default.cfg url = ${:_profile_base_location_}/instance-default.cfg
output = ${buildout:directory}/template-default.cfg output = ${buildout:directory}/template-default.cfg
mode = 0644 mode = 0644
md5sum = e460e90b20381de10282faeb1dbdb5fc md5sum = d37e8af090832012b2066748899113e0
[networkcache] [networkcache]
# Romain Courteaud + Sebastien Robin + Antoine Catton signature certificate # Romain Courteaud + Sebastien Robin + Antoine Catton signature certificate
......
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