Title: [179180] trunk/Tools
- Revision
- 179180
- Author
- [email protected]
- Date
- 2015-01-27 07:32:20 -0800 (Tue, 27 Jan 2015)
Log Message
REGRESSION (r179130): Perl warns about subroutine redefinition when running configure-xcode-for-ios-development
https://bugs.webkit.org/show_bug.cgi?id=140939
Reviewed by Eric Carlson.
Fixes the Perl warning: "Subroutine wanted redefined at Tools/Scripts/configure-xcode-for-ios-development line 106."
* Scripts/webkitdirs.pm:
(hasUserInstalledAppInSimulatorDevice): Pass a reference to an anonymous function instead
of a named function to find() to avoid redefinition warnings in scripts that include webkitdirs.pm
and define a function called wanted.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (179179 => 179180)
--- trunk/Tools/ChangeLog 2015-01-27 15:16:36 UTC (rev 179179)
+++ trunk/Tools/ChangeLog 2015-01-27 15:32:20 UTC (rev 179180)
@@ -1,5 +1,19 @@
2015-01-27 Daniel Bates <[email protected]>
+ REGRESSION (r179130): Perl warns about subroutine redefinition when running configure-xcode-for-ios-development
+ https://bugs.webkit.org/show_bug.cgi?id=140939
+
+ Reviewed by Eric Carlson.
+
+ Fixes the Perl warning: "Subroutine wanted redefined at Tools/Scripts/configure-xcode-for-ios-development line 106."
+
+ * Scripts/webkitdirs.pm:
+ (hasUserInstalledAppInSimulatorDevice): Pass a reference to an anonymous function instead
+ of a named function to find() to avoid redefinition warnings in scripts that include webkitdirs.pm
+ and define a function called wanted.
+
+2015-01-27 Daniel Bates <[email protected]>
+
Teach run-webkit-app --simulator how to install custom built app
https://bugs.webkit.org/show_bug.cgi?id=140691
Modified: trunk/Tools/Scripts/webkitdirs.pm (179179 => 179180)
--- trunk/Tools/Scripts/webkitdirs.pm 2015-01-27 15:16:36 UTC (rev 179179)
+++ trunk/Tools/Scripts/webkitdirs.pm 2015-01-27 15:32:20 UTC (rev 179180)
@@ -2171,7 +2171,7 @@
return 0; # No user installed apps.
}
local @::userInstalledAppBundles;
- sub wanted {
+ my $wantedFunction = sub {
my $file = $_;
# Ignore hidden files and directories.
@@ -2183,8 +2183,8 @@
return if !-d $file || $file !~ /\.app$/;
push @::userInstalledAppBundles, $File::Find::name;
$File::Find::prune = 1; # Do not traverse contents of app bundle.
- }
- find(\&wanted, $userInstalledAppPath);
+ };
+ find($wantedFunction, $userInstalledAppPath);
for my $userInstalledAppBundle (@::userInstalledAppBundles) {
if (appIdentifierFromBundle($userInstalledAppBundle) eq $appIdentifier) {
return 1; # Has user installed app.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
