Changeset 223454 in webkit

Timestamp:

Oct 16, 2017 7:30:58 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

[Win] Webkit should still be able to build when unable to check if libraries are up to date
​https://bugs.webkit.org/show_bug.cgi?id=178367

Adding a option to skip the check to see if windows libraries are up to date.
This option is useful when testing modified libraries. This option also allows
building webkit when GitHub blocks requests to verify the latest library version.

Patch by Christopher Reid <​chris.reid@sony.com> on 2017-10-16
Reviewed by Per Arne Vollan.

• Scripts/build-webkit:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/build-webkit (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-10-16  Christopher Reid  <chris.reid@sony.com>
+
+        [Win] Webkit should still be able to build when unable to check if libraries are up to date
+        https://bugs.webkit.org/show_bug.cgi?id=178367
+
+        Adding a option to skip the check to see if windows libraries are up to date.
+        This option is useful when testing modified libraries. This option also allows
+        building webkit when GitHub blocks requests to verify the latest library version.
+
+
+        Reviewed by Per Arne Vollan.
+
+        * Scripts/build-webkit:
+
 2017-10-12  Matt Rajca  <mrajca@apple.com>
 

trunk/Tools/Scripts/build-webkit

@@ -66 +66 @@
 my $startTime = time();
 my $archs32bit = 0;
+my $skipLibraryUpdate = 0;
 
 my @features = getFeatureOptionList();
@@ -118 +119 @@
   --only-webkit                     Build only the WebKit project
 
+  --skip-library-update             Skip the check to see if windows libraries are up to date
+
 EOF
 
@@ -134 +137 @@
     'analyze' => \$shouldRunStaticAnalyzer,
     'default-cmake-features' => \$defaultCMakeFeatures,
+    'skip-library-update' => \$skipLibraryUpdate
 );
 
@@ -224 +228 @@
     push @projects, ("Tools/DumpRenderTree", "Tools/WebKitTestRunner", "Source/ThirdParty/gtest", "Tools/TestWebKitAPI");
 
-} elsif (isWinCairo()) {
+} elsif (isWinCairo() && !$skipLibraryUpdate) {
     (system("python Tools/Scripts/update-webkit-wincairo-libs.py") == 0) or die;
-} elsif (isAppleWinWebKit()) {
+} elsif (isAppleWinWebKit() && !$skipLibraryUpdate) {
     # Copy WebKitSupportLibrary to the correct location in WebKitLibraries so it can be found.
     # Will fail if WebKitSupportLibrary.zip is not in source root.