Title: [120235] trunk/Tools
- Revision
- 120235
- Author
- [email protected]
- Date
- 2012-06-13 12:28:17 -0700 (Wed, 13 Jun 2012)
Log Message
[WinCairo] Update URL of WinCairoRequirements.zip download.
https://bugs.webkit.org/show_bug.cgi?id=89009
Reviewed by Martin Robinson.
* Tools/Scripts/update-webkit-dependency: Put fallback code
to download a "last update" time from servers that don't properly
report Last-Modified in their HTTP header.
* Tools/Scripts/update-webkit-wincairo-libs: Change download link
for the WinCairo build requirements bundle.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (120234 => 120235)
--- trunk/Tools/ChangeLog 2012-06-13 19:21:18 UTC (rev 120234)
+++ trunk/Tools/ChangeLog 2012-06-13 19:28:17 UTC (rev 120235)
@@ -1,3 +1,16 @@
+2012-06-13 Brent Fulgham <[email protected]>
+
+ [WinCairo] Update URL of WinCairoRequirements.zip download.
+ https://bugs.webkit.org/show_bug.cgi?id=89009
+
+ Reviewed by Martin Robinson.
+
+ * Tools/Scripts/update-webkit-dependency: Put fallback code
+ to download a "last update" time from servers that don't properly
+ report Last-Modified in their HTTP header.
+ * Tools/Scripts/update-webkit-wincairo-libs: Change download link
+ for the WinCairo build requirements bundle.
+
2012-06-13 Dirk Pranke <[email protected]>
nrwt: preliminary cleanup before supporting cascading expectations files
Modified: trunk/Tools/Scripts/update-webkit-dependency (120234 => 120235)
--- trunk/Tools/Scripts/update-webkit-dependency 2012-06-13 19:21:18 UTC (rev 120234)
+++ trunk/Tools/Scripts/update-webkit-dependency 2012-06-13 19:28:17 UTC (rev 120235)
@@ -76,16 +76,26 @@
my $result = system "curl -s -I -k --sslv3 $libsURL | grep Last-Modified > \"$tmpAbsDir/$file.headers\"";
if (WEXITSTATUS($result)) {
- print STDERR "Couldn't check Last-Modified date of new $zipFile.\n";
- print STDERR "Please ensure that $libsURL is reachable.\n";
- if (! -f "$webkitLibrariesDir/$file.headers") {
- print STDERR "Unable to check Last-Modified date and no version of $file to fall back to.\n";
- exit 1;
+ #Note: Neither GitHub nor DropBox emit the Last-Modified HTTP header, so fall back to a file
+ #containing the necessary information if we do not receive the information in our initial query.
+ my $headerURL = $libsURL;
+ $headerURL =~ s/\.zip$/\.headers/;
+
+ $result = system "curl -k --sslv3 -o \"$tmpAbsDir/$file.headers\" $headerURL";
+
+ if (WEXITSTATUS($result)) {
+ print STDERR "Couldn't check Last-Modified date of new $zipFile.\n";
+ print STDERR "Please ensure that $libsURL is reachable.\n";
+
+ if (! -f "$webkitLibrariesDir/$file.headers") {
+ print STDERR "Unable to check Last-Modified date and no version of $file to fall back to.\n";
+ exit 1;
+ }
+
+ print STDERR "Falling back to existing version of $file.\n";
+ exit 0;
}
-
- print STDERR "Falling back to existing version of $file.\n";
- exit 0;
}
if (open NEW, "$tmpAbsDir/$file.headers") {
Modified: trunk/Tools/Scripts/update-webkit-wincairo-libs (120234 => 120235)
--- trunk/Tools/Scripts/update-webkit-wincairo-libs 2012-06-13 19:21:18 UTC (rev 120234)
+++ trunk/Tools/Scripts/update-webkit-wincairo-libs 2012-06-13 19:28:17 UTC (rev 120235)
@@ -1,5 +1,6 @@
#!/usr/bin/perl -w
+# Copyright (C) 2012 Brent Fulgham <[email protected]>. All rights reserved.
# Copyright (C) 2011 Carl Lobo. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -33,8 +34,8 @@
use FindBin;
my $file = "WinCairoRequirements";
-my $zipFile = "$file.zip";
-my $winCairoLibsURL = "http://idisk.mac.com/bfulgham-Public/$zipFile";
+my $zipFile = "$file.zip";
+my $winCairoLibsURL = "http://dl.dropbox.com/u/39598926/$zipFile";
my $command = "$FindBin::Bin/update-webkit-dependency";
system("perl", $command, $winCairoLibsURL, ".") == 0 or die;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
