- Projects

[LrdeTools] 405: Fix builds using STLPort.
by Roland Levillain 03 Nov '06

03 Nov '06

https://svn.lrde.epita.fr/svn/lrde-tools/trunk/build-farm Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Fix builds using STLPort. * buildfarm_worker/config.fns: Add -pthread to LDFLAGS when compiling with STLPort, for it is also a linker flag. config.fns | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: buildfarm_worker/config.fns --- buildfarm_worker/config.fns (revision 404) +++ buildfarm_worker/config.fns (working copy) @@ -48,7 +48,7 @@ if test -d /usr/include/stlport; then CXXFLAGS="$CXXFLAGS -I/usr/include/stlport" fi - LDFLAGS="-lstlport" + LDFLAGS="-pthread -lstlport" ;; esac

1 0

[LrdeTools] 404: Disable some icpc warnings.
by Roland Levillain 03 Nov '06

03 Nov '06

https://svn.lrde.epita.fr/svn/lrde-tools/trunk/build-farm Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * buildfarm_worker/brasilia.fns (init_icc_vars): Disable some icpc warnings. brasilia.fns | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: buildfarm_worker/brasilia.fns --- buildfarm_worker/brasilia.fns (revision 403) +++ buildfarm_worker/brasilia.fns (working copy) @@ -20,7 +20,8 @@ # ICC 9.0 directory. icc_dir="/lrde/beyrouth/admin/lrde/usr/intel/compiler90" - export CPPFLAGS="-D_LINUX -I$icc_dir/include/c++/" + # BTW, disable some fallacious warnings from icpc. + export CPPFLAGS="-D_LINUX -I$icc_dir/include/c++/ -wd854,858,1292" export LDFLAGS="-cxxlib-icc -i-static" export LD_LIBRARY_PATH="$icc_dir/lib:`printenv LD_LIBRARY_PATH`"

1 0

[LrdeTools] 403: Fix the previous fix (sigh).
by Roland Levillain 02 Nov '06

02 Nov '06

https://svn.lrde.epita.fr/svn/lrde-tools/trunk/build-farm SOM! And thanks to Akim for helping me tracking this bug. Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Fix the previous fix (sigh). * buildfarm_worker/build_test.fns (c_compiler, cxx_compiler): Add missing closing paren. build_test.fns | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) Index: buildfarm_worker/build_test.fns --- buildfarm_worker/build_test.fns (revision 402) +++ buildfarm_worker/build_test.fns (working copy) @@ -40,8 +40,7 @@ # ------------------------- # Check if an environment variable named ENVVAR exists, and print it if so. # Otherwise, print DEFAULT. -build_tool() -{ +build_tool() { envvar="$(printenv $1)" default="$2" if test -n "$envvar"; then @@ -52,8 +51,8 @@ } # C and C++ compilers used. -c_compiler() { echo $(build_tool CC cc; } -cxx_compiler() { echo $(build_tool CXX c++; } +c_compiler() { echo $(build_tool CC cc); } +cxx_compiler() { echo $(build_tool CXX c++); } ############################# @@ -113,9 +112,12 @@ # `-t' option has been removed for this host, to see why this # happens. case "$host" in - istanbul) $RSYNC -q -cz "$src" $RSYNC_HOST::"buildfarm_log/$dst"; ;; - *) $RSYNC -q -ctz "$src" $RSYNC_HOST::"buildfarm_log/$dst"; ;; + istanbul) $RSYNC -q -cz "$src" $RSYNC_HOST::"buildfarm_log/$dst" ;; + *) $RSYNC -q -ctz "$src" $RSYNC_HOST::"buildfarm_log/$dst" ;; esac + + + } ############################ @@ -217,7 +219,7 @@ # check if it was already visited case $visited_deps in - *$package* ) return 0; ;; + *$package*) return 0 ;; esac visited_deps="$visited_deps:$package"

1 0

Re: [Projects] Re: VCS et svn-wrapper
by Roland Levillain 02 Nov '06

02 Nov '06

