FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

install_task -> install_tg

This commit is contained in:
Thomas Nagy 2016-05-03 23:14:10 +02:00
parent 16082a4c3e
commit 6c21deb583
No known key found for this signature in database
GPG Key ID: 67A565EDFDF90E64
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TODO
View File

@ -1,5 +1,6 @@
Waf 1.9 Waf 1.9
------- -------
Refactor msvc.py
Update the documentation Update the documentation

8
waflib/TaskGen.py
View File

@ -352,7 +352,7 @@ def declare_chain(name='', rule=None, reentrant=None, color='BLUE',
cnt += 1 cnt += 1
if install_path: if install_path:
self.bld.install_files(install_path, tsk.outputs) self.install_tg = self.bld.install_files(install_path, tsk.outputs)
return tsk return tsk
for x in cls.ext_in: for x in cls.ext_in:
@ -613,7 +613,7 @@ def process_rule(self):
x.parent.mkdir() # if a node was given, create the required folders x.parent.mkdir() # if a node was given, create the required folders
tsk.outputs.append(x) tsk.outputs.append(x)
if getattr(self, 'install_path', None): if getattr(self, 'install_path', None):
self.bld.install_files(self.install_path, tsk.outputs, chmod=getattr(self, 'chmod', Utils.O644)) self.install_tg = self.bld.install_files(self.install_path, tsk.outputs, chmod=getattr(self, 'chmod', Utils.O644))
if getattr(self, 'source', None): if getattr(self, 'source', None):
tsk.inputs = self.to_nodes(self.source) tsk.inputs = self.to_nodes(self.source)
@ -767,7 +767,7 @@ def add_pcfile(self, node):
bld(source='foo.pc.in', install_path='${LIBDIR}/pkgconfig/') bld(source='foo.pc.in', install_path='${LIBDIR}/pkgconfig/')
""" """
tsk = self.create_task('subst_pc', node, node.change_ext('.pc', '.pc.in')) tsk = self.create_task('subst_pc', node, node.change_ext('.pc', '.pc.in'))
self.bld.install_files(getattr(self, 'install_path', '${LIBDIR}/pkgconfig/'), tsk.outputs) self.install_tg = self.bld.install_files(getattr(self, 'install_path', '${LIBDIR}/pkgconfig/'), tsk.outputs)
class subst(subst_pc): class subst(subst_pc):
pass pass
@ -843,7 +843,7 @@ def process_subst(self):
inst_to = getattr(self, 'install_path', None) inst_to = getattr(self, 'install_path', None)
if inst_to: if inst_to:
self.bld.install_files(inst_to, b, chmod=getattr(self, 'chmod', Utils.O644)) self.install_tg = self.bld.install_files(inst_to, b, chmod=getattr(self, 'chmod', Utils.O644))
self.source = [] self.source = []

4
waflib/Tools/c_osx.py
View File

@ -105,8 +105,8 @@ def create_task_macapp(self):
self.bld.install_as(os.path.join(inst_to, relpath), node) self.bld.install_as(os.path.join(inst_to, relpath), node)
if getattr(self.bld, 'is_install', None): if getattr(self.bld, 'is_install', None):
# disable the normal binary installation # disable normal binary installation
self.install_task.hasrun = Task.SKIP_ME self.install_tg.posted = True
@feature('cprogram', 'cxxprogram') @feature('cprogram', 'cxxprogram')
@after_method('apply_link') @after_method('apply_link')

10
waflib/Tools/ccroot.py
View File

@ -229,7 +229,7 @@ def apply_link(self):
inst_to = self.link_task.__class__.inst_to inst_to = self.link_task.__class__.inst_to
if inst_to: if inst_to:
# install a copy of the node list we have at this moment (implib not added) # install a copy of the node list we have at this moment (implib not added)
self.install_task = self.bld.install_files(inst_to, self.link_task.outputs[:], env=self.env, chmod=self.link_task.chmod, task=self.link_task) self.install_tg = self.bld.install_files(inst_to, self.link_task.outputs[:], env=self.env, chmod=self.link_task.chmod, task=self.link_task)
@taskgen_method @taskgen_method
def use_rec(self, name, **kw): def use_rec(self, name, **kw):
@ -485,7 +485,7 @@ def apply_implib(self):
self.install_task.dest = '${BINDIR}' self.install_task.dest = '${BINDIR}'
if not self.env.IMPLIBDIR: if not self.env.IMPLIBDIR:
self.env.IMPLIBDIR = self.env.LIBDIR self.env.IMPLIBDIR = self.env.LIBDIR
self.implib_install_task = self.bld.install_files(inst_to, implib, env=self.env, chmod=self.link_task.chmod, task=self.link_task) self.implib_install_tg = self.bld.install_files(inst_to, implib, env=self.env, chmod=self.link_task.chmod, task=self.link_task)
# ============ the code above must not know anything about vnum processing on unix platforms ========= # ============ the code above must not know anything about vnum processing on unix platforms =========
@ -554,15 +554,15 @@ def apply_vnum(self):
if self.env.DEST_OS == 'openbsd': if self.env.DEST_OS == 'openbsd':
libname = self.link_task.outputs[0].name libname = self.link_task.outputs[0].name
t1 = bld.install_as('%s%s%s' % (path, os.sep, libname), node, env=self.env, chmod=self.link_task.chmod) t1 = bld.install_as('%s%s%s' % (path, os.sep, libname), node, env=self.env, chmod=self.link_task.chmod)
self.vnum_install_task = (t1,) self.vnum_install_tg = (t1,)
else: else:
t1 = bld.install_as(path + os.sep + name3, node, env=self.env, chmod=self.link_task.chmod) t1 = bld.install_as(path + os.sep + name3, node, env=self.env, chmod=self.link_task.chmod)
t3 = bld.symlink_as(path + os.sep + libname, name3) t3 = bld.symlink_as(path + os.sep + libname, name3)
if name2 != name3: if name2 != name3:
t2 = bld.symlink_as(path + os.sep + name2, name3) t2 = bld.symlink_as(path + os.sep + name2, name3)
self.vnum_install_task = (t1, t2, t3) self.vnum_install_tg = (t1, t2, t3)
else: else:
self.vnum_install_task = (t1, t3) self.vnum_install_tg = (t1, t3)
if '-dynamiclib' in self.env['LINKFLAGS']: if '-dynamiclib' in self.env['LINKFLAGS']:
# this requires after(propagate_uselib_vars) # this requires after(propagate_uselib_vars)