WebKit Bugzilla
Attachment 360052 Details for
Bug 193783
: Fix missing dependencies in extract-dependencies-from-makefile
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-193783-20190124165010.patch (text/plain), 2.93 KB, created by
Keith Rollin
on 2019-01-24 16:50:11 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Keith Rollin
Created:
2019-01-24 16:50:11 PST
Size:
2.93 KB
patch
obsolete
>Subversion Revision: 240454 >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index d44fdbc72d4bb1d7d514131a51204ec5f492aea0..abe0c8ba0c29018603c8ef14a89e790968909807 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,27 @@ >+2019-01-24 Keith Rollin <krollin@apple.com> >+ >+ Fix missing dependencies in extract-dependencies-from-makefile >+ https://bugs.webkit.org/show_bug.cgi?id=193783 >+ <rdar://problem/47201571> >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ The extract-dependencies-from-makefile script generates .xcfilelists >+ for XCBuild by invoking a makefile in --debug mode, parsing the >+ dependency information in the output, and extracting information >+ regarding targets and dependents. However, the way `make` emits this >+ dependency information is not rigorous, and so we need to determine >+ what lines to look for and parse by trial and error. This approach >+ didn't coriginally atch all the information we needed to collect, so >+ update the script to look for the additional lines we now know to look >+ for. >+ >+ * Scripts/extract-dependencies-from-makefile: >+ (Parser): >+ (Parser.addTarget): >+ (Parser.addPrereq): >+ (Parser.doParse): >+ > 2019-01-24 Keith Rollin <krollin@apple.com> > > Complete the implementation of generate-xcfilelists >diff --git a/Tools/Scripts/extract-dependencies-from-makefile b/Tools/Scripts/extract-dependencies-from-makefile >index 780737b23241840e1dec0506822869d56a48ecc3..e07fbc9ccdb5ad00e4e5c4c5b3121346334b7e52 100755 >--- a/Tools/Scripts/extract-dependencies-from-makefile >+++ b/Tools/Scripts/extract-dependencies-from-makefile >@@ -45,6 +45,7 @@ class Parser(object): > > fileNamePattern = r"`([^']+)'" > rePrerequisite = re.compile(r"Prerequisite {} is .* than target {}".format(fileNamePattern, fileNamePattern)) >+ reMustRemakeTarget = re.compile(r"Must remake target {}".format(fileNamePattern)) > reWasConsideredAlready = re.compile(r"{} was considered already.".format(fileNamePattern)) > rePruningFile = re.compile(r"Pruning file {}.".format(fileNamePattern)) > >@@ -60,10 +61,12 @@ class Parser(object): > if line: yield line > > def addTarget(self, target): >- self.targets[target] = 1 >+ if target != 'all' and target != 'force': >+ self.targets[target] = 1 > > def addPrereq(self, prereq): >- self.prereqs[prereq] = 1 >+ if prereq != 'all' and prereq != 'force': >+ self.prereqs[prereq] = 1 > > def doParse(self, input): > >@@ -76,6 +79,11 @@ class Parser(object): > self.addPrereq(m.group(1)) > continue > >+ m = Parser.reMustRemakeTarget.search(line) >+ if m: >+ self.addTarget(m.group(1)) >+ continue >+ > m = Parser.reWasConsideredAlready.search(line) > if m: > self.addTarget(m.group(1))
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 193783
: 360052