summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Giordano <tomgiordano83@gmail.com>2011-11-15 16:31:19 +1100
committerRicardo Cerqueira <cyanogenmod@cerqueira.org>2012-11-21 15:26:06 +0000
commita815c626d7df7e24ba9e0df27c27735d4e069ffd (patch)
tree2fccf8cffd741deea81156e282e505c6d5693181
parentf48fa4adc27def6277ddb81a531dfa4800838560 (diff)
downloadexternal_webkit-a815c626d7df7e24ba9e0df27c27735d4e069ffd.zip
external_webkit-a815c626d7df7e24ba9e0df27c27735d4e069ffd.tar.gz
external_webkit-a815c626d7df7e24ba9e0df27c27735d4e069ffd.tar.bz2
webkit: fix for perl 5.14+
Change-Id: Id740fff1824d11fef21995d0c472f923e70b3a46
-rw-r--r--Source/WebCore/make-hash-tools.pl14
-rw-r--r--Source/WebKit/scripts/generate-webkitversion.pl1
2 files changed, 7 insertions, 8 deletions
diff --git a/Source/WebCore/make-hash-tools.pl b/Source/WebCore/make-hash-tools.pl
index 37639eb..629af85 100644
--- a/Source/WebCore/make-hash-tools.pl
+++ b/Source/WebCore/make-hash-tools.pl
@@ -20,7 +20,7 @@
# Boston, MA 02110-1301, USA.
use strict;
-use Switch;
+use feature qw{ switch };
use File::Basename;
my $outdir = $ARGV[0];
@@ -28,9 +28,9 @@ shift;
my $option = basename($ARGV[0],".gperf");
-switch ($option) {
+given ($option) {
-case "DocTypeStrings" {
+when ("DocTypeStrings") {
my $docTypeStringsGenerated = "$outdir/DocTypeStrings.cpp";
my $docTypeStringsGperf = $ARGV[0];
@@ -38,9 +38,9 @@ case "DocTypeStrings" {
system("gperf --key-positions=\"*\" -s 2 $docTypeStringsGperf > $docTypeStringsGenerated") == 0 || die "calling gperf failed: $?";
-} # case "DocTypeStrings"
+} # when "DocTypeStrings"
-case "ColorData" {
+when ("ColorData") {
my $colorDataGenerated = "$outdir/ColorData.cpp";
my $colorDataGperf = $ARGV[0];
@@ -48,6 +48,6 @@ case "ColorData" {
system("gperf --key-positions=\"*\" -D -s 2 $colorDataGperf > $colorDataGenerated") == 0 || die "calling gperf failed: $?";
-} # case "ColorData"
+} # when "ColorData"
-} # switch ($option)
+} # given ($option)
diff --git a/Source/WebKit/scripts/generate-webkitversion.pl b/Source/WebKit/scripts/generate-webkitversion.pl
index 1136277..8cdb418 100644
--- a/Source/WebKit/scripts/generate-webkitversion.pl
+++ b/Source/WebKit/scripts/generate-webkitversion.pl
@@ -39,7 +39,6 @@ use strict;
use Config;
use Getopt::Long;
use File::Path;
-use Switch;
my $usage = "generate-webkitversion --config WebKit/mac/Configurations/Version.xcconfig --outputDir <outputdir>";