cache[v] = x
return cache.get(env.variant() + '_' + name, None)
+ def get_tgen_by_name(self, name):
+ """waf 1.8 api"""
+ return self.name_to_obj(name, self.env)
+
def flush(self, all=1):
"""tell the task generators to create the tasks"""
child = self.ensure_dir_node_from_path(k)
child.update_build_dir(env)
+ def read(self, flags='r', encoding='ISO8859-1'):
+ """backported from waf 1.8"""
+ return Utils.readf(self.abspath(), flags, encoding)
+
+ def write(self, data, flags='w', encoding='ISO8859-1'):
+ """backported from waf 1.8"""
+ Utils.writef(self.abspath(self.bld.env), data, flags, encoding)
class Nodu(Node):
pass
def name_to_obj(self, name):
return self.bld.name_to_obj(name, self.env)
+ def get_tgen_by_name(self, name):
+ return self.bld.get_tgen_by_name(name)
+
def find_sources_in_dirs(self, dirnames, excludes=[], exts=[]):
"""
The attributes "excludes" and "exts" must be lists to avoid the confusion
class cc_taskgen(ccroot.ccroot_abstract):
pass
-@feature('cc')
+@feature('c', 'cc')
@before('apply_type_vars')
@after('default_cc')
def init_cc(self):
if not self.env['CC_NAME']:
raise Utils.WafError("At least one compiler (gcc, ..) must be selected")
-@feature('cc')
+@feature('c', 'cc')
@after('apply_incpaths')
def apply_obj_vars_cc(self):
"""after apply_incpaths for INC_PATHS"""
for i in env['CPPPATH']:
app('_CCINCFLAGS', cpppath_st % i)
-@feature('cc')
+@feature('c', 'cc')
@after('apply_lib_vars')
def apply_defines_cc(self):
"""after uselib is set for CCDEFINES"""
return os.path.join(dir, pattern % name)
-@feature('cc', 'cxx')
+@feature('c', 'cc', 'cxx')
@before('apply_core')
def default_cc(self):
"""compiled_tasks attribute must be set before the '.c->.o' tasks can be created"""
if self.install_path:
self.bld.install_files(self.install_path, self.link_task.outputs[0], env=self.env, chmod=self.chmod)
-@feature('cc', 'cxx')
+@feature('c', 'cc', 'cxx')
@after('apply_type_vars', 'apply_lib_vars', 'apply_core')
def apply_incpaths(self):
"""used by the scanner
if USE_TOP_LEVEL:
self.env.append_value('INC_PATHS', self.bld.srcnode)
-@feature('cc', 'cxx')
+@feature('c', 'cc', 'cxx')
@after('init_cc', 'init_cxx')
@before('apply_lib_vars')
def apply_type_vars(self):
self.link_task = tsk
-@feature('cc', 'cxx')
+@feature('c', 'cc', 'cxx')
@after('apply_link', 'init_cc', 'init_cxx', 'apply_core')
def apply_lib_vars(self):
"""after apply_link because of 'link_task'
'frameworkpath' : 'FRAMEWORKPATH'
}
-@feature('cc', 'cxx')
+@feature('c', 'cc', 'cxx')
@before('init_cxx', 'init_cc')
@before('apply_lib_vars', 'apply_obj_vars', 'apply_incpaths', 'init_cc')
def add_extra_flags(self):
##### conf above, build below
@after('apply_link')
-@feature('cc', 'cxx')
+@feature('c', 'cc', 'cxx')
def apply_flags_msvc(self):
if self.env.CC_NAME != 'msvc' or not self.link_task:
return
# see WAF issue 285
# and also http://trac.macports.org/ticket/17059
-@feature('cc', 'cxx')
+@feature('c', 'cc', 'cxx')
@before('apply_lib_vars')
def set_macosx_deployment_target(self):
if self.env['MACOSX_DEPLOYMENT_TARGET']:
if sys.platform == 'darwin':
os.environ['MACOSX_DEPLOYMENT_TARGET'] = '.'.join(platform.mac_ver()[0].split('.')[:2])
-@feature('cc', 'cxx')
+@feature('c', 'cc', 'cxx')
@after('apply_lib_vars')
def apply_framework(self):
for x in self.to_list(self.env['FRAMEWORKPATH']):
self.env.append_value('LINKFLAGS', path)
@before('apply_link', 'apply_lib_vars')
-@feature('cc', 'cxx')
+@feature('c', 'cc', 'cxx')
def apply_bundle(self):
"""use env['MACBUNDLE'] to force all shlibs into mac bundles
or use obj.mac_bundle = True for specific targets only"""
# portability fixes may be added elsewhere (although, md5 should be everywhere by now)
md5 = None
+def readf(fname, m='r', encoding='ISO8859-1'):
+ """backported from waf 1.8"""
+ if sys.hexversion > 0x3000000 and not 'b' in m:
+ m += 'b'
+ f = open(fname, m)
+ try:
+ txt = f.read()
+ finally:
+ f.close()
+ if encoding:
+ txt = txt.decode(encoding)
+ else:
+ txt = txt.decode()
+ else:
+ f = open(fname, m)
+ try:
+ txt = f.read()
+ finally:
+ f.close()
+ return txt
+
+def writef(fname, data, m='w', encoding='ISO8859-1'):
+ """backported from waf 1.8"""
+ if sys.hexversion > 0x3000000 and not 'b' in m:
+ data = data.encode(encoding)
+ m += 'b'
+ f = open(fname, m)
+ try:
+ f.write(data)
+ finally:
+ f.close()
+
class ordered_dict(UserDict):
def __init__(self, dict = None):
self.allkeys = []
for dt in tooldir:
sys.path.remove(dt)
-def readf(fname, m='r'):
- "get the contents of a file, it is not used anywhere for the moment"
- f = open(fname, m)
- try:
- txt = f.read()
- finally:
- f.close()
- return txt
-
def nada(*k, **kw):
"""A function that does nothing"""
pass
git.samba.org / bbaumbach / samba-autobuild / .git / commitdiff