mirror of https://gitlab.com/ita1024/waf.git
Remove mac_resources processing, use mac_files instead
This commit is contained in:
parent
304935bb9f
commit
0ba6b042d5
|
@ -42,4 +42,4 @@ NEW IN WAF 1.9 preview 1
|
||||||
- task_gen.mapping is not defined by default on instances anymore, but instances can
|
- task_gen.mapping is not defined by default on instances anymore, but instances can
|
||||||
still define their own mappings to override the defaults, but in that case all mappings
|
still define their own mappings to override the defaults, but in that case all mappings
|
||||||
must be present. This feature was not used in Waf 1.8.
|
must be present. This feature was not used in Waf 1.8.
|
||||||
|
- Unused attribute 'mac_resources' is no longer supported, use mac_files (see demos/mac_app)
|
||||||
|
|
|
@ -683,8 +683,7 @@ def post_check(self, *k, **kw):
|
||||||
|
|
||||||
if is_success and 'uselib_store' in kw:
|
if is_success and 'uselib_store' in kw:
|
||||||
from waflib.Tools import ccroot
|
from waflib.Tools import ccroot
|
||||||
|
# See get_uselib_vars in ccroot.py
|
||||||
# TODO see get_uselib_vars from ccroot.py
|
|
||||||
_vars = set([])
|
_vars = set([])
|
||||||
for x in kw['features']:
|
for x in kw['features']:
|
||||||
if x in ccroot.USELIB_VARS:
|
if x in ccroot.USELIB_VARS:
|
||||||
|
|
|
@ -104,25 +104,6 @@ def create_task_macapp(self):
|
||||||
self.create_task('macapp', node, res_dir.make_node(relpath))
|
self.create_task('macapp', node, res_dir.make_node(relpath))
|
||||||
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, 'mac_resources', None):
|
|
||||||
# TODO remove in waf 1.9
|
|
||||||
res_dir = n1.parent.parent.make_node('Resources')
|
|
||||||
inst_to = getattr(self, 'install_path', '/Applications') + '/%s/Resources' % name
|
|
||||||
for x in self.to_list(self.mac_resources):
|
|
||||||
node = self.path.find_node(x)
|
|
||||||
if not node:
|
|
||||||
raise Errors.WafError('Missing mac_resource %r in %r' % (x, self))
|
|
||||||
|
|
||||||
parent = node.parent
|
|
||||||
if os.path.isdir(node.abspath()):
|
|
||||||
nodes = node.ant_glob('**')
|
|
||||||
else:
|
|
||||||
nodes = [node]
|
|
||||||
for node in nodes:
|
|
||||||
rel = node.path_from(parent)
|
|
||||||
self.create_task('macapp', node, res_dir.make_node(rel))
|
|
||||||
self.bld.install_as(inst_to + '/%s' % rel, node)
|
|
||||||
|
|
||||||
if getattr(self.bld, 'is_install', None):
|
if getattr(self.bld, 'is_install', None):
|
||||||
# disable the normal binary installation
|
# disable the normal binary installation
|
||||||
self.install_task.hasrun = Task.SKIP_ME
|
self.install_task.hasrun = Task.SKIP_ME
|
||||||
|
|
|
@ -232,7 +232,6 @@ def _match_ignore(line):
|
||||||
def parse_fortran_link(lines):
|
def parse_fortran_link(lines):
|
||||||
"""Given the output of verbose link of Fortran compiler, this returns a
|
"""Given the output of verbose link of Fortran compiler, this returns a
|
||||||
list of flags necessary for linking using the standard linker."""
|
list of flags necessary for linking using the standard linker."""
|
||||||
# TODO: On windows ?
|
|
||||||
final_flags = []
|
final_flags = []
|
||||||
for line in lines:
|
for line in lines:
|
||||||
if not GCC_DRIVER_LINE.match(line):
|
if not GCC_DRIVER_LINE.match(line):
|
||||||
|
|
Loading…
Reference in New Issue