From: Jack Jansen <jack.jansen@cwi.nl>
Date: Sun, 3 Dec 2000 22:38:34 +0000 (+0000)
Subject: Allow recursive searh entries by ending the pathname in ":*".
X-Git-Tag: v2.1a1~672
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aee9d6b73e0d0df6fc2f260c4314fe1c17282cf8;p=thirdparty%2FPython%2Fcpython.git

Allow recursive searh entries by ending the pathname in ":*".
---

diff --git a/Mac/Lib/mkcwproject/cwxmlgen.py b/Mac/Lib/mkcwproject/cwxmlgen.py
index ff5d0cbaf906..959516f00923 100644
--- a/Mac/Lib/mkcwproject/cwxmlgen.py
+++ b/Mac/Lib/mkcwproject/cwxmlgen.py
@@ -47,11 +47,16 @@ class ProjectBuilder:
 					if not type(keyvalues) in (type(()), type([])):
 						raise Error, "List or tuple expected for %s"%key
 					for curkeyvalue in keyvalues:
-						self.dict[key] = curkeyvalue
 						if os.path.isabs(curkeyvalue):
 							self.dict['pathtype'] = 'Absolute'
 						else:
 							self.dict['pathtype'] = 'Project'
+						if curkeyvalue[-2:] == ':*':
+							curkeyvalue = curkeyvalue[:-2]
+							self.dict['recursive'] = 'true'
+						else:
+							self.dict['recursive'] = 'false'
+						self.dict[key] = curkeyvalue
 						curkeyvalueresult = self._generate_one_value(datasource, dataname)
 						result = result + curkeyvalueresult
 				finally:
@@ -59,6 +64,8 @@ class ProjectBuilder:
 					self.dict[key] = keyvalues
 					self.dict['pathtype'] = None
 					del self.dict['pathtype']
+					self.dict['recursive'] = None
+					del self.dict['recursive']
 		else:
 			# Not a multi-element rule. Simply generate
 			result = self._generate_one_value(datasource, dataname)
diff --git a/Mac/Lib/mkcwproject/template/template-searchdirs.xml b/Mac/Lib/mkcwproject/template/template-searchdirs.xml
index c23f8f7b5b03..ae1b353fc40a 100644
--- a/Mac/Lib/mkcwproject/template/template-searchdirs.xml
+++ b/Mac/Lib/mkcwproject/template/template-searchdirs.xml
@@ -4,6 +4,6 @@
                             <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
                             <SETTING><NAME>PathRoot</NAME><VALUE>%(pathtype)s</VALUE></SETTING>
                         </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
+                        <SETTING><NAME>Recursive</NAME><VALUE>%(recursive)s</VALUE></SETTING>
                         <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
                     </SETTING>