tree=$1
case "$tree" in
- samba* | rsync | libreplace | talloc | tdb* | ldb | pidl | ccache* | waf*)
+ samba* | rsync | libreplace | talloc | tdb | ntdb | ldb | pidl | ccache* | waf*)
echo "git"
return 0
;;
MMTIME=$MAXTIME
# some trees don't need as much time
case "$tree" in
- rsync | tdb* | talloc | libreplace | ccache* | waf*)
+ rsync | tdb | ntdb | talloc | libreplace | ccache* | waf*)
if [ "$compiler" != "checker" ]; then
MMTIME=`expr $MMTIME / 5`
fi
lorikeet-heimdal*)
lcov --directory $builddir --capture --output-file $builddir/$tree.lcov.info
;;
- samba_3_master*)
- lcov --base-directory $builddir --directory $builddir/.. --capture --output-file $builddir/$tree.lcov.info
- ;;
- samba_4*|tdb*|talloc|ldb|libreplace)
+ samba_4*|tdb|ntdb|talloc|ldb|libreplace)
lcov --base-directory $builddir/bin --directory $builddir/bin --capture --output-file $builddir/$tree.lcov.info
;;
waf)
action_callcatcherreport() {
if [ "$CALLCATCHER_REPORT" = "yes" ]; then
case "$tree" in
- tdb*|talloc|ldb)
+ tdb|ntdb|talloc|ldb)
callanalyse `find $builddir/bin -name \*.so*` $builddir/bin/* > $builddir/coverage/unused-fns.txt
;;
- samba_3_master|samba_4*)
+ samba_4*)
callanalyse `find $builddir/bin -name \*.so*` $builddir/bin/* > $builddir/coverage/all-unused-fns.txt
grep -v -f $srcdir/callcatcher-exceptions.grep $builddir/coverage/all-unused-fns.txt > $builddir/coverage/unused-fns.txt
;;
;;
samba_4*)
sw_config="$config --enable-selftest"
- ;;
- samba_3_master)
- sw_config="$config --enable-selftest"
+ sw_config="$sw_config --with-perl-lib-install-dir=$prefix/perl.lib"
+ sw_config="$sw_config --with-perl-arch-install-dir=$prefix/perl.arch"
;;
samba_3*)
sw_config="$config --enable-socket-wrapper"
old_trees="web popt distcc samba-gtk smb-build lorikeet-heimdal samba_3_2"
old_trees="$old_tree samba_3_2_test samba4 samba_4_0_waf samba_4_0_waf.metze"
- old_trees="$old_tree samba_3_X_test samba_3_X_devel samba_3_X_devel samba_3_waf"
+ old_trees="$old_tree samba_3_X_test samba_3_X_devel samba_3_X_devel samba_3_waf samba_3_master tdb2"
for d in $old_trees; do
delete_old_tree $d
done