2006-08-24 Roland Levillain <roland@lrde.epita.fr> Clean up ccache usage. * buildfarm_worker/build_test.fns (action_configure): Don't force the use of ccache. (action_system): Adjust output. (test_tree): Don't set CCACHE. Don't touch $CC nor $CXX. * buildfarm_worker/antalya.fns, buildfarm_worker/brasilia.fns, * buildfarm_worker/caracas.fns, buildfarm_worker/istanbul.fns, * buildfarm_worker/pau.fns: Use ccache. Clean up. * buildfarm_worker/marvejols.fns: Likewise. Source /nix/etc/profile.d/nix.sh instead of altering the PATH. * buildfarm_worker/generic.fns: Clean up. * buildfarm_worker/package.fns (conf_monoburg): Export PATH. Index: buildfarm_worker/package.fns =================================================================== --- buildfarm_worker/package.fns (revision 300) +++ buildfarm_worker/package.fns (revision 301) @@ -49,7 +49,7 @@ conf_monoburg() { prg_version="bison --version:python -V" - PATH="$prefix_root/monoburg/bin:$PATH" + export PATH="$prefix_root/monoburg/bin:$PATH" } conf_clsp() { Index: buildfarm_worker/caracas.fns =================================================================== --- buildfarm_worker/caracas.fns (revision 300) +++ buildfarm_worker/caracas.fns (revision 301) @@ -1,36 +1,38 @@ -# caracas -# used to continuously build tiger+vaucanson +# caracas -*- shell-script -*- +# Used to continuously build Tiger and Vaucanson. + # Add some programs from /lrde/bin to the PATH. export PATH="/lrde/dev/linux-x86/sarge/autoconf-2.60/bin:$PATH" export PATH="/lrde/dev/linux-x86/sarge/bison-2.2/bin:$PATH" clean_buildfarm +export CC="ccache gcc" +export CXX="ccache g++" test_tree havm test_tree nolimips test_tree monoburg test_tree clsp test_tree tc-maintainer -CXX=g++-3.4 -CC=gcc-3.4 +export CC="ccache gcc-3.4" +export CXX="ccache g++-3.4" test_tree vaucanson bootstrap configure build demos install distcheck -CC=gcc-4.0 -CXX=g++-4.0 +export CC="ccache gcc-4.0" +export CXX="ccache g++-4.0" test_tree vaucanson-gcc4.0 bootstrap configure build demos install distcheck -CC=icpc # fixme: to remove ccache -CXX=icpc - +export CC="ccache icc" +export CXX="ccache icpc" # Don't use CXXFLAGS, it's CPP and LD stuffs. export CPPFLAGS="-D_LINUX -I/home/lrde/admin/lrde/usr/intel/compiler90/include/c++/" export LDFLAGS="-cxxlib-icc" export LD_LIBRARY_PATH=/home/lrde/admin/lrde/usr/intel/compiler90/include/lib/ - -PATH=/home/lrde/admin/lrde/usr/intel/compiler90/bin:$PATH +export PATH="/home/lrde/admin/lrde/usr/intel/compiler90/bin:$PATH" test_tree vaucanson-icc bootstrap configure build demos install distcheck -CXX=g++ +export CC="ccache gcc" +export CXX="ccache g++" test_tree ranch Index: buildfarm_worker/build_test.fns =================================================================== --- buildfarm_worker/build_test.fns (revision 300) +++ buildfarm_worker/build_test.fns (revision 301) @@ -253,8 +253,8 @@ echo echo "CFLAGS: $CFLAGS" echo "CXXFLAGS: $CXXFLAGS" - echo "CC: $CCACHE $CC" - echo "CXX: $CCACHE $CXX" + echo "CC: $CC" + echo "CXX: $CXX" echo "CONFIGURE OPTIONS: $config_and_prefix" echo "DISTCHECK_CONFIGURE_FLAGS: $distcheck_config" echo @@ -322,8 +322,6 @@ return 51 fi - export CC="$CCACHE $CC" - export CXX="$CCACHE $CXX" set -x mkdir -p $builddir @@ -440,19 +438,6 @@ # Don't keep stuff private umask 022 - # Set lot of variables used during the build - [ x"$CC" = x ] && export CC=gcc - [ x"$CXX" = x ] && export CXX=g++ - - unset CCACHE - if ccache -V > /dev/null; then - case `basename $CC` in - gcc* ) - export CCACHE="ccache" - ;; - esac - fi - export MAKE_WRAPPER="$PWD/make_wrapper.fns" export MAKE_ERROR_LEVEL="$PWD/build.$tree.make" builddir="_build" Index: buildfarm_worker/marvejols.fns =================================================================== --- buildfarm_worker/marvejols.fns (revision 300) +++ buildfarm_worker/marvejols.fns (revision 301) @@ -1,11 +1,16 @@ -# Add Nix binaries to the path. -export PATH="/home/build/.nix-profile/bin:$PATH" +# Marvejols -*- shell-script -*- + +# Nix settings. +. /nix/etc/profile.d/nix.sh # Add some programs from /lrde/bin to the PATH. export PATH="/lrde/dev/linux-x86/sarge/autoconf-2.60/bin:$PATH" export PATH="/lrde/dev/linux-x86/sarge/bison-2.2/bin:$PATH" clean_buildfarm +CC="ccache gcc" +CXX="ccache g++" + test_tree generic-tools test_tree c-tools test_tree cxx-tools Index: buildfarm_worker/generic.fns =================================================================== --- buildfarm_worker/generic.fns (revision 300) +++ buildfarm_worker/generic.fns (revision 301) @@ -1,34 +1,24 @@ +# Generic host configuration file. -*- shell-script -*- - -export ACLOCAL="aclocal-1.9" -export AUTOMAKE="automake-1.9" clean_buildfarm -test_tree aterm configure build install -test_tree sdf2 configure build install -test_tree strategoxt configure build install +# Use ccache along with GCC. +export CC="export gcc" +export CXX="export g++" -export CC=gcc-3.4 -export CXX=g++-3.4 +test_tree generic-tools +test_tree c-tools +test_tree cxx-tools +test_tree transformers -test_tree esdf -test_tree sdf-option -test_tree sdf-astgen -test_tree str-lazy -test_tree boxedsdf -test_tree sdf-detgen -test_tree sdf-attribute -test_tree c-grammar -#test_tree contract-c -#test_tree cxx-grammar -#test_tree cxx-basic +test_tree havm +test_tree nolimips +test_tree monoburg +test_tree clsp +test_tree tc-maintainer -#test_tree transformers +test_tree vaucanson +test_tree vaucanson-gcc4.0 -#test_tree havm -#test_tree nolimips -#test_tree monoburg -#test_tree clsp -#test_tree tc - +test_tree ranch test_tree ddd Index: buildfarm_worker/istanbul.fns =================================================================== --- buildfarm_worker/istanbul.fns (revision 300) +++ buildfarm_worker/istanbul.fns (revision 301) @@ -1,3 +1,5 @@ +# istanbul. -*- shell-script -*- + # Add some programs from /lrde/bin to the PATH. export PATH="/lrde/dev/linux-sparc64/sarge/autoconf-2.60/bin:$PATH" export PATH="/lrde/dev/linux-sparc64/sarge/bison-2.2/bin:$PATH" @@ -6,13 +8,16 @@ clean_buildfarm +export CC="ccache gcc" +export CXX="ccache g++" + test_tree havm test_tree nolimips test_tree monoburg test_tree clsp test_tree tc configure build distcheck -# not enough memory on this computer to run vaucanson :/ +# Not enough memory on this computer to test Vaucanson. :/ #test_tree vaucanson test_tree ranch Index: buildfarm_worker/pau.fns =================================================================== --- buildfarm_worker/pau.fns (revision 300) +++ buildfarm_worker/pau.fns (revision 301) @@ -1,3 +1,5 @@ +# pau. -*- shell-script -*- + # I don't know *why* this f*** system doesn't check in this directory # by default. export ACLOCAL="aclocal -I /usr/share/aclocal" @@ -9,6 +11,7 @@ clean_buildfarm +# FIXME: A recent Nix installation is needed (for Stratego/XT) on pau. #test_tree generic-tools #test_tree c-tools #test_tree cxx-tools @@ -26,5 +29,4 @@ test_tree vaucanson test_tree ranch - test_tree ddd Index: buildfarm_worker/brasilia.fns =================================================================== --- buildfarm_worker/brasilia.fns (revision 300) +++ buildfarm_worker/brasilia.fns (revision 301) @@ -1,29 +1,29 @@ # brasilia -*- shell-script -*- -# 2006-07-26: Temporarily added to the build farm to compile Vaucanson 1.0. +# 2006-07-26: Brasilia has been ``temporarily'' added to the build +# farm to compile Vaucanson 1.0. To be removed as soon as caracas is +# able to build Vaucanson properly. + clean_buildfarm -CXX="ccache g++-3.4" -CC="ccache gcc-3.4" -# FIXME: Temporarily remove `demos'. +export CC="ccache gcc-3.4" +export CXX="ccache g++-3.4" test_tree vaucanson bootstrap configure build demos install distcheck - -CC="ccache gcc-4.0" -CXX="ccache g++-4.0" -# FIXME: Temporarily remove `demos'. + +export CC="ccache gcc-4.0" +export CXX="ccache g++-4.0" test_tree vaucanson-gcc4.0 bootstrap configure build demos install distcheck -# ICC 9.1 is no longer working on brasilia (the license has expired -- -# but non-commercial free versions of ICC 9.1 will be available on -# August 2006). Thus use ICC 9.0 from the `lrde' account. -CC="ccache icpc" -CXX="ccache icpc" -# Don't use CXXFLAGS, it's CPP and LD stuffs. -export CPPFLAGS="-D_LINUX -I/home/lrde/admin/lrde/usr/intel/compiler90/include/c++/" -export LDFLAGS="-cxxlib-icc" -export LD_LIBRARY_PATH=/home/lrde/admin/lrde/usr/intel/compiler90/include/lib/ -PATH=/home/lrde/admin/lrde/usr/intel/compiler90/bin:$PATH # FIXME: Temp. disabled. -#test_tree vaucanson-icc bootstrap configure build demos install distcheck -CXX=g++ +# # ICC 9.1 is no longer working on brasilia (the license has expired -- +# # but non-commercial free versions of ICC 9.1 will be available on +# # August 2006). Thus use ICC 9.0 from the `lrde' account. +# export CC="ccache icpc" +# export CXX="ccache icpc" +# # Don't use CXXFLAGS, it's CPP and LD stuffs. +# export CPPFLAGS="-D_LINUX -I/home/lrde/admin/lrde/usr/intel/compiler90/include/c++/" +# export LDFLAGS="-cxxlib-icc" +# export LD_LIBRARY_PATH=/home/lrde/admin/lrde/usr/intel/compiler90/include/lib/ +# export PATH="/home/lrde/admin/lrde/usr/intel/compiler90/bin:$PATH" +# test_tree vaucanson-icc bootstrap configure build demos install distcheck Index: buildfarm_worker/antalya.fns =================================================================== --- buildfarm_worker/antalya.fns (revision 300) +++ buildfarm_worker/antalya.fns (revision 301) @@ -1,3 +1,6 @@ +# antalya. -*- shell-script -*- + +# Fink and local binaries. export PATH="/sw/bin:/var/tmp/build_farm/local/bin:$PATH" # Add some programs from /lrde/bin to the PATH. export PATH="/lrde/dev/darwin-powerpc/panther/autoconf-2.60/bin:$PATH" @@ -9,6 +12,9 @@ clean_buildfarm +export CC="ccache gcc" +export CXX="ccache g++" + #test_tree aterm configure build install #test_tree sdf2 configure build install #test_tree strategoxt configure build install @@ -32,8 +38,9 @@ test_tree monoburg test_tree clsp +# FIXME: Is this the best way to set DISTCHECK_CONFIGURE_FLAGS? host_config="--with-boost=/sw/include" -export DISTCHECK_CONFIGURE_FLAGS=$host_config +export DISTCHECK_CONFIGURE_FLAGS="$host_config" test_tree tc configure build distcheck unset DISTCHECK_CONFIGURE_FLAGS host_config=""