Title: [224764] trunk/Tools
- Revision
- 224764
- Author
- [email protected]
- Date
- 2017-11-13 11:47:34 -0800 (Mon, 13 Nov 2017)
Log Message
Uninitialized variable in sort-Xcode-project-file
https://bugs.webkit.org/show_bug.cgi?id=179581
Reviewed by Simon Fraser.
Previously all the unified source files were named
UnifiedSource<some-number>.mm. This was changed to
UnifiedSource<some-number>-mm.mm to stop Xcode from creating
hashes for mm and cpp unified source files with the same
number. This broke the expectations in sort-Xcode-project-file.
* Scripts/sort-Xcode-project-file:
(sortChildrenByFileName):
(sortFilesByFileName):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (224763 => 224764)
--- trunk/Tools/ChangeLog 2017-11-13 19:33:19 UTC (rev 224763)
+++ trunk/Tools/ChangeLog 2017-11-13 19:47:34 UTC (rev 224764)
@@ -1,3 +1,20 @@
+2017-11-13 Keith Miller <[email protected]>
+
+ Uninitialized variable in sort-Xcode-project-file
+ https://bugs.webkit.org/show_bug.cgi?id=179581
+
+ Reviewed by Simon Fraser.
+
+ Previously all the unified source files were named
+ UnifiedSource<some-number>.mm. This was changed to
+ UnifiedSource<some-number>-mm.mm to stop Xcode from creating
+ hashes for mm and cpp unified source files with the same
+ number. This broke the expectations in sort-Xcode-project-file.
+
+ * Scripts/sort-Xcode-project-file:
+ (sortChildrenByFileName):
+ (sortFilesByFileName):
+
2017-11-13 JF Bastien <[email protected]>
std::expected: fix and test move
Modified: trunk/Tools/Scripts/sort-Xcode-project-file (224763 => 224764)
--- trunk/Tools/Scripts/sort-Xcode-project-file 2017-11-13 19:33:19 UTC (rev 224763)
+++ trunk/Tools/Scripts/sort-Xcode-project-file 2017-11-13 19:47:34 UTC (rev 224764)
@@ -161,8 +161,8 @@
return !$aSuffix ? -1 : 1;
}
if ($aFileName =~ /^UnifiedSource\d+/ && $bFileName =~ /^UnifiedSource\d+/) {
- my $aNumber = $1 if $aFileName =~ /^UnifiedSource(\d+)\./;
- my $bNumber = $1 if $bFileName =~ /^UnifiedSource(\d+)\./;
+ my $aNumber = $1 if $aFileName =~ /^UnifiedSource(\d+)/;
+ my $bNumber = $1 if $bFileName =~ /^UnifiedSource(\d+)/;
return $aNumber <=> $bNumber;
}
return lc($aFileName) cmp lc($bFileName);
@@ -174,8 +174,8 @@
my $aFileName = $1 if $a =~ /^\s*[A-Z0-9]{24} \/\* (.+) in /;
my $bFileName = $1 if $b =~ /^\s*[A-Z0-9]{24} \/\* (.+) in /;
if ($aFileName =~ /^UnifiedSource\d+/ && $bFileName =~ /^UnifiedSource\d+/) {
- my $aNumber = $1 if $aFileName =~ /^UnifiedSource(\d+)\./;
- my $bNumber = $1 if $bFileName =~ /^UnifiedSource(\d+)\./;
+ my $aNumber = $1 if $aFileName =~ /^UnifiedSource(\d+)/;
+ my $bNumber = $1 if $bFileName =~ /^UnifiedSource(\d+)/;
return $aNumber <=> $bNumber;
}
return lc($aFileName) cmp lc($bFileName);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
