FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-12-23 17:55:04 +01:00
Code Issues Projects Releases Wiki Activity

Missing installation fixes

Browse Source
This commit is contained in:
Thomas Nagy 2016-05-17 19:49:44 +02:00
parent 5cb7b89ac1
commit fd05cff103
No known key found for this signature in database
GPG Key ID: 67A565EDFDF90E64
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
waflib/Build.py
View File

@ -906,7 +906,7 @@ def add_install_task(self, **kw):
tsk = self.install_task = self.create_task('inst')
tsk.chmod = kw.get('chmod', Utils.O644)
tsk.link = kw.get('link', '')
tsk.link = kw.get('link', '') or kw.get('install_from', '')
tsk.relative_trick = kw.get('relative_trick', False)
tsk.type = kw['type']
tsk.install_to = kw['install_to']

4
waflib/Tools/ccroot.py
View File

@ -484,7 +484,7 @@ def apply_implib(self):
except AttributeError:
# else, put the library in BINDIR and the import library in LIBDIR
inst_to = '${IMPLIBDIR}'
self.install_task.dest = '${BINDIR}'
self.install_task.install_to = '${BINDIR}'
if not self.env.IMPLIBDIR:
self.env.IMPLIBDIR = self.env.LIBDIR
self.implib_install_task = self.add_install_files(install_to=inst_to, install_from=implib,
@ -552,7 +552,7 @@ def apply_vnum(self):
if getattr(self, 'install_task', None):
self.install_task.hasrun = Task.SKIP_ME
path = self.install_task.dest
path = self.install_task.install_to
if self.env.DEST_OS == 'openbsd':
libname = self.link_task.outputs[0].name
t1 = self.add_install_as(install_to='%s/%s' % (path, libname), install_from=node, chmod=self.link_task.chmod)

2
waflib/Tools/ifort.py
View File

@ -442,7 +442,7 @@ def apply_flags_ifort(self):
self.link_task.outputs.append(pdbnode)
if getattr(self, 'install_task', None):
self.pdb_install_task = self.add_install_files(install_to=self.install_task.dest, install_from=pdbnode)
self.pdb_install_task = self.add_install_files(install_to=self.install_task.install_to, install_from=pdbnode)
break

2
waflib/Tools/msvc.py
View File

@ -983,7 +983,7 @@ def apply_flags_msvc(self):
if getattr(self, 'install_task', None):
self.pdb_install_task = self.add_install_files(
install_to=self.install_task.dest, install_from=pdbnode)
install_to=self.install_task.install_to, install_from=pdbnode)
break
# split the manifest file processing from the link task, like for the rc processing