Title: [172795] trunk/Tools
- Revision
- 172795
- Author
- m...@apple.com
- Date
- 2014-08-19 20:02:16 -0700 (Tue, 19 Aug 2014)
Log Message
update-webkit should not check for the presence of Apple’s Internal directory
Last part of https://bugs.webkit.org/show_bug.cgi?id=135815
Reviewed by Tim Horton.
* Scripts/update-webkit:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (172794 => 172795)
--- trunk/Tools/ChangeLog 2014-08-20 02:38:46 UTC (rev 172794)
+++ trunk/Tools/ChangeLog 2014-08-20 03:02:16 UTC (rev 172795)
@@ -1,3 +1,12 @@
+2014-08-19 Dan Bernstein <m...@apple.com>
+
+ update-webkit should not check for the presence of Apple’s Internal directory
+ Last part of https://bugs.webkit.org/show_bug.cgi?id=135815
+
+ Reviewed by Tim Horton.
+
+ * Scripts/update-webkit:
+
2014-08-19 Zalan Bujtas <za...@apple.com>
Remove ENABLE(SUBPIXEL_LAYOUT).
Modified: trunk/Tools/Scripts/update-webkit (172794 => 172795)
--- trunk/Tools/Scripts/update-webkit 2014-08-20 02:38:46 UTC (rev 172794)
+++ trunk/Tools/Scripts/update-webkit 2014-08-20 03:02:16 UTC (rev 172795)
@@ -47,15 +47,14 @@
chdirWebKit();
-# FIXME: Remove the check for ../Internal once Apple-internal users of this script pass --no-auxiliary-libs
-my $auxiliaryLibs = ! -d "../Internal";
-# FIXME: http://webkit.org/b/135815 update-webkit should not check for the presence of Apple's Internal directory
-my $internal = -d "../Internal";
+my $auxiliaryLibs;
+my $internal;
my $getOptionsResult = GetOptions(
'h|help' => \$showHelp,
'q|quiet' => \$quiet,
'auxiliary-libs!' => \$auxiliaryLibs,
+ # FIXME: This option is ignored. Remove it once no one in passing it in.
'internal!' => \$internal,
);
@@ -65,7 +64,6 @@
-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)
- --[no-]internal [don\'t] update ../Internal (default: update if it exists)
__END__
exit 1;
}
@@ -80,13 +78,6 @@
runSvnUpdateAndResolveChangeLogs(@svnOptions) if isSVN();
runGitUpdate() if isGit();
-if ($internal) {
- chdir("../Internal");
- print "Updating Internal\n" unless $quiet;
- runSvnUpdateAndResolveChangeLogs(@svnOptions) if isSVNDirectory(".");
- runGitUpdate() if isGitDirectory(".");
-}
-
if (isAppleWinWebKit() && $auxiliaryLibs) {
system("perl", "Tools/Scripts/update-webkit-auxiliary-libs") == 0 or die;
if (isWinCairo()) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
