- Projects

[LrdeTools] 429: s/Olena 0.10a/Olena 0.11/g.
by Roland Levillain 01 Mar '07

01 Mar '07

https://svn.lrde.epita.fr/svn/lrde-tools/trunk/build-farm Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> s/Olena 0.10a/Olena 0.11/g. * buildfarm_worker/antalya.fns, buildfarm_worker/brasilia.fns: Replace every occurrence of Olena 0.10a with Olena 0.11. antalya.fns | 6 +++--- brasilia.fns | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) Index: buildfarm_worker/brasilia.fns --- buildfarm_worker/brasilia.fns (revision 428) +++ buildfarm_worker/brasilia.fns (working copy) @@ -98,13 +98,13 @@ } -# Olena 0.10a. -# ------------ +# Olena 0.11. +# ----------- # FIXME: Augment `maintainer/update_unpacked' with the ability to fetch # copies from the PRCS repository instead of using manual updates from -# brasilia using `maintainer/update_unpacked-oln-0.10a.'? -test_olena_tree olena-0.10a g++-4.1 -test_olena_tree olena-0.10a icpc-9.1 +# brasilia using `maintainer/update_unpacked-oln-0.11'? +test_olena_tree olena-0.11 g++-4.1 +test_olena_tree olena-0.11 icpc-9.1 # Olena proto-1.0. # ---------------- Index: buildfarm_worker/antalya.fns --- buildfarm_worker/antalya.fns (revision 428) +++ buildfarm_worker/antalya.fns (working copy) @@ -63,12 +63,12 @@ # Olena. # # ------- # -# Olena 0.10a. -# Goa's working copy of Olena 0.10a is not updated automatically; +# Olena 0.11. +# Goa's working copy of Olena 0.11 is not updated automatically; # don't forget to update it when new revisions are checked in. ( export CXX="ccache g++-4" - test_tree olena-0.10a-g++-4.1 + test_tree olena-0.11-g++-4.1 ) # Olena 1.0.

1 0

Re: [Projects] vcs ignore
by Tsuna 01 Mar '07

01 Mar '07