"Nicolas Pouillard" <nicolas.pouillard(a)gmail.com> writes: > On 10/30/06, Akim Demaille <akim(a)lrde.epita.fr> wrote: >> >>> "Tsuna" == Tsuna <tsuna(a)warszawa.lrde.epita.fr> writes: >> >> > On 2006-10-25, Akim Demaille <akim(a)lrde.epita.fr> wrote: >> >> >> >> Ce serait très cool si on pouvait avoir plus de headers, du genre : >> >> >> >> X-svn-url >> >> X-svn-revision > > C'est fait dans VCS 0.5 beta10 Au fait, existe-t-il un site qui annonce les nouvelles versions de Vcs (voire -- ce serait top -- un flux RSS) ?

2 1

[LrdeTools] 402: Fix send_file().
by Roland Levillain 02 Nov '06

02 Nov '06

https://svn.lrde.epita.fr/svn/lrde-tools/trunk/build-farm Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Fix send_file(). * buildfarm_worker/build_test.fns (send_file): Fix case statement. build_test.fns | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: buildfarm_worker/build_test.fns --- buildfarm_worker/build_test.fns (revision 401) +++ buildfarm_worker/build_test.fns (working copy) @@ -113,8 +113,8 @@ # `-t' option has been removed for this host, to see why this # happens. case "$host" in - istanbul) $RSYNC -q -cz "$src" $RSYNC_HOST::"buildfarm_log/$dst" ;; - *) $RSYNC -q -ctz "$src" $RSYNC_HOST::"buildfarm_log/$dst" ;; + istanbul) $RSYNC -q -cz "$src" $RSYNC_HOST::"buildfarm_log/$dst"; ;; + *) $RSYNC -q -ctz "$src" $RSYNC_HOST::"buildfarm_log/$dst"; ;; esac } @@ -217,7 +217,7 @@ # check if it was already visited case $visited_deps in - *$package* ) return 0 ;; + *$package* ) return 0; ;; esac visited_deps="$visited_deps:$package"

1 0

VCS et svn-wrapper
by Akim Demaille 01 Nov '06

01 Nov '06

Ce serait très cool si on pouvait avoir plus de headers, du genre : X-svn-url X-svn-revision etc. Surtout le premier en fait.

4 6

nolimips 218: Catch up with TC's bison++.
by Roland Levillain 31 Oct '06

31 Oct '06

https://svn.lrde.epita.fr/svn/nolimips/trunk Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Catch up with TC's bison++. * build-aux/bison++.in: Don't take a `dir' argument, use the dirnames of the input and output files. * src/parse/Makefile.am: Adjust bison++ invocation. build-aux/bison++.in | 32 +++++++++++++++++++++----------- src/parse/Makefile.am | 2 +- 2 files changed, 22 insertions(+), 12 deletions(-) Index: src/parse/Makefile.am --- src/parse/Makefile.am (revision 217) +++ src/parse/Makefile.am (working copy) @@ -41,7 +41,7 @@ $(MAKE) $(AM_MAKEFLAGS) $(BISONXX) @rm -rf bison++.stamp.tmp @touch bison++.stamp.tmp - $(BISONXX) $(srcdir) asm-parse.yy asm-parse.cc -d -ra + $(BISONXX) $(srcdir)/asm-parse.yy $(srcdir)/asm-parse.cc -d -ra @mv -f bison++.stamp.tmp $@ # Run bison if a file that can be created by it is missing: Index: build-aux/bison++.in --- build-aux/bison++.in (revision 217) +++ build-aux/bison++.in (working copy) @@ -1,24 +1,28 @@ #! /bin/sh +# Exit status. +status=0 + # Any tool failure is a failure of the script. set -e : ${BISON=@BISON@} -# bison++ SRCDIR INPUT OUTPUT OPTIONS -# ----------------------------------- +# bison++ INPUT OUTPUT OPTIONS +# ---------------------------- me=$(basename $0) move_if_change='@abs_srcdir@/move-if-change' -srcdir=$1 -abs_srcdir=$(cd $srcdir && pwd) -shift input=$1 +input_base=$(basename "$input") shift output=$1 +output_base=$(basename "$output") +output_dir=$(dirname "$output") +output_dir_abs=$(cd "$output_dir" && pwd) shift -options="-d -ra $@" +options="$@" # Alexandre Duret-Lutz also notes that in VPATH-builds $(srcdir) can # be an absolute path depending on how ./configure is called ... @@ -30,30 +34,36 @@ # paths with Bison, chdir there. # A tmp dir. -tmp=$output.dir +tmp=$output_base.dir rm -rf $tmp mkdir $tmp # Compile in this dir. # Don't use `ln -s' as its semantics of paths sucks. -cp $srcdir/$input $tmp +cp $input $tmp cd $tmp -$BISON $options $input -o $output +set +e +$BISON $options $input_base -o $output_base +status=$? +set -e +if test $status = 0; then for file in * do case $file in - $input) + $input_base) # Leave it here. ;; *) # Fix doxygen tags. perl -pi -e "s|\Q\\file $file\E\b|\\\\file parse/$file|g;" "$file" - $move_if_change "$file" "$abs_srcdir/$file" + $move_if_change "$file" "$output_dir_abs/$file" ;; esac done +fi # Get rid of the tmp dir. cd .. rm -rf $tmp +exit $status

