Changeset 172419 in webkit

Timestamp:

Aug 11, 2014 4:40:52 PM (10 years ago)

Author:

mitz@apple.com

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.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/update-webkit (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-08-11  Dan Bernstein  <mitz@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  <bjonesbe@adobe.com>
 

trunk/Tools/Scripts/update-webkit

@@ -51 +51 @@
 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,
 ); 
 
@@ -59 +63 @@
     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;
@@ -81 +86 @@
     runSvnUpdate() if isSVNDirectory(".");
     runGitUpdate() if isGitDirectory(".");
-} elsif (isAppleWinWebKit()) {
+}
+
+if (isAppleWinWebKit() && $auxiliaryLibs) {
     system("perl", "Tools/Scripts/update-webkit-auxiliary-libs") == 0 or die;
     if (isWinCairo()) {