On 2007-02-23, Nicolas Pouillard <nicolas.pouillard(a)gmail.com> wrote: > On 2/23/07, Akim Demaille <akim(a)lrde.epita.fr> wrote: >> >> Je ne sais pas comment fonctionne svn-wrapper, mais vcs, quand je lui >> donne une liste d'ignore, vue sa vitesse on dirait qu'il édite les >> svn:ignore pour chaque fichier, au lieu de grouper en un changement >> par répertoire. >> >> C'est *très* lent. > > C'est maintenant groupé dans la 0.5_beta13 > (http://gallium.inria.fr/~pouillar/archives/vcs-0.5_beta13.tar.bz2) > > Dans cette version il aussi un support pour les "pinned" externals: > > svn pin --help > svn pinall ---help > Ca fait quoi au juste? -- SIGOURE Benoit aka Tsuna (SUSv3 compliant) _____ "On a long enough timeline, the survival rate /EPITA\ Promo 2008.CSI/ACU/YAKA for everyone drops to zero" -- Jack.

2 1

Re: [Projects] vcs ignore
by Akim Demaille 01 Mar '07

01 Mar '07

>>> "Nicolas" == Nicolas Pouillard <nicolas.pouillard(a)gmail.com> writes: > C'est maintenant groupé dans la 0.5_beta13 > (http://gallium.inria.fr/~pouillar/archives/vcs-0.5_beta13.tar.bz2) On fait quoi là-dedans ?

3 5

[LrdeTools] 428: Update update_unpacked-oln-0.11.
by Roland Levillain 28 Feb '07

28 Feb '07

https://svn.lrde.epita.fr/svn/lrde-tools/trunk/build-farm Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Update update_unpacked-oln-0.11. * maintainer/update_unpacked-oln-0.10a: Rename as... * maintainer/update_unpacked-oln-0.11: ...this. Adjust for Olena 0.11. update_unpacked-oln-0.11 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) Index: maintainer/update_unpacked-oln-0.11 --- maintainer/update_unpacked-oln-0.11 (revision 425) +++ maintainer/update_unpacked-oln-0.11 (working copy) @@ -1,6 +1,6 @@ #! /bin/sh -# Update Olena 0.10a's working copy on goa. +# Update Olena 0.11's working copy on goa. # To be run from a (client) machine that have access to the PRCS # repository, not from goa. @@ -18,10 +18,10 @@ tempdir=$(mktemp -d) cd $tempdir -# Latest revision of the 0.10a branch. -latest_rev=$(prcs info -r10.@ oln | cut -d" " -f 2) +# Latest revision of the 0.11 branch. +latest_rev=$(prcs info -r11.@ oln | cut -d" " -f 2) # Package name. -package_name="olena-0.10a-$latest_rev" +package_name="olena-0.11-$latest_rev" # Checkout. mkdir $package_name @@ -43,8 +43,8 @@ "cd /work/master/unpacked && \ tar xjvf $package_tarname && \ rm -f $package_tarname && \ - rm -f olena-0.10a && \ - ln -s $package_name olena-0.10a" + rm -f olena-0.11 && \ + ln -s $package_name olena-0.11" # Clean up. cd /tmp

1 0

[LrdeTools] 427: Tell autoreconf 1.10 where other M4 macros live on istanbul.
by Roland Levillain 28 Feb '07

28 Feb '07

https://svn.lrde.epita.fr/svn/lrde-tools/trunk/build-farm Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * buildfarm_worker/istanbul.fns: Tell autoreconf 1.10 where other M4 macros live. istanbul.fns | 6 ++++++ 1 file changed, 6 insertions(+) Index: buildfarm_worker/istanbul.fns --- buildfarm_worker/istanbul.fns (revision 426) +++ buildfarm_worker/istanbul.fns (working copy) @@ -5,6 +5,12 @@ # Add some programs from /lrde/dev to the PATH. path_prepend autoconf-2.61 automake-1.10 bison-2.3 +# Tell autoreconf 1.10 where other M4 macros live. +export ACLOCAL='aclocal -I /usr/share/aclocal/' + +# The ccache dir is located in the /work file system. As ~/.zshenv is +# not sourced by the build script, this environment variable is +# defined here. export CCACHE_DIR="/work/build/var/ccache"

1 0

[LrdeTools] 426: Add build trees for Vaucanson using GCC 4.1.
by Roland Levillain 28 Feb '07

28 Feb '07

https://svn.lrde.epita.fr/svn/lrde-tools/trunk/build-farm Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add build trees for Vaucanson using GCC 4.1. * buildfarm_worker/houston.fns: Use GCC 4.1 intead of GCC 4.0. * buildfarm_worker/package.fns (conf_vaucanson) (conf_vaucanson_gcc4_0, conf_vaucanson_gcc4_0_stlport) (conf_vaucanson_icc): Rename as... (conf_vaucanson_gcc_3_4, conf_vaucanson_gcc_4_0) (conf_vaucanson_gcc_4_0_stlport, conf_vaucanson_icc_9_1): ...this. (conf_vaucanson_gcc_4_1, conf_vaucanson_gcc_4_1_stlport): New. (conf_olena_0_10a): Rename as.. (default_conf_olena_0_11): ...this. (conf_olena_proto_1_0_gxx_3_4, conf_olena_proto_1_0_gxx_4_0) (conf_olena_proto_1_0_gxx_4_1, conf_olena_proto_1_0_icpc): Remove. (conf_olena_0_11_gxx_4_1, conf_olena_0_11_icpc_9_1): New. (conf_olena_1_0_icpc): Rename as... (conf_olena_1_0_icpc_9_1): ...this. * web/build.pl (trees_cat): Add vaucanson-gcc-4.1 and vaucanson-gcc-4.1-stlport. Rename olena-0.10a-g++-4.1 and olena-0.10a-icpc-9.1 as olena-0.11-g++-4.1 and olena-0.11-icpc-9.1. buildfarm_worker/houston.fns | 12 ++++++------ buildfarm_worker/package.fns | 22 +++++++++++----------- web/build.pl | 6 ++++-- 3 files changed, 21 insertions(+), 19 deletions(-) Index: buildfarm_worker/houston.fns --- buildfarm_worker/houston.fns (revision 425) +++ buildfarm_worker/houston.fns (working copy) @@ -44,16 +44,16 @@ ) ( - export CC="ccache gcc-4.0" - export CXX="ccache g++-4.0" - test_tree vaucanson-gcc-4.0 \ + export CC="ccache gcc-4.1" + export CXX="ccache g++-4.1" + test_tree vaucanson-gcc-4.1 \ bootstrap configure build check demos install distcheck ) ( - export CC="ccache gcc-4.0" - export CXX="ccache g++-4.0" - test_tree vaucanson-gcc-4.0-stlport \ + export CC="ccache gcc-4.1" + export CXX="ccache g++-4.1" + test_tree vaucanson-gcc-4.1-stlport \ bootstrap configure build check demos install distcheck ) Index: buildfarm_worker/package.fns --- buildfarm_worker/package.fns (revision 425) +++ buildfarm_worker/package.fns (working copy) @@ -80,30 +80,30 @@ distcheck_config="$self_config" } -conf_vaucanson() { default_conf_vaucanson; } -conf_vaucanson_gcc4_0() { default_conf_vaucanson; } -conf_vaucanson_gcc4_0_stlport() { default_conf_vaucanson; } -conf_vaucanson_icc() { default_conf_vaucanson; } +conf_vaucanson_gcc_3_4() { default_conf_vaucanson; } +conf_vaucanson_gcc_4_0() { default_conf_vaucanson; } +conf_vaucanson_gcc_4_0_stlport() { default_conf_vaucanson; } +conf_vaucanson_gcc_4_1() { default_conf_vaucanson; } +conf_vaucanson_gcc_4_1_stlport() { default_conf_vaucanson; } +conf_vaucanson_icc_9_1() { default_conf_vaucanson; } # ------- # # Olena. # # ------- # -conf_olena_0_10a() { +default_conf_olena_0_11() { prg_version="swig -version:python -V:ruby --version" } -# Empty hooks. -conf_olena_proto_1_0_gxx_3_4() { :; } -conf_olena_proto_1_0_gxx_4_0() { :; } -conf_olena_proto_1_0_gxx_4_1() { :; } -conf_olena_proto_1_0_icpc() { :; } +conf_olena_0_11_gxx_4_1() { default_conf_olena_0_11; } +conf_olena_0_11_icpc_9_1() { default_conf_olena_0_11; } + conf_olena_1_0_gxx_3_4() { :; } conf_olena_1_0_gxx_4_0() { :; } conf_olena_1_0_gxx_4_1() { :; } -conf_olena_1_0_icpc() { :; } +conf_olena_1_0_icpc_9_1() { :; } # ------------ # Index: web/build.pl --- web/build.pl (revision 425) +++ web/build.pl (working copy) @@ -81,10 +81,12 @@ 'vaucanson-gcc-3.4', 'vaucanson-gcc-4.0', 'vaucanson-gcc-4.0-stlport', + 'vaucanson-gcc-4.1', + 'vaucanson-gcc-4.1-stlport', 'vaucanson-icc-9.1', '---', - 'olena-0.10a-g++-4.1', - 'olena-0.10a-icpc-9.1', + 'olena-0.11-g++-4.1', + 'olena-0.11-icpc-9.1', 'olena-1.0-g++-3.4', 'olena-1.0-g++-4.0', 'olena-1.0-g++-4.1',

1 0

[LrdeTools] 425: Adjust paths to tools.
by Roland Levillain 27 Feb '07

27 Feb '07

https://svn.lrde.epita.fr/svn/lrde-tools/trunk/build-farm Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Adjust paths to tools. * buildfarm_worker/brasilia.fns: Fix ICC settings. Don't use Automake 1.10 from /lrde/dev/ (provided by Debian Sid). * buildfarm_worker/caracas.fns (host_type): Set to linux-x86/etch. Fix ICC settings. Use Autoconf 2.61 from /lrde/dev/. Don't use Bison 2.3 from /lrde/dev/ (provided by Debian Etch). * buildfarm_worker/houston.fns (host_type): Set to linux-x86/etch. Use Autoconf 2.61 from /lrde/dev/. * buildfarm_worker/marvejols.fns (host_type): Set to linux-x86/etch. Use Autoconf 2.61 from /lrde/dev/. Don't use Bison 2.3 from /lrde/dev/ (provided by Debian Etch). * buildfarm_worker/istanbul.fns (host_type): Set to linux-sparc64/sarge. Use Autoconf 2.61 and Automake 1.10 from /lrde/dev/. brasilia.fns | 9 ++------- caracas.fns | 6 +++--- houston.fns | 5 +++-- istanbul.fns | 4 ++-- marvejols.fns | 4 ++-- 5 files changed, 12 insertions(+), 16 deletions(-) Index: buildfarm_worker/caracas.fns --- buildfarm_worker/caracas.fns (revision 424) +++ buildfarm_worker/caracas.fns (working copy) @@ -3,13 +3,13 @@ # Used to build Tiger (and Vaucanson). -host_type=linux-x86/sarge +host_type=linux-x86/etch # Add ICC (from /lrde/dev) to the PATH. -/lrde/dev/linux-x86/intel/icc9.1/bin/iccvars.sh +source /lrde/dev/linux-x86/intel/icc9.1/bin/iccvars.sh # Add some programs from /lrde/dev to the PATH. -path_prepend autoconf-2.60 automake-1.10 bison-2.3 +path_prepend autoconf-2.61 automake-1.10 # Tell autoreconf 1.10 where other M4 macros live. export ACLOCAL='aclocal -I /usr/share/aclocal/' Index: buildfarm_worker/houston.fns --- buildfarm_worker/houston.fns (revision 424) +++ buildfarm_worker/houston.fns (working copy) @@ -3,15 +3,16 @@ # Used to compile Vaucanson. -host_type=linux-x86/sarge +host_type=linux-x86/etch # Get init_icc_vars's definition. source tools.fns # Add ICC (from /lrde/dev) to the PATH. source /lrde/dev/linux-x86/intel/icc9.1/bin/iccvars.sh + # Add some programs from /lrde/dev to the PATH. -path_prepend autoconf-2.60 automake-1.10 +path_prepend autoconf-2.61 automake-1.10 # Tell autoreconf 1.10 where other M4 macros live. export ACLOCAL='aclocal -I /usr/share/aclocal/' Index: buildfarm_worker/marvejols.fns --- buildfarm_worker/marvejols.fns (revision 424) +++ buildfarm_worker/marvejols.fns (working copy) @@ -1,11 +1,11 @@ # marvejols. -*- shell-script -*- -host_type=linux-x86/sarge +host_type=linux-x86/etch # Nix settings. . /nix/etc/profile.d/nix.sh # Add some programs from /lrde/dev to the PATH. -path_prepend autoconf-2.60 bison-2.3 +path_prepend autoconf-2.61 automake-1.10 # 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/istanbul.fns --- buildfarm_worker/istanbul.fns (revision 424) +++ buildfarm_worker/istanbul.fns (working copy) @@ -1,9 +1,9 @@ # istanbul. -*- shell-script -*- -host_type=linux-sparc64 +host_type=linux-sparc64/sarge # Add some programs from /lrde/dev to the PATH. -path_prepend autoconf-2.60 bison-2.3 +path_prepend autoconf-2.61 automake-1.10 bison-2.3 export CCACHE_DIR="/work/build/var/ccache" Index: buildfarm_worker/brasilia.fns --- buildfarm_worker/brasilia.fns (revision 424) +++ buildfarm_worker/brasilia.fns (working copy) @@ -8,13 +8,8 @@ # Get init_icc_vars's definition. source tools.fns -# Add ICC (from /lrde/dev) to the PATH... -/lrde/dev/linux-x86/intel/icc9.1/bin/iccvars.sh - -# ... as Automake 1.10 (not yet in Sid). -path_prepend automake-1.10 -# Tell autoreconf 1.10 where other M4 macros live. -export ACLOCAL='aclocal -I /usr/share/aclocal/' +# Add ICC (from /lrde/dev) to the PATH. +source /lrde/dev/linux-x86/intel/icc9.1/bin/iccvars.sh # The ccache dir is located in the /work file system. As ~/.zshenv is # not sourced by the build script, this environment variable is

1 0

[LrdeTools] 424: Add a `cleanup' target for make.
by Roland Levillain 26 Feb '07

26 Feb '07

https://svn.lrde.epita.fr/svn/lrde-tools/trunk/build-farm Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add a `cleanup' target for make. * Makefile (cleanup): New target. (.PHONY): Add cleanup. * web/build.pl (hosts): Use uniform naming conventions. Makefile | 9 ++++++++- web/build.pl | 12 ++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) Index: web/build.pl --- web/build.pl (revision 423) +++ web/build.pl (working copy) @@ -43,13 +43,13 @@ # and what boxes. Should be in a config file my (%hosts) = ( 'antalya' => "Darwin 7.9 powerpc", - 'brasilia' => "Debian GNU/Linux sid i386", - 'caracas' => "Debian GNU/Linux etch i386", - 'houston' => "Debian GNU/Linux etch i386", - 'istanbul' => "Debian GNU/Linux 3.1 sarge sparc64", - 'marvejols' => "Debian GNU/Linux etch i386", + 'brasilia' => "Debian GNU/Linux unstable (sid) i386", + 'caracas' => "Debian GNU/Linux 4.0 (etch) i386", + 'houston' => "Debian GNU/Linux 4.0 (etch) i386", + 'istanbul' => "Debian GNU/Linux 3.1 (sarge) sparc64", + 'marvejols' => "Debian GNU/Linux 4.0 (etch) i386", 'pau' => "Cygwin Window XP Pro i686", - 'warszawa' => "Debian GNU/Linux etch i386", + 'warszawa' => "Debian GNU/Linux 4.0 (etch) i386", ); Index: Makefile --- Makefile (revision 423) +++ Makefile (working copy) @@ -13,4 +13,11 @@ 'cd /work/master && \ svn status' -.PHONY : update status install +# Perform a remote `svn cleanup' on goa. +cleanup: + ssh pm@goa \ + 'cd /work/master && \ + svn cleanup' + + +.PHONY : install update status cleanup

1 0

[LrdeTools] 423: Add houston to the build farm, and make it build Vaucanson.
by Roland Levillain 26 Feb '07

26 Feb '07

https://svn.lrde.epita.fr/svn/lrde-tools/trunk/build-farm Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add houston to the build farm, and make it build Vaucanson. * buildfarm_worker/houston.fns: New. * web/build.pl (hosts): Add houston. Fix definitions of other hosts. buildfarm_worker/brasilia.fns | 2 - buildfarm_worker/houston.fns | 65 ++++++++++++++++++++++++++++++++++++++++++ web/build.pl | 9 +++-- 3 files changed, 71 insertions(+), 5 deletions(-) Index: web/build.pl --- web/build.pl (revision 422) +++ web/build.pl (working copy) @@ -44,10 +44,11 @@ my (%hosts) = ( 'antalya' => "Darwin 7.9 powerpc", 'brasilia' => "Debian GNU/Linux sid i386", - 'caracas' => "Debian GNU/Linux sid i386", - 'istanbul' => "Debian GNU/Linux 3.1 stable sparc64", - 'marvejols' => "Debian GNU/Linux sid i386", - 'pau' => "Cygwin XP Pro i686", + 'caracas' => "Debian GNU/Linux etch i386", + 'houston' => "Debian GNU/Linux etch i386", + 'istanbul' => "Debian GNU/Linux 3.1 sarge sparc64", + 'marvejols' => "Debian GNU/Linux etch i386", + 'pau' => "Cygwin Window XP Pro i686", 'warszawa' => "Debian GNU/Linux etch i386", ); Index: buildfarm_worker/houston.fns --- buildfarm_worker/houston.fns (revision 0) +++ buildfarm_worker/houston.fns (revision 0) @@ -0,0 +1,65 @@ +# houston. -*- shell-script -*- + +# Used to compile Vaucanson. + + +host_type=linux-x86/sarge + +# Get init_icc_vars's definition. +source tools.fns + +# Add ICC (from /lrde/dev) to the PATH. +source /lrde/dev/linux-x86/intel/icc9.1/bin/iccvars.sh +# Add some programs from /lrde/dev to the PATH. +path_prepend autoconf-2.60 automake-1.10 + +# Tell autoreconf 1.10 where other M4 macros live. +export ACLOCAL='aclocal -I /usr/share/aclocal/' + +# The ccache dir is located in the /work file system. As ~/.zshenv is +# not sourced by the build script, this environment variable is +# defined here. +export CCACHE_DIR=/work/build/var/ccache + +# The setup of ICC is tedious enough to be avoided to build `timelimit'; +# always use GCC for this. +export TIMELIMIT_CC=gcc + + + +# Clean up. +clean_buildfarm + + +# ----------- # +# Vaucanson. # +# ----------- # + +( + export CC="ccache gcc-3.4" + export CXX="ccache g++-3.4" + 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-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-gcc-4.0-stlport \ + bootstrap configure build check demos install distcheck +) + +( + export CC="icc" + export CXX="icpc" + init_icc_vars + test_tree vaucanson-icc-9.1 \ + bootstrap configure build check demos install distcheck +) Index: buildfarm_worker/brasilia.fns --- buildfarm_worker/brasilia.fns (revision 422) +++ buildfarm_worker/brasilia.fns (working copy) @@ -36,7 +36,7 @@ # ----------- # # 2006-07-26: Vaucanson has been temporarily added to Brasilia. To be -# removed as soon as caracas is able to build Vaucanson properly. +# removed as soon as houston is able to build Vaucanson properly. ( export CC="ccache gcc-3.4"

1 0

[LrdeTools] 422: Improve the handling of ICC.
by Roland Levillain 26 Feb '07

26 Feb '07

https://svn.lrde.epita.fr/svn/lrde-tools/trunk/build-farm Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Improve the handling of ICC. * buildfarm_worker/brasilia.fns (host_type): Set to linux-x86/unstable. Source /lrde/dev/linux-x86/intel/icc9.1/bin/iccvars.sh at the begining of the file, instead of adding ICC's directory to the PATH manually. (init_icc_vars): Move this function... * buildfarm_worker/tools.fns: ...here (new file). * buildfarm_worker/caracas.fns (host_type): Set to linux-x86/sarge. Source /lrde/dev/linux-x86/intel/icc9.1/bin/iccvars.sh at the begining of the file, instead of adding ICC's directory to the PATH manually. (ACLOCAL, TIMELIMIT_CC): New environment variables. * buildfarm_worker/generic.fns (CC, CXX): Fix these environment variables. * buildfarm_worker/config.fns: Handle Olena 0.11. brasilia.fns | 206 +++-------------------------------------------------------- caracas.fns | 26 +++++-- config.fns | 2 generic.fns | 4 - tools.fns | 192 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 224 insertions(+), 206 deletions(-) Index: buildfarm_worker/brasilia.fns --- buildfarm_worker/brasilia.fns (revision 421) +++ buildfarm_worker/brasilia.fns (working copy) @@ -1,12 +1,18 @@ # brasilia. -*- shell-script -*- -# Used to compile Olena and Vaucanson. +# Used to build Olena and Vaucanson. -host_type=linux-x86 -# Add ICC (from /lrde/dev) to the PATH, as well as Automake 1.10 (not -# yet in Sid). -path_prepend intel/icc9.1 unstable/automake-1.10 +host_type=linux-x86/unstable + +# Get init_icc_vars's definition. +source tools.fns + +# Add ICC (from /lrde/dev) to the PATH... +/lrde/dev/linux-x86/intel/icc9.1/bin/iccvars.sh + +# ... as Automake 1.10 (not yet in Sid). +path_prepend automake-1.10 # Tell autoreconf 1.10 where other M4 macros live. export ACLOCAL='aclocal -I /usr/share/aclocal/' @@ -20,196 +26,6 @@ export TIMELIMIT_CC=gcc -# INIT_ICC_VARS -# ------------- -# Initialize ICC environment variables. -init_icc_vars() -{ - # ICC 9.1 settings. - source /lrde/dev/linux-x86/intel/icc9.1/bin/iccvars.sh - - # Disable some (sometimes fallacious) remarks and warnings from icpc. - # - # FIXME: Some of these warnings could be disabled from configure when - # the selected C++ compiler is icpc. - # - # - # Remarks. - # -------- - # - # #279 - from icpc stdlib + mlc - # #304 - fixable - # #383 - located in icpc std lib + xtd - # #424 - probably fixable - # #444 - hard to fix IMHO - # #593 - fixable, but probably a lot of places must be changed - # #810 - fixable - # #869 - located in icpc std lib (=> not our responsibility) - # #981 - located in icpc std lib + xtd ; hard to fix without obfuscating. - # #1292 - located in icpc stdlib (=> not our responsibility) - # #1418 - to be looked at closer - # #1572 - fixable (comparisons on float values) - # #1682 - located in system lib (=> not our responsibility) - # #1683 - located in system lib (=> not our responsibility) - # - # - # /lrde/beyrouth/admin/lrde/usr/intel/compiler90/include/c++/xstring(1577): - # remark #279: controlling expression is constant - # : sizeof (_Elem) <= 2 ? 7 - # ^ - # - # - # extended/xtd/cfun.hh(76): - # remark #304: access control not specified ("public" by default) - # struct fun_traits_< plain_cfun_<F> > : fun_traits_<F> - # ^ - # - # - # /lrde/beyrouth/admin/lrde/usr/intel/compiler90/include/c++/xlocale(123): - # remark #383: value copied to temporary, reference to temporary used - # : _Refs(_Initrefs) - # ^ - # - # - # static/tests/any.cc(139): - # remark #424: extra ";" ignored - # }; - # ^ - # - # - # metalic/mlc/cmp.hh(114): - # remark #444: destructor for base class "mlc::bexpr_<false>" is not virtual - # public bexpr_<false> - # ^ - # - # - # olena/tests/morphers/count_rw_morpher.cc(46): - # remark #593: variable "i" was set but never used - # int i = ima2(p); - # ^ - # - # - # extended/xtd/abstract/plain_nary_fun.hh(160): - # remark #810: conversion from "double" to "const float &" may lose - # significant bits - # return this->exact().impl_op(arg); - # ^ - # - # - # /lrde/beyrouth/admin/lrde/usr/intel/compiler90/include/c++/typeinfo(190): - # remark #869: parameter "_object" was never referenced - # const void* _object, - # ^ - # - # - # /lrde/beyrouth/admin/lrde/usr/intel/compiler90/include/c++/xstring(1621): - # remark #981: operands are evaluated in unspecified order - # _Traits::assign(_Myptr()[_Mysize = _Newsize], _Elem()); - # ^ - # - # - # /usr/include/stdlib.h(177): warning #1292: attribute "__nonnull__" ignored - # throw () __attribute__ ((__nonnull__ (1))); - # ^ - # - # - # metalic/tests/gcase.cc(55): - # remark #1418: external definition with no prior declaration - # void print() - # ^ - # - # - # olena/tests/morphers/two_way_rw_morpher.cc(74): - # remark #1572: floating-point equality and inequality comparisons are - # unreliable - # (static_cast<void> ((xtd::L2_norm(ima(p)) = 1) ? 0 : - # ^ - # (__assert_fail ("xtd::L2_norm(ima(p)) = 1", - # "olena/tests/morphers/two_way_rw_morpher.cc", 74, __PRETTY_FUNCTION__), - # 0))); - # - # - # /usr/include/sys/sysmacros.h(44): - # remark #1682: implicit conversion of a 64-bit integral type to a smaller - # integral type (potential portability problem) - # return ((__dev >> 8) & 0xfff) | ((unsigned int) (__dev >> 32) & ~0xfff); - # ^ - # - # - # /usr/include/sys/sysmacros.h(44): - # remark #1683: explicit conversion of a 64-bit integral type to a smaller - # integral type (potential portability problem) - # return ((__dev >> 8) & 0xfff) | ((unsigned int) (__dev >> 32) & ~0xfff); - # ^ - # - # - # Warnings. - # --------- - # - # #61 - located in h++ std lib (=> not our responsibility) - # #68 - located in h++ std lib (=> not our responsibility) - # #161 - located in h++ std lib (=> not our responsibility) - # #239 - located in g++ std lib (=> not our responsibility) - # #592 - fixable (see remark #593) - # #854 - to be looked at closer - # #858 - to be looked at closer - # #1292 - located in gcc std lib - # - # - # /usr/include/c++/4.0.4/limits(529): - # warning #61: integer operation result is out of range - # { return (((wchar_t)(-1) < 0) ? ((wchar_t)1 << (sizeof(wchar_t) * 8 - - # ((wchar_t)(-1) < 0))) - 1 : ~(wchar_t)0); } - # ^ - # - # - # /usr/include/c++/4.0.4/limits(374): - # warning #68: integer conversion resulted in a change of sign - # { return (((char)(-1) < 0) ? (char)1 << (sizeof(char) * 8 - ((char)(-1) - # < 0)) : (char)0); } - # ^ - # - # - # /usr/include/c++/4.0.4/cstdlib(47): - # warning #161: unrecognized #pragma - # #pragma GCC system_header - # - # - # /usr/include/c++/4.0.4/limits(1010): - # warning #239: floating point underflow - # = bool(1.40129846e-45F) ? denorm_present : denorm_absent; - # ^ - # - # - # metalic/tests/gcase.cc(59): - # warning #592: variable "tmp" is used before its value is set - # tmp = tmp; - # ^ - # - # - # extended/xtd/math/arith.hh(37): - # warning #854: const variable "xtd::plus" requires an initializer -- class - # "xtd::m2fun_<xtd::plain_plus_>" has no explicitly declared default - # constructor - # [...] - # - # - # olena/oln/core/internal/tracked_ptr.hh(60): - # warning #858: type qualifier on return type is meaningless - # const T*const operator->() const; - # ^ - # - # - # /usr/include/stdlib.h(146): - # warning #1292: attribute "__nonnull__" ignored - # throw () __attribute__ ((__pure__)) __attribute__ ((__nonnull__ (1))); - # ^ - # - ignored_remarks="279,304,383,424,444,593,810,869,1292,1418,1572,1682,1683" - ignored_warnings="61,68,161,239,592,854,858,1292" - export CXXFLAGS="-wd$ignored_remarks,$ignored_warnings" -} - # Clean up. clean_buildfarm Index: buildfarm_worker/tools.fns --- buildfarm_worker/tools.fns (revision 0) +++ buildfarm_worker/tools.fns (revision 0) @@ -0,0 +1,192 @@ +# Tools. -*- shell-script -*- + +# To be sourced by host files. + + +# INIT_ICC_VARS +# ------------- +# Initialize some environment variables for ICC. +init_icc_vars() +{ + # Disable some (sometimes fallacious) remarks and warnings from icpc. + # All of these remarks make references to Olena 1.0. + # + # Some of these warnings could be disabled from configure when + # the selected C++ compiler is icpc. + # + # + # Remarks. + # -------- + # + # #279 - from icpc stdlib + mlc + # #304 - fixable + # #383 - located in icpc std lib + xtd + # #424 - probably fixable + # #444 - hard to fix IMHO + # #593 - fixable, but probably a lot of places must be changed + # #810 - fixable + # #869 - located in icpc std lib (=> not our responsibility) + # #981 - located in icpc std lib + xtd ; hard to fix without obfuscating. + # #1292 - located in icpc stdlib (=> not our responsibility) + # #1418 - to be looked at closer + # #1572 - fixable (comparisons on float values) + # #1682 - located in system lib (=> not our responsibility) + # #1683 - located in system lib (=> not our responsibility) + # + # + # /lrde/beyrouth/admin/lrde/usr/intel/compiler90/include/c++/xstring(1577): + # remark #279: controlling expression is constant + # : sizeof (_Elem) <= 2 ? 7 + # ^ + # + # + # extended/xtd/cfun.hh(76): + # remark #304: access control not specified ("public" by default) + # struct fun_traits_< plain_cfun_<F> > : fun_traits_<F> + # ^ + # + # + # /lrde/beyrouth/admin/lrde/usr/intel/compiler90/include/c++/xlocale(123): + # remark #383: value copied to temporary, reference to temporary used + # : _Refs(_Initrefs) + # ^ + # + # + # static/tests/any.cc(139): + # remark #424: extra ";" ignored + # }; + # ^ + # + # + # metalic/mlc/cmp.hh(114): + # remark #444: destructor for base class "mlc::bexpr_<false>" is not virtual + # public bexpr_<false> + # ^ + # + # + # olena/tests/morphers/count_rw_morpher.cc(46): + # remark #593: variable "i" was set but never used + # int i = ima2(p); + # ^ + # + # + # extended/xtd/abstract/plain_nary_fun.hh(160): + # remark #810: conversion from "double" to "const float &" may lose + # significant bits + # return this->exact().impl_op(arg); + # ^ + # + # + # /lrde/beyrouth/admin/lrde/usr/intel/compiler90/include/c++/typeinfo(190): + # remark #869: parameter "_object" was never referenced + # const void* _object, + # ^ + # + # + # /lrde/beyrouth/admin/lrde/usr/intel/compiler90/include/c++/xstring(1621): + # remark #981: operands are evaluated in unspecified order + # _Traits::assign(_Myptr()[_Mysize = _Newsize], _Elem()); + # ^ + # + # + # /usr/include/stdlib.h(177): warning #1292: attribute "__nonnull__" ignored + # throw () __attribute__ ((__nonnull__ (1))); + # ^ + # + # + # metalic/tests/gcase.cc(55): + # remark #1418: external definition with no prior declaration + # void print() + # ^ + # + # + # olena/tests/morphers/two_way_rw_morpher.cc(74): + # remark #1572: floating-point equality and inequality comparisons are + # unreliable + # (static_cast<void> ((xtd::L2_norm(ima(p)) = 1) ? 0 : + # ^ + # (__assert_fail ("xtd::L2_norm(ima(p)) = 1", + # "olena/tests/morphers/two_way_rw_morpher.cc", 74, __PRETTY_FUNCTION__), + # 0))); + # + # + # /usr/include/sys/sysmacros.h(44): + # remark #1682: implicit conversion of a 64-bit integral type to a smaller + # integral type (potential portability problem) + # return ((__dev >> 8) & 0xfff) | ((unsigned int) (__dev >> 32) & ~0xfff); + # ^ + # + # + # /usr/include/sys/sysmacros.h(44): + # remark #1683: explicit conversion of a 64-bit integral type to a smaller + # integral type (potential portability problem) + # return ((__dev >> 8) & 0xfff) | ((unsigned int) (__dev >> 32) & ~0xfff); + # ^ + # + # + # Warnings. + # --------- + # + # #61 - located in h++ std lib (=> not our responsibility) + # #68 - located in h++ std lib (=> not our responsibility) + # #161 - located in h++ std lib (=> not our responsibility) + # #239 - located in g++ std lib (=> not our responsibility) + # #592 - fixable (see remark #593) + # #854 - to be looked at closer + # #858 - to be looked at closer + # #1292 - located in gcc std lib + # + # + # /usr/include/c++/4.0.4/limits(529): + # warning #61: integer operation result is out of range + # { return (((wchar_t)(-1) < 0) ? ((wchar_t)1 << (sizeof(wchar_t) * 8 - + # ((wchar_t)(-1) < 0))) - 1 : ~(wchar_t)0); } + # ^ + # + # + # /usr/include/c++/4.0.4/limits(374): + # warning #68: integer conversion resulted in a change of sign + # { return (((char)(-1) < 0) ? (char)1 << (sizeof(char) * 8 - ((char)(-1) + # < 0)) : (char)0); } + # ^ + # + # + # /usr/include/c++/4.0.4/cstdlib(47): + # warning #161: unrecognized #pragma + # #pragma GCC system_header + # + # + # /usr/include/c++/4.0.4/limits(1010): + # warning #239: floating point underflow + # = bool(1.40129846e-45F) ? denorm_present : denorm_absent; + # ^ + # + # + # metalic/tests/gcase.cc(59): + # warning #592: variable "tmp" is used before its value is set + # tmp = tmp; + # ^ + # + # + # extended/xtd/math/arith.hh(37): + # warning #854: const variable "xtd::plus" requires an initializer -- class + # "xtd::m2fun_<xtd::plain_plus_>" has no explicitly declared default + # constructor + # [...] + # + # + # olena/oln/core/internal/tracked_ptr.hh(60): + # warning #858: type qualifier on return type is meaningless + # const T*const operator->() const; + # ^ + # + # + # /usr/include/stdlib.h(146): + # warning #1292: attribute "__nonnull__" ignored + # throw () __attribute__ ((__pure__)) __attribute__ ((__nonnull__ (1))); + # ^ + # + ignored_remarks="279,304,383,424,444,593,810,869,1292,1418,1572,1682,1683" + ignored_warnings="61,68,161,239,592,854,858,1292" + export CXXFLAGS="-wd$ignored_remarks,$ignored_warnings" +} Index: buildfarm_worker/caracas.fns --- buildfarm_worker/caracas.fns (revision 421) +++ buildfarm_worker/caracas.fns (working copy) @@ -1,20 +1,31 @@ # caracas. -*- shell-script -*- -# Used to continuously build Tiger and Vaucanson. -host_type=linux-x86 +# Used to build Tiger (and Vaucanson). + + +host_type=linux-x86/sarge + +# Add ICC (from /lrde/dev) to the PATH. +/lrde/dev/linux-x86/intel/icc9.1/bin/iccvars.sh # Add some programs from /lrde/dev to the PATH. -path_prepend \ - sarge/autoconf-2.60 \ - sarge/automake-1.10 \ - sarge/bison-2.3 \ - intel/icc9.1 +path_prepend autoconf-2.60 automake-1.10 bison-2.3 + +# Tell autoreconf 1.10 where other M4 macros live. +export ACLOCAL='aclocal -I /usr/share/aclocal/' # The ccache dir is located in the /work file system. As ~/.zshenv is # not sourced by the build script, this environment variable is # defined here. export CCACHE_DIR=/work/build/var/ccache +# The setup of ICC is tedious enough to be avoided to build `timelimit'; +# always use GCC for this. +export TIMELIMIT_CC=gcc + + + +# Clean up. clean_buildfarm @@ -53,7 +64,6 @@ # 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 421) +++ buildfarm_worker/generic.fns (working copy) @@ -3,8 +3,8 @@ clean_buildfarm # Use ccache along with GCC. -export CC="export gcc" -export CXX="export g++" +export CC="ccache gcc" +export CXX="ccache g++" test_tree generic-tools test_tree c-tools Index: buildfarm_worker/config.fns --- buildfarm_worker/config.fns (revision 421) +++ buildfarm_worker/config.fns (working copy) @@ -59,7 +59,7 @@ # Olena. # # ------- # - olena:0.10*) + olena:0.10|olena:0.11*) # Pacify Apple's g++. if $(cxx_compiler) --version | grep Apple >/dev/null; then CXXFLAGS=-Wno-long-double

1 0