We now use Nix from /lde/dev/<arch>/nix instead of maintaining our copy of Stratego/XT. 2006-08-17 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; Revamp Transformers integration. No longer manage Stratego/XT nor GNU Bison, as they are now provided by the /lrde/dev/ shared filesystem). * maintainer/packages: Remove contract-c, cxx-grammar, esdf, boxedsdf, sdf-astgen, sdf-attribute, sdf-detgen, sdf-option, str-lazy, cxx-basic, specs-grammar. Add transformers, generic-tools, c-tools, cxx-tools. No longer use a Subversion revision tag. * maintainer/update_unpacked (SVN_PACKAGES): No longer handle a Subversion revision parameter. * buildfarm_worker/package.fns (conf_aterm-2_4_2, conf_sdf2-2_3_3) (conf_strategoxt-0_16): Remove functions. (conf_esdf, conf_sdf-option, conf_sdf-astgen, conf_str-lazy) (conf_boxedsdf, conf_sdf-detgen, conf_sdf-attribute) (conf_c-grammar, conf_contract-c, conf_cxx-grammar) (conf_cxx-basic, conf_specs-grammar): Likewise. (conf_generic-tools, conf_c-tools, conf_cxx-tools): New functions. (conf_transformers): Adjust. (conf_nolimips, conf_tc-maintainer, conf_tc): Don't depend on bison. (after_check_packages_hook): Empty this function. * buildfarm_worker/caracas.fns, buildfarm_worker/marvejols.fns, * buildfarm_worker/istanbul.fns, buildfarm_worker/pau.fns, * buildfarm_worker/antalya.fns Adjust PATH. Remove Stratego/XT and old Transformers packages as well as GNU Bison from the tested projects. * web/build.pl: Adjust Transformers' items. Remove Bison. Index: maintainer/update_unpacked =================================================================== --- maintainer/update_unpacked (revision 296) +++ maintainer/update_unpacked (revision 297) @@ -1,18 +1,15 @@ #! /bin/bash -# -# update svn working copies of rsync's unpacked directory. -# +# Update svn working copies of rsync's unpacked directory. + SVN_PATH="/work/master/unpacked" -# List of packages with the corresponding URL. If the line ends with -# an `R', the package needs a svn-revision file containing the latest -# svn revision (historical dep from nix.) +# List of packages with the corresponding URL. SVN_PACKAGES="/work/master/maintainer/packages" ( cd "$SVN_PATH" - while read package url svn_rev_p; do + while read package url; do echo $package # Extract a fresh copy of the project. @@ -22,10 +19,5 @@ mv -f "$package.new" "$package" rm -rf "$package.old" - # Create a svn-revision file if needed. - if test "x$svn_rev_p" == xR; then - svn status -v -N -q "$package" | \ - awk "{ if (\$NF == \"$package\") print \$1 }" >"$package/svn-revision" - fi done < $SVN_PACKAGES ) Index: maintainer/packages =================================================================== --- maintainer/packages (revision 296) +++ maintainer/packages (revision 297) @@ -1,16 +1,7 @@ -c-grammar https://svn.lrde.epita.fr/svn/transformers/trunk/c-grammar R -contract-c https://svn/svn/transformers/trunk/contract-c R -cxx-grammar https://svn.lrde.epita.fr/svn/transformers/trunk/cxx-grammar R -esdf https://svn.lrde.epita.fr/svn/transformers/trunk/esdf R -boxedsdf https://svn.lrde.epita.fr/svn/transformers/trunk/boxedsdf R -sdf-astgen https://svn.lrde.epita.fr/svn/transformers/trunk/sdf-astgen R -sdf-attribute https://svn.lrde.epita.fr/svn/transformers/trunk/sdf-attribute R -sdf-detgen https://svn.lrde.epita.fr/svn/transformers/trunk/sdf-detgen R -sdf-option https://svn.lrde.epita.fr/svn/transformers/trunk/sdf-option R -str-lazy https://svn.lrde.epita.fr/svn/transformers/trunk/str-lazy R -cxx-basic https://svn.lrde.epita.fr/svn/transformers/trunk/cxx-basic R -specs-grammar https://svn/svn/transformers/trunk/specs-grammar R -transformers https://svn.lrde.epita.fr/svn/transformers/trunk R +transformers https://svn.lrde.epita.fr/svn/transformers/trunk +generic-tools https://svn.lrde.epita.fr/svn/transformers/trunk/generic-tools +c-tools https://svn.lrde.epita.fr/svn/transformers/trunk/c-tools +cxx-tools https://svn.lrde.epita.fr/svn/transformers/trunk/cxx-tools vaucanson https://svn.lrde.epita.fr/svn/vaucanson/trunk tc-maintainer https://svn.lrde.epita.fr/svn/tc/trunk/tc clsp https://svn.lrde.epita.fr/svn/tc/trunk/c++-libtool-swig-python Index: web/build.pl =================================================================== --- web/build.pl (revision 296) +++ web/build.pl (revision 297) @@ -53,8 +53,7 @@ my @hosts = sort { $hosts{$a} cmp $hosts{$b} } keys %hosts; my (@categories) = - ('Stratego/XT 0.16', - 'Transformers', + ('Transformers', 'Tiger', 'Vaucanson', 'Lrde-tools', @@ -63,29 +62,15 @@ my (@trees_cat) = ('---', - 'aterm-2.4.2', - 'sdf2-2.3.3', - 'strategoxt-0.16', - '---', - 'esdf', - 'sdf-option', - 'sdf-astgen', - 'str-lazy', - 'boxedsdf', - 'sdf-detgen', - 'sdf-attribute', - 'c-grammar', - 'contract-c', - 'cxx-grammar', - 'cxx-basic', - 'specs-grammar', + 'generic-tools', + 'c-tools', + 'cxx-tools', 'transformers', '---', 'havm', 'nolimips', 'monoburg', 'clsp', - 'bison', 'tc-maintainer', 'tc', '---', Index: buildfarm_worker/package.fns =================================================================== --- buildfarm_worker/package.fns (revision 296) +++ buildfarm_worker/package.fns (revision 297) @@ -11,88 +11,26 @@ ############################# # per package configuration -conf_aterm-2_4_2() { - dep_pkgconfig="$prefix_root/aterm-2.4.2/lib/pkgconfig" -} -conf_sdf2-2_3_3() { - deps="aterm-2.4.2" - dep_pkgconfig="$prefix_root/sdf2-2.3.3/lib/pkgconfig" +# +# Transformers. +# - # pffffff, i'm tired - no_separate_build=true +conf_generic-tools() { +# no_separate_build=true } -conf_strategoxt-0_16() { - deps="sdf2-2.3.3" - dep_pkgconfig="$prefix_root/strategoxt-0.16/lib/pkgconfig" - PATH="$prefix_root/strategoxt-0.16/bin:$PATH" - - # grrrr - no_separate_build=true +conf_c-tools() { + deps="generic-tools" } -conf_esdf() { - deps="strategoxt-0.16" - dep_pkgconfig="$prefix_root/esdf/lib/pkgconfig" +conf_cxx-tools() { + deps="generic-tools" } -conf_sdf-option() { - deps="strategoxt-0.16" - dep_pkgconfig="$prefix_root/sdf-option/lib/pkgconfig" -} - -conf_sdf-astgen() { - deps="strategoxt-0.16" - dep_pkgconfig="$prefix_root/sdf-astgen/lib/pkgconfig" -} - -conf_str-lazy() { - deps="strategoxt-0.16" - dep_pkgconfig="$prefix_root/str-lazy/lib/pkgconfig" -} - -conf_boxedsdf() { - deps="esdf" - dep_pkgconfig="$prefix_root/boxedsdf/lib/pkgconfig" -} - -conf_sdf-detgen() { - deps="esdf boxedsdf" - dep_pkgconfig="$prefix_root/sdf-detgen/lib/pkgconfig" -} - -conf_sdf-attribute() { - deps="str-lazy esdf sdf-detgen" - dep_pkgconfig="$prefix_root/sdf-attribute/lib/pkgconfig" -} - -conf_c-grammar() { - deps="str-lazy boxedsdf sdf-detgen esdf sdf-attribute" - dep_pkgconfig="$prefix_root/c-grammar/lib/pkgconfig" -} - -conf_contract-c() { - deps="c-grammar" - dep_pkgconfig="$prefix_root/contract-c/lib/pkgconfig" -} - -conf_cxx-grammar() { - deps="str-lazy sdf-option boxedsdf sdf-detgen esdf sdf-astgen sdf-attribute" - dep_pkgconfig="$prefix_root/cxx-grammar/lib/pkgconfig" -} - -conf_cxx-basic() { - deps="cxx-grammar" -} - -conf_specs-grammar() { - deps="cxx-grammar sdf-astgen" -} - # THE golden target :) conf_transformers() { - deps="cxx-basic specs-grammar cxx-grammar c-grammar contract-c" + deps="generic-tools c-tools cxx-tools" } @@ -104,7 +42,6 @@ } conf_nolimips() { - deps="bison" prg_version="bison --version:python -V" } @@ -121,14 +58,14 @@ } conf_tc-maintainer() { - deps="monoburg bison" + deps="monoburg" prg_version="bison --version:swig -version:python -V:tc --version" self_config="--enable-shared" distcheck_config="$self_config" } conf_tc() { - deps="monoburg bison" + deps="monoburg" prg_version="bison --version:swig -version:python -V:tc --version" self_config="--enable-shared" distcheck_config="$self_config" @@ -152,9 +89,5 @@ # WARNING: hope you know what you are doing ! after_check_packages_hook() { tree=$1 - case $tree in - transformers) - PKG_CONFIG_PATH="$prefix_root/strategoxt/lib/pkgconfig" - ;; - esac + # Nothing. } Index: buildfarm_worker/caracas.fns =================================================================== --- buildfarm_worker/caracas.fns (revision 296) +++ buildfarm_worker/caracas.fns (revision 297) @@ -1,13 +1,16 @@ # caracas # used to continuously build tiger+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 test_tree havm test_tree nolimips test_tree monoburg test_tree clsp -test_tree bison configure build install test_tree tc-maintainer CXX=g++-3.4 Index: buildfarm_worker/marvejols.fns =================================================================== --- buildfarm_worker/marvejols.fns (revision 296) +++ buildfarm_worker/marvejols.fns (revision 297) @@ -1,28 +1,20 @@ +# Add Nix binaries to the path. +export PATH="/home/build/.nix-profile/bin:$PATH" +# 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 -test_tree aterm-2.4.2 configure build install -test_tree sdf2-2.3.3 configure build install -test_tree strategoxt-0.16 configure build install +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 specs-grammar - test_tree havm test_tree nolimips test_tree monoburg test_tree clsp -test_tree bison test_tree transformers Index: buildfarm_worker/istanbul.fns =================================================================== --- buildfarm_worker/istanbul.fns (revision 296) +++ buildfarm_worker/istanbul.fns (revision 297) @@ -1,6 +1,8 @@ +# 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 CCACHE_DIR="/var/tmp/build_farm/.ccache" -# /usr/local/bin is where bison 2.0 resides on istanbul. -export PATH=/usr/local/bin:$PATH clean_buildfarm @@ -8,7 +10,6 @@ test_tree nolimips test_tree monoburg test_tree clsp -test_tree bison configure build install distcheck test_tree tc configure build distcheck # not enough memory on this computer to run vaucanson :/ Index: buildfarm_worker/pau.fns =================================================================== --- buildfarm_worker/pau.fns (revision 296) +++ buildfarm_worker/pau.fns (revision 297) @@ -3,35 +3,21 @@ export ACLOCAL="aclocal -I /usr/share/aclocal" # Path. # 1. /usr/local/bin is where bison 2.0 resides on pau. -# 2. GHC's bin dir is after /bin, sinece we don't want to use it's `ar' -# program, but Cywin's one. +# 2. GHC's bin dir is after /bin, since we don't want to use it's `ar' +# program, but Cygwin's one. export PATH=/usr/local/bin:/bin:/cygdrive/c/ghc/ghc-6.4/bin:$PATH clean_buildfarm -test_tree aterm configure build install -test_tree sdf2 configure build install -test_tree strategoxt configure build install +#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 specs-grammar -test_tree transformers - test_tree havm test_tree nolimips test_tree monoburg test_tree clsp -test_tree bison configure build install distcheck # Boost headers. host_config="--with-boost=/usr/include/boost-1_33" test_tree tc configure build distcheck Index: buildfarm_worker/antalya.fns =================================================================== --- buildfarm_worker/antalya.fns (revision 296) +++ buildfarm_worker/antalya.fns (revision 297) @@ -1,31 +1,36 @@ 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" +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/swig-1.3.29/bin:$PATH" + export CCACHE_DIR="/var/tmp/build_farm/.ccache" clean_buildfarm -test_tree aterm configure build install -test_tree sdf2 configure build install -test_tree strategoxt configure build install +#test_tree aterm configure build install +#test_tree sdf2 configure build install +#test_tree strategoxt configure build install -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 specs-grammar -#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 specs-grammar +##test_tree transformers test_tree havm test_tree nolimips test_tree monoburg test_tree clsp -test_tree bison configure build install distcheck host_config="--with-boost=/sw/include" export DISTCHECK_CONFIGURE_FLAGS=$host_config