1 0

[LrdeTools] 401: New tree: Vaucanson, with GCC 4.0 and STLPort.
by Roland Levillain 31 Oct '06

31 Oct '06

https://svn.lrde.epita.fr/svn/lrde-tools/trunk/build-farm Currently, this build is only performed on brasilia (with STLPort 5.1). Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> New tree: Vaucanson, with GCC 4.0 and STLPort. * buildfarm_worker/brasilia.fns: Add a new tree, vaucanson-gcc4.0-stlport. * buildfarm_worker/package.fns (conf_vaucanson_gcc4_0_stlport): New. * buildfarm_worker/config.fns: Handle Vaucanson and STLPort. * web/build.pl: Add vaucanson-gcc4.0-stlport. buildfarm_worker/brasilia.fns | 7 +++++++ buildfarm_worker/config.fns | 23 +++++++++++++++++++++++ buildfarm_worker/package.fns | 1 + web/build.pl | 1 + 4 files changed, 32 insertions(+) Index: web/build.pl --- web/build.pl (revision 400) +++ web/build.pl (working copy) @@ -79,6 +79,7 @@ '---', 'vaucanson', 'vaucanson-gcc4.0', + 'vaucanson-gcc4.0-stlport', 'vaucanson-icc', '---', 'olena-0.10a', Index: buildfarm_worker/package.fns --- buildfarm_worker/package.fns (revision 400) +++ buildfarm_worker/package.fns (working copy) @@ -82,6 +82,7 @@ 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; } Index: buildfarm_worker/config.fns --- buildfarm_worker/config.fns (revision 400) +++ buildfarm_worker/config.fns (working copy) @@ -32,6 +32,29 @@ : ${enable_shared=yes} ;; + + # ----------- # + # Vaucanson. # + # ----------- # + + vaucanson:*) + case $srcdir in + + # STLPort settings. + # FIXME: As soon as a library compiled with _STLP_DEBUG turned on is + # available, use it. + *stlport*) + CXXFLAGS="-pthread" + if test -d /usr/include/stlport; then + CXXFLAGS="$CXXFLAGS -I/usr/include/stlport" + fi + LDFLAGS="-lstlport" + ;; + + esac + ;; + + # ------- # # Olena. # # ------- # Index: buildfarm_worker/brasilia.fns --- buildfarm_worker/brasilia.fns (revision 400) +++ buildfarm_worker/brasilia.fns (working copy) @@ -68,6 +68,13 @@ ) ( + export CC="ccache gcc-4.0" + export CXX="ccache g++-4.0" + test_tree vaucanson-gcc4.0-stlport \ + bootstrap configure build check demos install distcheck +) + +( export CC="ccache icc" export CXX="ccache icpc" init_icc_vars

1 0

[LrdeTools] 400: Start to use CONFIG_SITE.
by Roland Levillain 30 Oct '06

30 Oct '06

