Attachment 347528 Details for Bug 188755 – Patch v1

[patch] Patch v1

bug-188755-20180820122935.patch (text/plain), 1.48 KB, created by David Kilzer (:ddkilzer) on 2018-08-20 12:29:36 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: David Kilzer (:ddkilzer)

Created: 2018-08-20 12:29:36 PDT

Size: 1.48 KB

patch

obsolete

>Subversion Revision: 235015
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 773c9ac975fb03f2aa028f4eb37642c9d1197258..e8c5ce8f995df834849ca5d5feffd593062aea87 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-08-20  David Kilzer  <ddkilzer@apple.com>
>+
>+        sort-Xcode-project-file: top-level files and folders are sorted unintentionally when `mainGroup` has no name
>+        <https://webkit.org/b/188755>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/sort-Xcode-project-file: Fix regular expression to
>+        make `mainGroup` name optional.
>+
> 2018-08-18  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [iOS] Paste is missing from callout bar when pasteboard only contains custom data
>diff --git a/Tools/Scripts/sort-Xcode-project-file b/Tools/Scripts/sort-Xcode-project-file
>index fce21279dc90203f6b90686b752afeaea4fe86f0..c6b405c309c8cd5c99ef15ea40cad03ad602de72 100755
>--- a/Tools/Scripts/sort-Xcode-project-file
>+++ b/Tools/Scripts/sort-Xcode-project-file
>@@ -80,11 +80,11 @@ for my $projectFile (@ARGV) {
>         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);
>

Actions: View | Formatted Diff | Diff

Attachments on bug 188755: 347528 | 347592