https://svn.lrde.epita.fr/svn/lrde-tools/trunk/build-farm Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Use consistent naming schemes for Olena's and Vaucanson's test trees. * buildfarm_worker/generic.fns, buildfarm_worker/antalya.fns, * buildfarm_worker/brasilia.fns, buildfarm_worker/pau.fns: Systematically append the name of the compiler(s) to Olena's and Vaucanson's test trees. * buildfarm_worker/caracas.fns: Likewise. (host_type): Set to linux-x86. Adjust PATH. Add ICC 9.1's directory to the PATH. Adjust for ICC 9.1. * web/build.pl: Rename vaucanson, vaucanson-gcc4.0', vaucanson-gcc4.0-stlport and vaucanson-icc as vaucanson-gcc-3.4, vaucanson-gcc-4.0', vaucanson-gcc-4.0-stlport and vaucanson-icc-9.1. Remove olena-0.10a and olena-1.0-icpc. buildfarm_worker/antalya.fns | 10 ++++++---- buildfarm_worker/brasilia.fns | 9 +++++---- buildfarm_worker/caracas.fns | 26 +++++++++++--------------- buildfarm_worker/generic.fns | 4 ++-- buildfarm_worker/pau.fns | 2 +- web/build.pl | 10 ++++------ 6 files changed, 29 insertions(+), 32 deletions(-) Index: web/build.pl --- web/build.pl (revision 417) +++ web/build.pl (working copy) @@ -77,18 +77,16 @@ 'tc-maintainer', 'tc', '---', - 'vaucanson', - 'vaucanson-gcc4.0', - 'vaucanson-gcc4.0-stlport', - 'vaucanson-icc', + 'vaucanson-gcc-3.4', + 'vaucanson-gcc-4.0', + 'vaucanson-gcc-4.0-stlport', + 'vaucanson-icc-9.1', '---', - 'olena-0.10a', 'olena-0.10a-g++-4.1', 'olena-0.10a-icpc-9.1', 'olena-1.0-g++-3.4', 'olena-1.0-g++-4.0', 'olena-1.0-g++-4.1', - 'olena-1.0-icpc', 'olena-1.0-icpc-9.1', '---', 'ranch', Index: buildfarm_worker/caracas.fns --- buildfarm_worker/caracas.fns (revision 417) +++ buildfarm_worker/caracas.fns (working copy) @@ -1,10 +1,10 @@ # caracas. -*- shell-script -*- # Used to continuously build Tiger and Vaucanson. -host_type=linux-x86/sarge +host_type=linux-x86 # Add some programs from /lrde/dev to the PATH. -path_prepend autoconf-2.60 bison-2.3 +path_prepend sarge/autoconf-2.60 sarge/bison-2.3 intel/icc9.1 # The ccache dir is located in the /work file system. As ~/.zshenv is # not sourced by the build script, this environment variable is @@ -34,28 +34,24 @@ # ( # export CC="ccache gcc-3.4" # export CXX="ccache g++-3.4" -# test_tree vaucanson bootstrap configure build check demos install distcheck +# test_tree vaucanson-gcc-3.4 \ +# bootstrap configure build check demos install distcheck # ) # ( # export CC="ccache gcc-4.0" # export CXX="ccache g++-4.0" -# test_tree vaucanson-gcc4.0 \ +# test_tree vaucanson-gcc-4.0 \ # bootstrap configure build check demos install distcheck # ) -# # ( -# export CC="ccache icc" -# export CXX="ccache icpc" - -# icc_dir="/lrde/beyrouth/admin/lrde/usr/intel/compiler90" -# # Don't use CXXFLAGS, it's CPP and LD stuffs. -# export CPPFLAGS="-D_LINUX -I$icc_dir/include/c++/" -# export LDFLAGS="-cxxlib-icc -i-static" -# export LD_LIBRARY_PATH="$icc_dir/lib:`printenv LD_LIBRARY_PATH`" -# export PATH="$icc_dir/bin:$PATH" -# test_tree vaucanson-icc \ +# export CC="icc" +# export CXX="icpc" +# # ICC 9.1 settings. +# source /lrde/dev/linux-x86/intel/icc9.1/bin/iccvars.sh +# init_icc_vars +# test_tree vaucanson-icc-9.1 \ # bootstrap configure build check demos install distcheck # ) Index: buildfarm_worker/generic.fns --- buildfarm_worker/generic.fns (revision 417) +++ buildfarm_worker/generic.fns (working copy) @@ -17,8 +17,8 @@ test_tree clspr test_tree tc-maintainer -test_tree vaucanson -test_tree vaucanson-gcc4.0 +test_tree vaucanson-gcc-3.4 +test_tree vaucanson-gcc-4.0 test_tree ranch test_tree ddd Index: buildfarm_worker/pau.fns --- buildfarm_worker/pau.fns (revision 417) +++ buildfarm_worker/pau.fns (working copy) @@ -23,7 +23,7 @@ test_tree clspr test_tree tc configure build distcheck -test_tree vaucanson +test_tree vaucanson-gcc-3.4 test_tree ranch test_tree ddd Index: buildfarm_worker/brasilia.fns --- buildfarm_worker/brasilia.fns (revision 417) +++ buildfarm_worker/brasilia.fns (working copy) @@ -222,20 +222,21 @@ ( export CC="ccache gcc-3.4" export CXX="ccache g++-3.4" - test_tree vaucanson bootstrap configure build check demos install distcheck + test_tree vaucanson-gcc-3.4 \ + bootstrap configure build check demos install distcheck ) ( export CC="ccache gcc-4.0" export CXX="ccache g++-4.0" - test_tree vaucanson-gcc4.0 \ + test_tree vaucanson-gcc-4.0 \ bootstrap configure build check demos install distcheck ) ( export CC="ccache gcc-4.0" export CXX="ccache g++-4.0" - test_tree vaucanson-gcc4.0-stlport \ + test_tree vaucanson-gcc-4.0-stlport \ bootstrap configure build check demos install distcheck ) @@ -243,7 +244,7 @@ export CC="icc" export CXX="icpc" init_icc_vars - test_tree vaucanson-icc \ + test_tree vaucanson-icc-9.1 \ bootstrap configure build check demos install distcheck ) Index: buildfarm_worker/antalya.fns --- buildfarm_worker/antalya.fns (revision 417) +++ buildfarm_worker/antalya.fns (working copy) @@ -56,7 +56,7 @@ # ----------- # # 2006-09-25: Disabled. -#test_tree vaucanson +#test_tree vaucanson-gcc-3.4 # ------- # @@ -66,13 +66,15 @@ # Olena 0.10a. # Goa's working copy of Olena 0.10a is not updated automatically; # don't forget to update it when new revisions are checked in. -test_tree olena-0.10a bootstrap configure build check install distcheck +( + export CXX="ccache g++-4" + test_tree olena-0.10a-g++-4.1 +) # Olena 1.0. ( export CXX="ccache g++-4" - test_tree olena-1.0-g++-4.1 \ - bootstrap configure build check install distcheck + test_tree olena-1.0-g++-4.1 )