From 0ba6b042d5eafccd0d507e7ca69fe79087c8bf0d Mon Sep 17 00:00:00 2001
From: Thomas Nagy <tnagy@waf.io>
Date: Mon, 25 Apr 2016 22:35:58 +0200
Subject: [PATCH] Remove mac_resources processing, use mac_files instead

---
 ChangeLog                 |  2 +-
 waflib/Tools/c_config.py  |  3 +--
 waflib/Tools/c_osx.py     | 19 -------------------
 waflib/Tools/fc_config.py |  1 -
 4 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 12d1ce28..6a07bd3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
     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.
-
+  - Unused attribute 'mac_resources' is no longer supported, use mac_files (see demos/mac_app)
diff --git a/waflib/Tools/c_config.py b/waflib/Tools/c_config.py
index 68b1a8aa..44f46821 100644
--- a/waflib/Tools/c_config.py
+++ b/waflib/Tools/c_config.py
@@ -683,8 +683,7 @@ def post_check(self, *k, **kw):
 
 	if is_success and 'uselib_store' in kw:
 		from waflib.Tools import ccroot
-
-		# TODO see get_uselib_vars from ccroot.py
+		# See get_uselib_vars in ccroot.py
 		_vars = set([])
 		for x in kw['features']:
 			if x in ccroot.USELIB_VARS:
diff --git a/waflib/Tools/c_osx.py b/waflib/Tools/c_osx.py
index 4337cc68..12a0d7c7 100644
--- a/waflib/Tools/c_osx.py
+++ b/waflib/Tools/c_osx.py
@@ -104,25 +104,6 @@ def create_task_macapp(self):
 				self.create_task('macapp', node, res_dir.make_node(relpath))
 				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):
 			# disable the normal binary installation
 			self.install_task.hasrun = Task.SKIP_ME
diff --git a/waflib/Tools/fc_config.py b/waflib/Tools/fc_config.py
index 72f728b0..da93486f 100644
--- a/waflib/Tools/fc_config.py
+++ b/waflib/Tools/fc_config.py
@@ -232,7 +232,6 @@ def _match_ignore(line):
 def parse_fortran_link(lines):
 	"""Given the output of verbose link of Fortran compiler, this returns a
 	list of flags necessary for linking using the standard linker."""
-	# TODO: On windows ?
 	final_flags = []
 	for line in lines:
 		if not GCC_DRIVER_LINE.match(line):