https://svn.lrde.epita.fr/svn/lrde-tools/trunk/build-farm Index: ChangeLog from Roland Levillain <roland@lrde.epita.fr> Fix packages' settings. * buildfarm_worker/package.fns (default_conf_tc): New (conf_tc-maintainer, conf_tc): Use it to factor the settings. (default_conf_vaucanson): New. (conf_vaucanson, conf_vaucanson-gcc4_0): Use it to factor the settings. (conf_vaucanson-icc): New. (conf_olena-proto-1.0-g++-3.4, conf_olena-proto-1.0-g++-4.0) (conf_olena-proto-1.0-g++-4.1, conf_olena-proto-1.0-g++-icpc) (conf_olena-1.0-g++-3.4, conf_olena-1.0-g++-4.0) (conf_olena-1.0-g++-4.1, conf_olena-1.0-g++-icpc): New (empty) hooks. * buildfarm_worker/brasilia.fns: s/tree_olena_tree/test_olena_tree/g. brasilia.fns | 12 ++++++------ package.fns | 38 +++++++++++++++++++++++--------------- 2 files changed, 29 insertions(+), 21 deletions(-) Index: buildfarm_worker/package.fns --- buildfarm_worker/package.fns (revision 359) +++ buildfarm_worker/package.fns (working copy) @@ -59,7 +59,7 @@ prg_version="swig -version:python -V" } -conf_tc-maintainer() { +default_conf_tc() { deps="monoburg" export PATH="$prefix_root/monoburg/bin:$PATH" prg_version="bison --version:swig -version:python -V:tc --version" @@ -67,31 +67,39 @@ distcheck_config="$self_config" } -conf_tc() { - deps="monoburg" - export PATH="$prefix_root/monoburg/bin:$PATH" - prg_version="bison --version:swig -version:python -V:tc --version" - self_config="--enable-shared" - distcheck_config="$self_config" -} +conf_tc-maintainer() { default_conf_tc } +conf_tc() { default_conf_tc } # ----------- # # Vaucanson. # # ----------- # -conf_vaucanson() { - prg_version="swig -version:python -V" - self_config="--enable-vaucanswig" - distcheck_config="$self_config" -} - -conf_vaucanson-gcc4_0() { +default_conf_vaucanson() { prg_version="swig -version:python -V" self_config="--enable-vaucanswig" distcheck_config="$self_config" } +conf_vaucanson() { default_conf_vaucanson } +conf_vaucanson-gcc4_0() { default_conf_vaucanson } +conf_vaucanson-icc() { default_conf_vaucanson } + + +# ------- # +# Olena. # +# ------- # + +# Empty hooks. +conf_olena-proto-1.0-g++-3.4() {} +conf_olena-proto-1.0-g++-4.0() {} +conf_olena-proto-1.0-g++-4.1() {} +conf_olena-proto-1.0-g++-icpc() {} + +conf_olena-1.0-g++-3.4() {} +conf_olena-1.0-g++-4.0() {} +conf_olena-1.0-g++-4.1() {} +conf_olena-1.0-g++-icpc() {} ############################# Index: buildfarm_worker/brasilia.fns --- buildfarm_worker/brasilia.fns (revision 359) +++ buildfarm_worker/brasilia.fns (working copy) @@ -95,13 +95,13 @@ #test_tree olena-0.10 # Olena proto-1.0. -tree_olena_tree olena-proto-1.0 g++-3.4 -tree_olena_tree olena-proto-1.0 g++-4.0 -tree_olena_tree olena-proto-1.0 g++-4.1 +test_olena_tree olena-proto-1.0 g++-3.4 +test_olena_tree olena-proto-1.0 g++-4.0 +test_olena_tree olena-proto-1.0 g++-4.1 test_olena_tree olena-proto-1.0 icpc # Olena 1.0. -tree_olena_tree olena-1.0 g++-3.4 -tree_olena_tree olena-1.0 g++-4.0 -tree_olena_tree olena-1.0 g++-4.1 +test_olena_tree olena-1.0 g++-3.4 +test_olena_tree olena-1.0 g++-4.0 +test_olena_tree olena-1.0 g++-4.1 test_olena_tree olena-1.0 icpc