Bug 22555 – Sort "children" sections in Xcode project files

• Component: Tools / Tests
• Status: RESOLVED FIXED

[David Kilzer (:ddkilzer)]

*SUMMARY
The sort-Xcode-project-file script currently only sorts "files" sections of an Xcode project file.  It would be nice if it also sorted the "children" sections (leaving groups or folders at the top) to provide more alphabetic goodness when using Xcode.

[David Kilzer (:ddkilzer)]

Created attachment 25596 [details]
Patch v1

Proposed patch.

Note that I found some duplicate header files listed in WebCore's Xcode project after running this script on it.

[Darin Adler]

Comment on attachment 25596 [details]
Patch v1

r=me

[David Kilzer (:ddkilzer)]

Comment on attachment 25596 [details]
Patch v1

Clearing Darin Adler's review+ flag after landing the patch.

$ git svn dcommit
Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	WebKitTools/ChangeLog
	M	WebKitTools/Scripts/sort-Xcode-project-file
Committed r39045

http://trac.webkit.org/changeset/39045

I want individual Xcode project updates reviewed before landing them in case there are objections.

[David Kilzer (:ddkilzer)]

Created attachment 25794 [details]
Sort "children" and "files" sections of Xcode project files

Posting this for review in case there are any red flags.

The only section that people may have issues with is the "main" section immediately under the project itself.  I can back out changes to those sections in each Xcode project file if needed.  (I just want the rest resorted.)

Will commit individual changes for each project file when landing this (with a ChangeLog entry).

Also, the duplicates in WebCore's project file will be resolved after sorting.

[David Kilzer (:ddkilzer)]

Created attachment 25795 [details]
Patch remove WebCore duplicates after sorting

Patch to remove duplicate entries from WebCore's Xcode project file after sorting.

Will add ChangeLog entry when committing this.

[Eric Seidel (no email)]

Comment on attachment 25794 [details]
Sort "children" and "files" sections of Xcode project files

This looks fine.  rubber-stamp = me.  Regarding the "main" section, I think that we should match whatever the sort order is for default XCode projects that people (especially apple-ites) are used to.  But I don't really have a very strong opinion on that.

Thanks for doing this!

[Eric Seidel (no email)]

Comment on attachment 25795 [details]
Patch remove WebCore duplicates after sorting

So hot.  Like butter.  ChangeLog please.

[David Kilzer (:ddkilzer)]

(In reply to comment #6)
> (From update of attachment 25794 [details] [review])
> This looks fine.  rubber-stamp = me.  Regarding the "main" section, I think
> that we should match whatever the sort order is for default XCode projects that
> people (especially apple-ites) are used to.  But I don't really have a very
> strong opinion on that.

xenon, bdash and smfr didn't want the main section sorted (the one immediately below the top-level project), so I will back out those changes before I land any patches.

I may endeavor to update the script to ignore that section as well, if I can figure out how to identify it generically.

[David Kilzer (:ddkilzer)]

Created attachment 25858 [details]
Don't sort mainGroup

Don't sort the mainGroup in a project file (the top-level group under the project file).

[David Kilzer (:ddkilzer)]

Comment on attachment 25858 [details]
Don't sort mainGroup

Clearing Timothy Hatcher's reivew+ flag:

$ git svn dcommit
Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	WebKitTools/ChangeLog
	M	WebKitTools/Scripts/sort-Xcode-project-file
Committed r39107

http://trac.webkit.org/changeset/39107

[David Kilzer (:ddkilzer)]

Comment on attachment 25794 [details]
Sort "children" and "files" sections of Xcode project files

Clearing Eric Seidel's review+ on this attachment.  Note that this patch wasn't landed; I reran the script after adding code to ignore the mainGroup children section.

$ git svn dcommit
Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	JavaScriptCore/ChangeLog
	M	JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
	M	JavaScriptGlue/ChangeLog
	M	JavaScriptGlue/JavaScriptGlue.xcodeproj/project.pbxproj
	M	WebCore/ChangeLog
	M	WebCore/WebCore.xcodeproj/project.pbxproj
	M	WebCore/manual-tests/NPN_Invoke/NPN_Invoke.xcodeproj/project.pbxproj
	M	WebKit/ChangeLog
	M	WebKit/WebKit.xcodeproj/project.pbxproj
	M	WebKitExamplePlugins/ChangeLog
	M	WebKitExamplePlugins/NetscapeCocoaPlugin/NetscapeCocoaPlugin.xcodeproj/project.pbxproj
	M	WebKitTools/ChangeLog
	M	WebKitTools/DrawTest/DrawTest.xcodeproj/project.pbxproj
	M	WebKitTools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
	M	WebKitTools/WebKitLauncher/WebKitLauncher.xcodeproj/project.pbxproj
Committed r39109

http://trac.webkit.org/changeset/39109

[David Kilzer (:ddkilzer)]

Comment on attachment 25795 [details]
Patch remove WebCore duplicates after sorting

Clearing Eric Seidel's review+ flag on this patch.  Landed as:

$ git svn dcommit
Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	WebCore/ChangeLog
	M	WebCore/WebCore.xcodeproj/project.pbxproj
Committed r39112

http://trac.webkit.org/changeset/39112

[David Kilzer (:ddkilzer)]

This bug is now fixed.