https://svn.lrde.epita.fr/svn/lrde-tools/trunk/build-farm Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Start to use CONFIG_SITE. * buildfarm_worker/build_test.fns (build_tool): New function. (c_compiler, cxx_compiler): New functions. Use them to simplify... (action_system): ...this action. (CONFIG_SITE): Set this environment variable to "$bf_root/config.fns". * buildfarm_worker/config.fns: New. * buildfarm_worker/antalya.fns, buildfarm_worker/pau.fns: Don't set host_config nor DISTCHECK_CONFIGURE_FLAGS, since CONFIG_SITE handles configuration settings. antalya.fns | 6 ------ build_test.fns | 33 ++++++++++++++++++++++----------- config.fns | 46 ++++++++++++++++++++++++++++++++++++++++++++++ pau.fns | 3 --- 4 files changed, 68 insertions(+), 20 deletions(-) Index: buildfarm_worker/build_test.fns --- buildfarm_worker/build_test.fns (revision 399) +++ buildfarm_worker/build_test.fns (working copy) @@ -36,6 +36,25 @@ done } +# BUILD_TOOL ENVVAR DEFAULT +# ------------------------- +# Check if an environment variable named ENVVAR exists, and print it if so. +# Otherwise, print DEFAULT. +build_tool() +{ + envvar="$(printenv $1)" + default="$2" + if test -n "$envvar"; then + echo $envvar + else + echo $default + fi +} + +# C and C++ compilers used. +c_compiler() { echo $(build_tool CC cc; } +cxx_compiler() { echo $(build_tool CXX c++; } + ############################# # build a signature of a tree, used to see if we @@ -308,18 +327,8 @@ . $bf_root/system.fns echo - # C and C++ compilers used. - c_compiler="$CC" - if test -z "$c_compiler"; then - c_compiler=cc - fi - cxx_compiler="$CXX" - if test -z "$cxx_compiler"; then - cxx_compiler=c++ - fi - # print some programs version. Too late, it was asked. - SHOW_VERSION="$c_compiler --version:$cxx_compiler --version:autoconf --version:automake --version:make --version:libtool --version:ld --version:$PRG_VERSION" + SHOW_VERSION="$(c_compiler) --version:$(cxx_compiler) --version:autoconf --version:automake --version:make --version:libtool --version:ld --version:$PRG_VERSION" old_IFS=$IFS IFS=":" @@ -668,6 +677,8 @@ build_root=`pwd`/build prefix_root=`pwd`/prefix bf_root=`pwd` +# Configuration site defaults. +export CONFIG_SITE="$bf_root/config.fns" $RSYNC -q -az $RSYNC_HOST::buildfarm_worker/*.c . Index: buildfarm_worker/config.fns --- buildfarm_worker/config.fns (revision 0) +++ buildfarm_worker/config.fns (revision 0) @@ -0,0 +1,46 @@ +# Configuration site defaults. -*- shell-script -*- + +echo "Loading config.site for $PACKAGE_TARNAME on $host" +echo "(srcdir: $srcdir)" +echo + +package=$PACKAGE_TARNAME +version=$PACKAGE_VERSION + +echo "----------------------------------------------------------------------" +echo "config.site: $package $version" +echo "----------------------------------------------------------------------" + + +case $package:$version in + + # ------- # + # Tiger. # + # ------- # + + tc:*) + # Help configure to find the Boost libraries... + # ...on Mac OS X (in Fink). + if test -f /sw/include/boost-1_32/boost/config.hpp; then + with_boost=/sw/include/boost-1_32 + # ...on Cygwin. + elif test -f /usr/include/boost-1_33/boost/config.hpp; then + with_boost=/usr/include/boost-1_33 + fi + + # Enable shared libraries and TCSH. + : ${enable_shared=yes} + ;; + + # ------- # + # Olena. # + # ------- # + + olena:0.10*) + # Pacify Apple's g++. + if $(cxx_compiler) --version | grep Apple >/dev/null; then + CXXFLAGS=-Wno-long-double + fi + ;; + +esac Index: buildfarm_worker/pau.fns --- buildfarm_worker/pau.fns (revision 399) +++ buildfarm_worker/pau.fns (working copy) @@ -21,10 +21,7 @@ test_tree nolimips test_tree monoburg test_tree clspr -# Boost headers. -host_config="--with-boost=/usr/include/boost-1_33" test_tree tc configure build distcheck -host_config="" test_tree vaucanson Index: buildfarm_worker/antalya.fns --- buildfarm_worker/antalya.fns (revision 399) +++ buildfarm_worker/antalya.fns (working copy) @@ -48,13 +48,7 @@ test_tree monoburg test_tree clspr -# FIXME: Is this the best way to set DISTCHECK_CONFIGURE_FLAGS? -# Anyway, we want to use CONFIG_SITE. -host_config="--with-boost=/sw/include" -export DISTCHECK_CONFIGURE_FLAGS="$host_config" test_tree tc configure build distcheck -unset DISTCHECK_CONFIGURE_FLAGS -host_config="" # ----------- #

