git.samba.org
/
samba.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dynconfig/wscript: update to handle waf 2.0.4
[samba.git]
/
dynconfig
/
wscript
diff --git
a/dynconfig/wscript
b/dynconfig/wscript
index 54977e42bd4b5d086d135a83c3347a315f331722..e9ca4e5b9df7268892540b81d8b00feb690c4970 100644
(file)
--- a/
dynconfig/wscript
+++ b/
dynconfig/wscript
@@
-1,6
+1,10
@@
#!/usr/bin/env python
#!/usr/bin/env python
-import string, Logs, Utils, Options, Build, os, optparse, textwrap
+import string
+import os
+import optparse
+import textwrap
+from waflib import Logs, Errors, Options, Build, Context
from samba_utils import EXPAND_VARIABLES, os_path_relpath
class SambaIndentedHelpFormatter (optparse.IndentedHelpFormatter):
from samba_utils import EXPAND_VARIABLES, os_path_relpath
class SambaIndentedHelpFormatter (optparse.IndentedHelpFormatter):
@@
-261,9
+265,9
@@
dynconfig = {
},
}
},
}
-def
set_
options(opt):
+def options(opt):
opt.parser.formatter = SambaIndentedHelpFormatter()
opt.parser.formatter = SambaIndentedHelpFormatter()
- opt.parser.formatter.width=
Util
s.get_term_cols()
+ opt.parser.formatter.width=
Log
s.get_term_cols()
for k in ('--with-privatelibdir', '--with-modulesdir'):
option = opt.parser.get_option(k)
for k in ('--with-privatelibdir', '--with-modulesdir'):
option = opt.parser.get_option(k)
@@
-305,7
+309,7
@@
def configure(conf):
flavor = 'STD-PATH'
if conf.env.PREFIX == '/usr' or conf.env.PREFIX == '/usr/local':
Logs.error("Don't install directly under /usr or /usr/local without using the FHS option (--enable-fhs)")
flavor = 'STD-PATH'
if conf.env.PREFIX == '/usr' or conf.env.PREFIX == '/usr/local':
Logs.error("Don't install directly under /usr or /usr/local without using the FHS option (--enable-fhs)")
- raise
Util
s.WafError("ERROR: invalid --prefix=%s value" % (conf.env.PREFIX))
+ raise
Error
s.WafError("ERROR: invalid --prefix=%s value" % (conf.env.PREFIX))
explicit_set ={}
explicit_set ={}
@@
-416,7
+420,7
@@
def build(bld):
bld.SAMBA_SUBSYSTEM('DYNCONFIG',
'dynconfig.c',
deps='replace',
bld.SAMBA_SUBSYSTEM('DYNCONFIG',
'dynconfig.c',
deps='replace',
- public_headers=os_path_relpath(os.path.join(
Options.launch_dir, version_header), bld.curdir
),
+ public_headers=os_path_relpath(os.path.join(
Context.launch_dir, version_header), bld.path.abspath()
),
header_path='samba',
cflags=cflags)
header_path='samba',
cflags=cflags)