The branch, master has been updated
via f8e3e5c... build: fixed install of binary targets that are in
subdirs
via 639fe34... build: support make V=1 for verbose build
from 7aa4c11... build: more adjustments for the ABI type name maps
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f8e3e5ce074ba08aefba3b4e7fe804c08687dbfa
Author: Andrew Tridgell <[email protected]>
Date: Sun Apr 18 21:08:11 2010 +1000
build: fixed install of binary targets that are in subdirs
this should fix the smbd/smbd install problem with Kai's s3 waf build
commit 639fe346670c760ec6a1536e2d3962e1c301b13c
Author: Andrew Tridgell <[email protected]>
Date: Sun Apr 18 19:41:47 2010 +1000
build: support make V=1 for verbose build
this also adds support for other options, such as "make TESTS=testpattern"
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_install.py | 2 +-
buildtools/wafsamba/samba_utils.py | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_install.py
b/buildtools/wafsamba/samba_install.py
index 74730dd..e2db589 100644
--- a/buildtools/wafsamba/samba_install.py
+++ b/buildtools/wafsamba/samba_install.py
@@ -29,7 +29,7 @@ def install_binary(self):
install_path = self.samba_inst_path or '${BINDIR}'
install_path = bld.EXPAND_VARIABLES(install_path)
- orig_target = self.target
+ orig_target = os.path.basename(self.target)
if install_ldflags != build_ldflags:
# we will be creating a new target name, and using that for the
diff --git a/buildtools/wafsamba/samba_utils.py
b/buildtools/wafsamba/samba_utils.py
index a3448b7..cbea755 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -449,7 +449,16 @@ def CHECK_MAKEFLAGS(bld):
jobs_set = False
for opt in makeflags.split():
# options can come either as -x or as x
- if opt[0] != '-':
+ if opt[0:2] == 'V=':
+ Options.options.verbose = Logs.verbose = int(opt[2:])
+ if Logs.verbose > 0:
+ Logs.zones = ['runner']
+ if Logs.verbose > 2:
+ Logs.zones = ['*']
+ elif opt[0].isupper() and opt.find('=') != -1:
+ loc = opt.find('=')
+ setattr(Options.options, opt[0:loc], opt[loc+1:])
+ elif opt[0] != '-':
for v in opt:
if v == 'j':
jobs_set = True
--
Samba Shared Repository
