Title: [275631] branches/safari-611-branch
Revision
275631
Author
[email protected]
Date
2021-04-07 15:11:08 -0700 (Wed, 07 Apr 2021)

Log Message

Cherry-pick r275541. rdar://problem/76367015

    Speculative build fix for Windows port.
    https://bugs.webkit.org/show_bug.cgi?id=224243
    rdar://75883248

    Reviewed by Saam Barati.

    Source/cmake/tools/scripts/auto-version.pl was limiting our `minor` and `micro`
    version to only 2 decimal digits only.  In practice, we can use up to 3 digits.

    * Source/cmake/tools/scripts/auto-version.pl:
    (packTwoValues):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@275541 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-611-branch/ChangeLog (275630 => 275631)


--- branches/safari-611-branch/ChangeLog	2021-04-07 21:46:41 UTC (rev 275630)
+++ branches/safari-611-branch/ChangeLog	2021-04-07 22:11:08 UTC (rev 275631)
@@ -1,3 +1,36 @@
+2021-04-07  Ruben Turcios  <[email protected]>
+
+        Cherry-pick r275541. rdar://problem/76367015
+
+    Speculative build fix for Windows port.
+    https://bugs.webkit.org/show_bug.cgi?id=224243
+    rdar://75883248
+    
+    Reviewed by Saam Barati.
+    
+    Source/cmake/tools/scripts/auto-version.pl was limiting our `minor` and `micro`
+    version to only 2 decimal digits only.  In practice, we can use up to 3 digits.
+    
+    * Source/cmake/tools/scripts/auto-version.pl:
+    (packTwoValues):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@275541 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-04-06  Mark Lam  <[email protected]>
+
+            Speculative build fix for Windows port.
+            https://bugs.webkit.org/show_bug.cgi?id=224243
+            rdar://75883248
+
+            Reviewed by Saam Barati.
+
+            Source/cmake/tools/scripts/auto-version.pl was limiting our `minor` and `micro`
+            version to only 2 decimal digits only.  In practice, we can use up to 3 digits.
+
+            * Source/cmake/tools/scripts/auto-version.pl:
+            (packTwoValues):
+
 2021-03-03  Ruben Turcios  <[email protected]>
 
         Cherry-pick r273699. rdar://problem/74992920

Modified: branches/safari-611-branch/Source/cmake/tools/scripts/auto-version.pl (275630 => 275631)


--- branches/safari-611-branch/Source/cmake/tools/scripts/auto-version.pl	2021-04-07 21:46:41 UTC (rev 275630)
+++ branches/safari-611-branch/Source/cmake/tools/scripts/auto-version.pl	2021-04-07 22:11:08 UTC (rev 275631)
@@ -8,7 +8,7 @@
 use Cwd 'abs_path';
 use Win32;
 
-# Copyright (C) 2007, 2009, 2014 Apple Inc.  All rights reserved.
+# Copyright (C) 2007-2021 Apple Inc.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -122,7 +122,7 @@
     my $first = shift;
     my $second = shift;
 
-    die "First version component ($first) is too large. Must be between 0 and 99" if ($first > 99);
+    die "First version component ($first) is too large. Must be between 0 and 999" if ($first > 999);
     die "Second version component ($second) is too large. Must be between 0 and 999" if ($second > 999);
 
     return $first * 1000 + $second;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to