FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-22 18:07:12 +01:00
Code Issues Projects Releases Wiki Activity

Fix install_from after suggestion of ita on how to do it better and make sure install_path is present as python requires it

Browse Source
This commit is contained in:
fedepell 2016-07-29 16:36:01 +02:00
parent 7ade9796a6
commit f4e1b59bbc
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
waflib/extras/pyqt5.py
View File

@ -82,12 +82,11 @@ def create_pyrcc_task(self, node):
"Creates rcc and py task for ``.qrc`` files"
rcnode = node.change_ext('.py')
self.create_task('pyrcc', node, rcnode)
if self.install_from:
pyd = Context.out_dir[len(Context.top_dir)+1:] + str(self.install_from)[len(Context.top_dir):]
if getattr(self, 'install_from', None):
self.install_from = self.install_from.get_bld()
else:
pyd = Context.out_dir[len(Context.top_dir)+1:]
self.install_from = self.path.find_dir(pyd)
self.install_from = self.path.get_bld()
self.install_path = getattr(self, 'install_path', '${PYTHONDIR}')
self.process_py(rcnode)
@extension(*EXT_UI)
@ -95,12 +94,11 @@ def create_pyuic_task(self, node):
"Create uic tasks and py for user interface ``.ui`` definition files"
uinode = node.change_ext('.py')
self.create_task('ui5py', node, uinode)
if self.install_from:
pyd = Context.out_dir[len(Context.top_dir) + 1:] + str(self.install_from)[len(Context.top_dir):]
if getattr(self, 'install_from', None):
self.install_from = self.install_from.get_bld()
else:
pyd = Context.out_dir[len(Context.top_dir) + 1:]
self.install_from = self.path.find_dir(pyd)
self.install_from = self.path.get_bld()
self.install_path = getattr(self, 'install_path', '${PYTHONDIR}')
self.process_py(uinode)
@extension('.ts')