https://svn.lrde.epita.fr/svn/lrde-tools/trunk/build-farm
Index: ChangeLog
from Roland Levillain <roland(a)lrde.epita.fr>
Force the rebuild of Olena 0.10a.
* buildfarm_worker/brasilia.fns: Remove the checksum of
Olena 0.10a to always force the build.
brasilia.fns | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
Index: buildfarm_worker/brasilia.fns
--- buildfarm_worker/brasilia.fns (revision 374)
+++ buildfarm_worker/brasilia.fns (working copy)
@@ -106,6 +106,9 @@
)
}
+
+# Olena 0.10a.
+
# ACTION_FETCH_OLN_FROM_PRCS
# --------------------------
# An additional action to fetch Olena O.10a from beyrouth's PRCS
@@ -125,13 +128,16 @@
)
}
-# Olena 0.10a.
+# FIXME: As the working copy of Olena 0.10a is always empty on
+# goa, we need to always force the build by removing its checksum.
+rm -f build.olena-0.10a.sum
# FIXME: Augment maintainer/update_unpacked with the ability to fetch
# copies from the PRCS repository instead of using the dedicated
# action `fetch_oln_from_prcs'.
test_tree olena-0.10a \
fetch_oln_from_prcs bootstrap configure build check install distcheck
+
# Olena proto-1.0.
test_olena_tree olena-proto-1.0 g++-3.4
test_olena_tree olena-proto-1.0 g++-4.0
https://svn.lrde.epita.fr/svn/lrde-tools/trunk/build-farm
Index: ChangeLog
from Roland Levillain <roland(a)lrde.epita.fr>
Let brasilia fetch Olena 0.10a's source tree, since goa cannnot.
* buildfarm_worker/brasilia.fns (action_fetch_oln_from_prcs): New
function.
Use `fetch_oln_from_prcs' as the first action when testing
olena-0.10a.
brasilia.fns | 25 ++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
Index: buildfarm_worker/brasilia.fns
--- buildfarm_worker/brasilia.fns (revision 372)
+++ buildfarm_worker/brasilia.fns (working copy)
@@ -106,10 +106,29 @@
)
}
+# ACTION_FETCH_OLN_FROM_PRCS
+# --------------------------
+# An additional action to fetch Olena O.10a from beyrouth's PRCS
+# repository.
+#
+# Any tested source tree is normally populated on goa, and fetched from
+# this machine; but the PRCS repository, where Olena 0.10a lies, is not
+# accessible from goa -- but brasilia can! Hence this function,
+# triggered as an action by test_tree() before the boostraping of the
+# source tree.
+action_fetch_oln_from_prcs()
+{
+ (
+ export PRCS_REPOSITORY=~prcs/repository
+ prcs checkout oln
+ )
+}
+
# Olena 0.10a.
-# FIXME: The PRCS repository is not accessible from goa; hence updates of
-# the master working copy have to be performed by hand! :(
-test_tree olena-0.10a
+# FIXME: Augment maintainer/update_unpacked with the ability to fetch
+# copies from the PRCS repository instead of using the dedicated
+# action `fetch_oln_from_prcs'.
+test_tree olena-0.10a fetch_oln_from_prcs bootstrap configure build check install distcheck
# Olena proto-1.0.
test_olena_tree olena-proto-1.0 g++-3.4
https://svn.lrde.epita.fr/svn/lrde-tools/trunk/build-farm
Index: ChangeLog
from Roland Levillain <roland(a)lrde.epita.fr>
Adjust brasilia.fns for the user `doc'.
* buildfarm_worker/brasilia.fns (init_icc_vars): No longer set
CXXFLAGS.
s,$HOME/bin,/work/build/bin-icc,.
brasilia.fns | 32 ++++++++++++++++++++------------
1 file changed, 20 insertions(+), 12 deletions(-)
Index: buildfarm_worker/brasilia.fns
--- buildfarm_worker/brasilia.fns (revision 368)
+++ buildfarm_worker/brasilia.fns (working copy)
@@ -1,5 +1,7 @@
# brasilia. -*- shell-script -*-
+# Used to compile Olena and Vaucanson.
+
# The ccache dir is located in the /work file system on brasilia. As
# ~/.zshenv is not sourced by the build script, this environment
# variable is defined here.
@@ -9,6 +11,7 @@
# always use GCC for this.
export TIMELIMIT_CC=gcc
+
# INIT_ICC_VARS
# -------------
# Initialize ICC environment variables.
@@ -16,22 +19,27 @@
{
# ICC 9.0 directory.
icc_dir="/lrde/beyrouth/admin/lrde/usr/intel/compiler90"
- # 2006-09-05: ICC 9.0 cannot work with GCC 4.1 installed on the
+
+ 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`"
+
+ # The directory /work/build/bin-icc contains replacement wrappers for
+ # icc and icpc, because the installation of ICC on the lrde account
+ # is broken since the reorganization of the accounts (the lrde
+ # account has been moved from /home/lrde/admin/lrde to
+ # /lrde/beyrouth/admin/lrde).
+ #
+ #
+ # Moreover, ICC 9.0 cannot work with GCC 4.1 installed on the
# same host. icpc reports this error:
#
# Command-line error: invalid GNU version number: 412
#
- # So, force ICC to consider GCC 4.0 as the default GCC.
- export CXXFLAGS="-gcc-name=gcc-4.0"
- # 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`"
- # The directory ~/bin contains replacement wrappers for icc and icpc,
- # because the installation of ICC on the lrde account is broken since
- # the reorganization of the accounts (the lrde account has been moved
- # from /home/lrde/admin/lrde to /lrde/beyrouth/admin/lrde).
- export PATH="$HOME/bin:$icc_dir/bin:$PATH"
+ # Yet GCC 4.1 is the default version of GCC on brasilia. So,
+ # /work/build/bin-icc also contains symlinks for gcc and g++
+ # pointing to the version 4.0 of the GNU C and C++ compilers.
+ export PATH="/work/build/bin-icc:$icc_dir/bin:$PATH"
}
https://svn.lrde.epita.fr/svn/lrde-tools/trunk/build-farm
Index: ChangeLog
from Roland Levillain <roland(a)lrde.epita.fr>
Fix the building of timelimit when using ICC.
* buildfarm_worker/brasilia.fns (TIMELIMIT_CC): Set envvar to gcc.
* buildfarm_worker/build_test.fns (action_system): Use it when non
null.
brasilia.fns | 4 ++++
build_test.fns | 8 +++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
Index: buildfarm_worker/build_test.fns
--- buildfarm_worker/build_test.fns (revision 367)
+++ buildfarm_worker/build_test.fns (working copy)
@@ -301,9 +301,14 @@
;;
esac
+ # FIXME: Couldn't we avoid building `timelimit' each time?
echo "Building timelimit"
# Choose the C compiler used to build `timelimit'.
- if test -n "$CC"; then
+ if test -n "$TIMELIMIT_CC"; then
+ # Use a compiler specified by the user to build timelimit.
+ timelimit_CC="$TIMELIMIT_CC"
+ elif test -n "$CC"; then
+ # Use the chosen C compiler.
timelimit_CC="$CC"
else
# Use the default C compiler.
@@ -315,6 +320,7 @@
echo "SYSTEM STATUS: 1"
return 1
fi
+ unset timelimit_CC
return 0
}
Index: buildfarm_worker/brasilia.fns
--- buildfarm_worker/brasilia.fns (revision 367)
+++ buildfarm_worker/brasilia.fns (working copy)
@@ -5,6 +5,10 @@
# variable is defined here.
export CCACHE_DIR=/work/build/var/ccache
+# The setup of ICC is enough tedious to avoid it to build `timelimit';
+# always use GCC for this.
+export TIMELIMIT_CC=gcc
+
# INIT_ICC_VARS
# -------------
# Initialize ICC environment variables.
https://svn.lrde.epita.fr/svn/lrde-tools/trunk/build-farm
Index: ChangeLog
from Roland Levillain <roland(a)lrde.epita.fr>
Change ccache settings on brasilia and caracas.
* buildfarm_worker/brasilia.fns (CCACHE_DIR): Set to
/work/build/var/ccache.
* buildfarm_worker/caracas.fns: Likewise.
* Makefile (status): New target.
(.PHONY): Add status.
Makefile | 8 +++++++-
buildfarm_worker/brasilia.fns | 6 +++---
buildfarm_worker/caracas.fns | 5 +++++
3 files changed, 15 insertions(+), 4 deletions(-)
Index: Makefile
--- Makefile (revision 366)
+++ Makefile (working copy)
@@ -4,4 +4,10 @@
'cd /work/master && \
svn up'
-.PHONY : update
+# Check the status of the master's (goa's) copy.
+status:
+ ssh pm@goa \
+ 'cd /work/master && \
+ svn status'
+
+.PHONY : update status
Index: buildfarm_worker/caracas.fns
--- buildfarm_worker/caracas.fns (revision 366)
+++ buildfarm_worker/caracas.fns (working copy)
@@ -2,6 +2,11 @@
# Used to continuously build Tiger and Vaucanson.
+# The ccache dir is located in the /work file system on caracas. As
+# ~/.zshenv is not sourced by the build script, this environment
+# variable is defined here.
+export CCACHE_DIR=/work/build/var/ccache
+
# 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"
Index: buildfarm_worker/brasilia.fns
--- buildfarm_worker/brasilia.fns (revision 366)
+++ buildfarm_worker/brasilia.fns (working copy)
@@ -1,9 +1,9 @@
# brasilia. -*- shell-script -*-
# The ccache dir is located in the /work file system on brasilia. As
-# ~/.zshenv is not sourced by the build script, this environment var
-# is defined here too.
-export CCACHE_DIR=/work/build/ccache
+# ~/.zshenv is not sourced by the build script, this environment
+# variable is defined here.
+export CCACHE_DIR=/work/build/var/ccache
# INIT_ICC_VARS
# -------------