[WinCairo] Move the destination of WinCairoRequirements.zip into WebKitLibraries...
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 16 Dec 2017 18:33:31 +0000 (18:33 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 16 Dec 2017 18:33:31 +0000 (18:33 +0000)
https://bugs.webkit.org/show_bug.cgi?id=180875

Patch by Basuke Suzuki <Basuke.Suzuki@sony.com> on 2017-12-16
Reviewed by Alex Christensen.

.:

Add files extracted from WinCairoRequirements.zip
* .gitignore:

Tools:

Bug fix. Specify the download destination correctly.

* Scripts/update-webkit-wincairo-libs.py:

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

.gitignore
ChangeLog
Tools/ChangeLog
Tools/Scripts/update-webkit-wincairo-libs.py

index 56caa89..f531517 100644 (file)
@@ -99,6 +99,13 @@ __cmake_systeminformation/
 /WebKitLibraries/win/lib*/pthreadVC2.lib
 /WebKitLibraries/win/lib*/zdll.lib
 
+# Ignore files installed by WinCairoRequirements
+/WebKitLibraries/win/WinCairoRequirements.zip
+/WebKitLibraries/win/WinCairoRequirements.zip.version
+/WebKitLibraries/win/etc/ssl/
+/WebKitLibraries/win/include/
+/WebKitLibraries/win/tools/
+
 # Ignore files generated by Qt Creator:
 *.pro.user
 
index a2161db..16e9d18 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2017-12-16  Basuke Suzuki  <Basuke.Suzuki@sony.com>
+
+        [WinCairo] Move the destination of WinCairoRequirements.zip into WebKitLibraries and register it and related files as git ignore files.
+        https://bugs.webkit.org/show_bug.cgi?id=180875
+
+        Reviewed by Alex Christensen.
+
+        Add files extracted from WinCairoRequirements.zip
+        * .gitignore:
+
 2017-12-14  Tomas Popela  <tpopela@redhat.com>
 
         Build should fail early is needed Perl modules are not installed
index d3578f1..0935914 100644 (file)
@@ -1,3 +1,14 @@
+2017-12-16  Basuke Suzuki  <Basuke.Suzuki@sony.com>
+
+        [WinCairo] Move the destination of WinCairoRequirements.zip into WebKitLibraries and register it and related files as git ignore files.
+        https://bugs.webkit.org/show_bug.cgi?id=180875
+
+        Reviewed by Alex Christensen.
+
+        Bug fix. Specify the download destination correctly.
+
+        * Scripts/update-webkit-wincairo-libs.py:
+
 2017-12-16  Brent Fulgham  <bfulgham@apple.com>
 
         Plugin processes are repeatedly spun up to do nothing
index 771c6e8..85c13bc 100644 (file)
@@ -33,7 +33,7 @@ repo = 'WebKitForWindows/WinCairoRequirements'
 file = 'WinCairoRequirements.zip'
 output = 'WebKitLibraries/win'
 
-result = download.main([repo, file])
+result = download.main(['-o', output, repo, file])
 
 # Only unzip if required
 if result == download.Status.DOWNLOADED: