"Roland" == Roland Levillain roland@lrde.epita.fr writes:
Index: buildfarm_worker/caracas.fns --- buildfarm_worker/caracas.fns (revision 393) +++ buildfarm_worker/caracas.fns (working copy) @@ -4,7 +4,7 @@
# 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" +export PATH="/lrde/dev/linux-x86/sarge/bison-2.3/bin:$PATH"
Why don't you have a function, say path_prepend, that does this, using a local variable, say $host_type, that does depend on the machine. That would certainly factor a lot of stuff here.
path_prepend autoconf-2.60 \ bison-2.3 \ ...
# The ccache dir is located in the /work file system. As ~/.zshenv is # not sourced by the build script, this environment variable is Index: buildfarm_worker/marvejols.fns --- buildfarm_worker/marvejols.fns (revision 393) +++ buildfarm_worker/marvejols.fns (working copy) @@ -5,7 +5,7 @@
# 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" +export PATH="/lrde/dev/linux-x86/sarge/bison-2.3/bin:$PATH"
# The ccache dir is located in the /work file system on. As # ~/.zshenv is not sourced by the build script, this environment Index: buildfarm_worker/tanis.fns --- buildfarm_worker/tanis.fns (revision 393) +++ buildfarm_worker/tanis.fns (working copy) @@ -3,7 +3,7 @@ # Used to build Vaucanson.
# Add some programs from /lrde/bin to the PATH. -export PATH="/lrde/dev/linux-x86/sarge/bison-2.2/bin:$PATH" +export PATH="/lrde/dev/linux-x86/sarge/bison-2.3/bin:$PATH"
# The ccache dir is located in the /work file system. As ~/.zshenv is # not sourced by the build script, this environment variable is Index: buildfarm_worker/istanbul.fns --- buildfarm_worker/istanbul.fns (revision 393) +++ buildfarm_worker/istanbul.fns (working copy) @@ -2,7 +2,7 @@
# 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" +export PATH="/lrde/dev/linux-sparc64/sarge/bison-2.3/bin:$PATH"
export CCACHE_DIR="/work/build/var/ccache"
Index: buildfarm_worker/antalya.fns --- buildfarm_worker/antalya.fns (revision 393) +++ buildfarm_worker/antalya.fns (working copy) @@ -8,7 +8,7 @@ # Add some programs from /lrde/bin to the PATH. export PATH="/lrde/dev/darwin-powerpc/panther/autoconf-2.60/bin:$PATH" export PATH="/lrde/dev/darwin-powerpc/panther/automake-1.9.6/bin:$PATH" -export PATH="/lrde/dev/darwin-powerpc/panther/bison-2.2/bin:$PATH" +export PATH="/lrde/dev/darwin-powerpc/panther/bison-2.3/bin:$PATH" export PATH="/lrde/dev/darwin-powerpc/panther/swig-1.3.29/bin:$PATH"
# Set up Libtool (from Fink).
Akim Demaille akim@lrde.epita.fr writes:
"Roland" == Roland Levillain roland@lrde.epita.fr writes:
Index: buildfarm_worker/caracas.fns --- buildfarm_worker/caracas.fns (revision 393) +++ buildfarm_worker/caracas.fns (working copy) @@ -4,7 +4,7 @@
# 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" +export PATH="/lrde/dev/linux-x86/sarge/bison-2.3/bin:$PATH"
Why don't you have a function, say path_prepend, that does this, using a local variable, say $host_type, that does depend on the machine. That would certainly factor a lot of stuff here.
path_prepend autoconf-2.60 \ bison-2.3 \ ...
Yes, that's better. In fact, there is a lot of cleansing work to do in the scripts of the build farm. :/