1 0

[LrdeTools] 399: Attempt to work around istanbul's strange behavior w.r.t. time stamps.
by Roland Levillain 30 Oct '06

30 Oct '06

https://svn.lrde.epita.fr/svn/lrde-tools/trunk/build-farm Weird time stamps sometimes appear on istanbul: istanbul /work/build/build_farm % ls -lt | tail -20 11:22 #225 -rw-r--r-- 1 doc lrde 820 Sep 1 17:30 pau.fns -rw-r--r-- 1 doc lrde 411 Sep 1 17:29 generic.fns -rw-r--r-- 1 doc lrde 2 Oct 20 2005 clean.cache -rw-r--r-- 1 doc lrde 2 Oct 20 2005 clean.cache.old -rwxr-xr-x 1 doc lrde 524 Oct 20 2005 make_wrapper.fns* -rw-r--r-- 1 doc lrde 1099 Oct 20 2005 timelimit.c -rw-r--r-- 1 doc lrde 215271 Jan 1 1970 build.clspr.istanbul.21-10_20-47.log -rw-r--r-- 1 doc lrde 37 Jan 1 1970 build.clspr.istanbul.log -rw-r--r-- 1 doc lrde 95182 Jan 1 1970 build.ddd.istanbul.21-10_22-42.log -rw-r--r-- 1 doc lrde 35 Jan 1 1970 build.ddd.istanbul.log -rw-r--r-- 1 doc lrde 61082 Jan 1 1970 build.havm.istanbul.21-10_20-05.log -rw-r--r-- 1 doc lrde 36 Jan 1 1970 build.havm.istanbul.log -rw-r--r-- 1 doc lrde 65132 Jan 1 1970 build.monoburg.istanbul.21-10_20-45.log -rw-r--r-- 1 doc lrde 40 Jan 1 1970 build.monoburg.istanbul.log -rw-r--r-- 1 doc lrde 378127 Jan 1 1970 build.nolimips.istanbul.21-10_20-12.log -rw-r--r-- 1 doc lrde 40 Jan 1 1970 build.nolimips.istanbul.log -rw-r--r-- 1 doc lrde 159009 Jan 1 1970 build.ranch.istanbul.21-10_22-37.log -rw-r--r-- 1 doc lrde 37 Jan 1 1970 build.ranch.istanbul.log -rw-r--r-- 1 doc lrde 1167295 Jan 1 1970 build.tc.istanbul.21-10_20-53.log -rw-r--r-- 1 doc lrde 34 Jan 1 1970 build.tc.istanbul.log I don't known where it comes from, but istanbul is the only host showing of this behavior. Any idea? Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Attempt to work around istanbul's strange behavior w.r.t. time stamps. * buildfarm_worker/build_test.fns: Don't use rsync's `-t' option on istanbul, since its time stamps tends to be nonsensical. build_test.fns | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) Index: buildfarm_worker/build_test.fns --- buildfarm_worker/build_test.fns (revision 398) +++ buildfarm_worker/build_test.fns (working copy) @@ -89,7 +89,14 @@ [ "x$dst" = "x" ] && dst="$src" touch "$src" chmod 0644 "$src" - $RSYNC -q -ctz "$src" $RSYNC_HOST::"buildfarm_log/$dst" + # FIXME: Inexplicably, time stamps (mtime) are sometimes set to + # Jan. 1st, 1970 on istanbul (Debian GNU/Linux on Sparc64). Rsync's + # `-t' option has been removed for this host, to see why this + # happens. + case "$host" in + istanbul) $RSYNC -q -cz "$src" $RSYNC_HOST::"buildfarm_log/$dst" ;; + *) $RSYNC -q -ctz "$src" $RSYNC_HOST::"buildfarm_log/$dst" ;; + esac } ############################

1 0