[SCM] build.samba.org - branch master updated
Andrew Bartlett
abartlet at samba.org
Fri Oct 7 03:25:27 MDT 2011
The branch, master has been updated
via 01a3d51 now that samba_3_waf is just a regular part of the build, remove seperate tree
from 0c5ef6c update location of upstream waf tree
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 01a3d51024f13d6b4b92899910950e7301bfec18
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Oct 7 20:23:17 2011 +1100
now that samba_3_waf is just a regular part of the build, remove seperate tree
-----------------------------------------------------------------------
Summary of changes:
SerNet-IRIX.fns | 1 -
SerNet-Tru64.fns | 1 -
SerNet-aix.fns | 1 -
SerNet-solaris8.fns | 1 -
build_test.fns | 11 +----------
charis.fns | 1 -
fjall.fns | 1 -
generic.fns | 1 -
gwen.fns | 1 -
hape.fns | 1 -
m104.fns | 1 -
magni.fns | 1 -
opi.fns | 1 -
qnx18.fns | 1 -
sunX.fns | 1 -
web/trees.conf | 6 ------
16 files changed, 1 insertions(+), 30 deletions(-)
Changeset truncated at 500 lines:
diff --git a/SerNet-IRIX.fns b/SerNet-IRIX.fns
index 1a4d7b4..9475898 100644
--- a/SerNet-IRIX.fns
+++ b/SerNet-IRIX.fns
@@ -20,7 +20,6 @@ for compiler in $compilers; do
test_tree samba_3_current source3 $compiler
test_tree samba_3_next source3 $compiler
test_tree samba_3_master source3 $compiler
- test_tree samba_3_waf source3 $compiler
done
global_unlock
diff --git a/SerNet-Tru64.fns b/SerNet-Tru64.fns
index efb706d..8622412 100644
--- a/SerNet-Tru64.fns
+++ b/SerNet-Tru64.fns
@@ -26,7 +26,6 @@ for compiler in $compilers; do
test_tree samba_3_current source3 $compiler
test_tree samba_3_next source3 $compiler
test_tree samba_3_master source3 $compiler
- test_tree samba_3_waf source3 $compiler
TDB_NO_FSYNC=0
export TDB_NO_FSYNC
diff --git a/SerNet-aix.fns b/SerNet-aix.fns
index d7bb98a..825a42a 100644
--- a/SerNet-aix.fns
+++ b/SerNet-aix.fns
@@ -27,7 +27,6 @@ test_tree lorikeet-heimdal . $compiler
test_tree samba_3_current source3 $compiler
test_tree samba_3_next source3 $compiler
test_tree samba_3_master source3 $compiler
-test_tree samba_3_waf source3 $compiler
test_tree pidl . cc build test
compiler="xlc_r"
diff --git a/SerNet-solaris8.fns b/SerNet-solaris8.fns
index 6798044..66464f4 100644
--- a/SerNet-solaris8.fns
+++ b/SerNet-solaris8.fns
@@ -38,7 +38,6 @@ for compiler in $compilers; do
test_tree samba_3_current source3 $compiler
test_tree samba_3_next source3 $compiler
test_tree samba_3_master source3 $compiler
- test_tree samba_3_waf source3 $compiler
TDB_NO_FSYNC=0
export TDB_NO_FSYNC
done
diff --git a/build_test.fns b/build_test.fns
index 4616cd6..b5ab052 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -353,15 +353,6 @@ action_configure() {
echo "CONFIGURE STATUS: $cstatus"
return $cstatus
;;
- samba_3_waf)
- $builddir/timelimit $MAXTIME $srcdir/autogen-waf.sh
- cstatus=$?
- echo "autogen-waf.sh STATUS: $cstatus"
- if [ x"$cstatus" != x"0" ]; then
- return $cstatus
- fi
- # fall through
- ;;
esac
if [ ! -x $srcdir/configure -a -r $srcdir/Makefile.PL ]; then
@@ -965,7 +956,7 @@ per_run_hook() {
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"
+ old_trees="$old_tree samba_3_X_test samba_3_X_devel samba_3_X_devel samba_3_waf"
for d in $old_trees; do
delete_old_tree $d
done
diff --git a/charis.fns b/charis.fns
index 0e8eb11..f3cad96 100755
--- a/charis.fns
+++ b/charis.fns
@@ -11,6 +11,5 @@ compiler=gcc
test_tree samba_4_0_test . gcc
export config="--enable-merged-build"
test_tree samba_3_master source3 gcc
-test_tree samba_3_waf source3 gcc
global_unlock
diff --git a/fjall.fns b/fjall.fns
index dc3adfe..4398ba8 100644
--- a/fjall.fns
+++ b/fjall.fns
@@ -25,7 +25,6 @@ test_tree samba_4_0_test . $compiler
test_tree samba_3_current source3 $compiler
test_tree samba_3_next source3 $compiler
test_tree samba_3_master source3 $compiler
-test_tree samba_3_waf source3 $compiler
export TESTS_ENVIRONMENT="$PWD/lorikeet-heimdal/libtool --mode=execute valgrind --trace-children=yes --quiet -q --num-callers=30 --gen-suppressions=all --suppressions=$PWD/lorikeet-heimdal/cf/valgrind-suppressions"
test_tree lorikeet-heimdal . $compiler
diff --git a/generic.fns b/generic.fns
index 453097e..25a6b2e 100644
--- a/generic.fns
+++ b/generic.fns
@@ -64,7 +64,6 @@ for compiler in $compilers; do
test_tree samba_3_current source3 $compiler
test_tree samba_3_next source3 $compiler
test_tree samba_3_master source3 $compiler
- test_tree samba_3_waf source3 $compiler
TDB_NO_FSYNC=0
export TDB_NO_FSYNC
diff --git a/gwen.fns b/gwen.fns
index a9ee75a..2722993 100644
--- a/gwen.fns
+++ b/gwen.fns
@@ -13,7 +13,6 @@ for compiler in $compilers; do
test_tree samba_3_current source3 $compiler
test_tree samba_3_next source3 $compiler
test_tree samba_3_master source3 $compiler
- test_tree samba_3_waf source3 $compiler
done
global_unlock
diff --git a/hape.fns b/hape.fns
index 18ba319..cd29962 100644
--- a/hape.fns
+++ b/hape.fns
@@ -27,7 +27,6 @@ for compiler in gcc ; do
test_tree samba_3_next source3 $compiler
export config="--with-acl-support --with-libiconv=/usr/local --with-included-popt"
test_tree samba_3_master source3 $compiler
- test_tree samba_3_waf source3 $compiler
done
diff --git a/m104.fns b/m104.fns
index 5594cb6..e9b03d6 100644
--- a/m104.fns
+++ b/m104.fns
@@ -129,4 +129,3 @@ per_run_hook
test_tree samba_3_current source3 gcc
test_tree samba_3_next source3 gcc
test_tree samba_3_master source3 gcc
-test_tree samba_3_waf source3 gcc
diff --git a/magni.fns b/magni.fns
index aa8fd4a..2177cfe 100644
--- a/magni.fns
+++ b/magni.fns
@@ -16,7 +16,6 @@ export config=""
test_tree samba_3_current source3 $compiler
test_tree samba_3_next source3 $compiler
test_tree samba_3_master source3 $compiler
-test_tree samba_3_waf source3 $compiler
#lcov and libtool disagree, enable OpenLDAP and disable OpenSSL
export config="--with-ldap=/usr --without-openssl --disable-shared"
diff --git a/opi.fns b/opi.fns
index 0420ef2..2c10d0d 100644
--- a/opi.fns
+++ b/opi.fns
@@ -17,7 +17,6 @@ test_tree samba_3_current source3 $compiler
test_tree samba_3_next source3 $compiler
export config="--enable-developer"
test_tree samba_3_master source3 $compiler
-test_tree samba_3_waf source3 $compiler
export config=""
test_tree pidl . $compiler build test
diff --git a/qnx18.fns b/qnx18.fns
index 063f9b9..ecbf7e6 100644
--- a/qnx18.fns
+++ b/qnx18.fns
@@ -16,7 +16,6 @@ fi
#test_tree samba_3_current source3 $compiler
test_tree samba_3_next source3 $compiler
test_tree samba_3_master source3 $compiler
-test_tree samba_3_waf source3 $compiler
# only attempt pidl if we have perl
if which perl > /dev/null; then
diff --git a/sunX.fns b/sunX.fns
index 1b66874..e4609a1 100644
--- a/sunX.fns
+++ b/sunX.fns
@@ -23,7 +23,6 @@ for compiler in $compilers; do
test_tree samba_3_current source3 $compiler
test_tree samba_3_next source3 $compiler
test_tree samba_3_master source3 $compiler
- test_tree samba_3_waf source3 $compiler
done
diff --git a/web/trees.conf b/web/trees.conf
index 3b497d1..bfa4c03 100644
--- a/web/trees.conf
+++ b/web/trees.conf
@@ -36,12 +36,6 @@ repo = samba.git
branch = master
srcdir = source3
-[samba_3_waf]
-scm = git
-repo = samba.git
-branch = master
-srcdir = source3
-
[samba_4_0_test]
scm = git
repo = samba.git
--
build.samba.org
More information about the samba-cvs
mailing list