Title: [172419] trunk/Tools
- Revision
- 172419
- Author
- m...@apple.com
- Date
- 2014-08-11 16:40:52 -0700 (Mon, 11 Aug 2014)
Log Message
Added an update-webkit option to update the auxiliary libraries or not.
Part of https://bugs.webkit.org/show_bug.cgi?id=135815
Reviewed by Tim Horton.
* Scripts/update-webkit: Added --[no-]auxiliary-libs option, which defaults to yes unless
an Internal directory exists alongside the WebKit root directory.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (172418 => 172419)
--- trunk/Tools/ChangeLog 2014-08-11 23:26:26 UTC (rev 172418)
+++ trunk/Tools/ChangeLog 2014-08-11 23:40:52 UTC (rev 172419)
@@ -1,3 +1,13 @@
+2014-08-11 Dan Bernstein <m...@apple.com>
+
+ Added an update-webkit option to update the auxiliary libraries or not.
+ Part of https://bugs.webkit.org/show_bug.cgi?id=135815
+
+ Reviewed by Tim Horton.
+
+ * Scripts/update-webkit: Added --[no-]auxiliary-libs option, which defaults to yes unless
+ an Internal directory exists alongside the WebKit root directory.
+
2014-08-11 Bem Jones-Bey <bjone...@adobe.com>
Remove hg changeset from w3c-import.log
Modified: trunk/Tools/Scripts/update-webkit (172418 => 172419)
--- trunk/Tools/Scripts/update-webkit 2014-08-11 23:26:26 UTC (rev 172418)
+++ trunk/Tools/Scripts/update-webkit 2014-08-11 23:40:52 UTC (rev 172419)
@@ -50,17 +50,22 @@
chdirWebKit();
+# FIXME: Remove the check for ../Internal once Apple-internal users of this script pass --no-auxiliary-libs
+my $auxiliaryLibs = ! -d "../Internal";
+
my $getOptionsResult = GetOptions(
'h|help' => \$showHelp,
'q|quiet' => \$quiet,
+ 'auxiliary-libs!' => \$auxiliaryLibs,
);
if (!$getOptionsResult || $showHelp) {
print STDERR <<__END__;
Usage: @{[ basename($0) ]} [options]
- -h|--help show the help message
- -q|--quiet pass -q to svn update for quiet updates
- --wincairo also update dependencies of the WinCairo port
+ -h|--help show the help message
+ -q|--quiet pass -q to svn update for quiet updates
+ --[no-]auxiliary-libs [don\'t] update the auxiliary libraries for Windows (default: update)
+ --wincairo also update dependencies of the WinCairo port
__END__
exit 1;
}
@@ -80,7 +85,9 @@
print "Updating Internal\n" unless $quiet;
runSvnUpdate() if isSVNDirectory(".");
runGitUpdate() if isGitDirectory(".");
-} elsif (isAppleWinWebKit()) {
+}
+
+if (isAppleWinWebKit() && $auxiliaryLibs) {
system("perl", "Tools/Scripts/update-webkit-auxiliary-libs") == 0 or die;
if (isWinCairo()) {
# WinCairo shares the auxiliary libs from the Apple port.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
