Title: [235136] trunk/Tools
- Revision
- 235136
- Author
- [email protected]
- Date
- 2018-08-21 14:08:23 -0700 (Tue, 21 Aug 2018)
Log Message
sort-Xcode-project-file: top-level files and folders are sorted unintentionally when `mainGroup` has no name
<https://webkit.org/b/188755>
Reviewed by Andy Estes.
* Scripts/sort-Xcode-project-file: Fix regular _expression_ to
make `mainGroup` name optional.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (235135 => 235136)
--- trunk/Tools/ChangeLog 2018-08-21 21:04:35 UTC (rev 235135)
+++ trunk/Tools/ChangeLog 2018-08-21 21:08:23 UTC (rev 235136)
@@ -1,3 +1,13 @@
+2018-08-21 David Kilzer <[email protected]>
+
+ sort-Xcode-project-file: top-level files and folders are sorted unintentionally when `mainGroup` has no name
+ <https://webkit.org/b/188755>
+
+ Reviewed by Andy Estes.
+
+ * Scripts/sort-Xcode-project-file: Fix regular _expression_ to
+ make `mainGroup` name optional.
+
2018-08-21 Andy VanWagoner <[email protected]>
Unreviewed, add myself to committers list.
Modified: trunk/Tools/Scripts/sort-Xcode-project-file (235135 => 235136)
--- trunk/Tools/Scripts/sort-Xcode-project-file 2018-08-21 21:04:35 UTC (rev 235135)
+++ trunk/Tools/Scripts/sort-Xcode-project-file 2018-08-21 21:08:23 UTC (rev 235136)
@@ -80,11 +80,11 @@
next;
}
- # Grab the mainGroup for the project file
+ # Grab the mainGroup for the project file.
my $mainGroup = "";
open(IN, "< $projectFile") || die "Could not open $projectFile: $!";
while (my $line = <IN>) {
- $mainGroup = $2 if $line =~ m#^(\s*)mainGroup = ([0-9A-F]{24} /\* .+ \*/);$#;
+ $mainGroup = $2 if $line =~ m#^(\s*)mainGroup = ([0-9A-F]{24}( /\* .+ \*/)?);$#;
}
close(IN);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
