The branch, master has been updated via 93c86fe... build: give a more useful error when the source dir has moved via a36c7b8... build: use 'waf distclean' for make distclean from bd08249... s4:provision Remove moduleload for 'hdb' (wrong name).
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 93c86fe6155bea76818b569bbc883cecc7130dd1 Author: Andrew Tridgell <tri...@samba.org> Date: Fri Apr 23 08:24:34 2010 +1000 build: give a more useful error when the source dir has moved you need a distclean if you mv the source directory commit a36c7b8b74c209b010e763487a750472d9c2e0a1 Author: Andrew Tridgell <tri...@samba.org> Date: Fri Apr 23 08:24:02 2010 +1000 build: use 'waf distclean' for make distclean this cleans up the more than rm -rf bin ----------------------------------------------------------------------- Summary of changes: buildtools/scripts/Makefile.waf | 4 ++-- buildtools/wafsamba/wscript | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/buildtools/scripts/Makefile.waf b/buildtools/scripts/Makefile.waf index f9c3fbb..a517bae 100644 --- a/buildtools/scripts/Makefile.waf +++ b/buildtools/scripts/Makefile.waf @@ -23,8 +23,8 @@ dist: clean: $(WAF) clean -distclean: clean - rm -rf bin +distclean: + $(WAF) distclean # some compatibility make targets everything: all diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript index 4b388cc..54802a7 100644 --- a/buildtools/wafsamba/wscript +++ b/buildtools/wafsamba/wscript @@ -275,6 +275,12 @@ def configure(conf): def build(bld): + # give a more useful message if the source directory has moved + relpath = os_path_relpath(bld.curdir, bld.srcnode.abspath()) + if relpath.find('../') != -1: + Logs.error('bld.curdir %s is not a child of %s' % (bld.curdir, bld.srcnode.abspath())) + raise Utils.WafError('''The top source directory has moved. Please run distclean and reconfigure''') + bld.CHECK_MAKEFLAGS() bld.SETUP_BUILD_GROUPS() bld.ENFORCE_GROUP_ORDERING() -- Samba Shared Repository