[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[ddkilzer at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 026bca0db837cc7d04eeb75f559ab8557bc0a04e
Author: ddkilzer at apple.com <ddkilzer at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 30 17:15:22 2009 +0000

    2009-09-30  Csaba Osztrogonac  <oszi at inf.u-szeged.hu>
    
            Reviewed by David Kilzer.
    
            Make sunspider scripts work on Windows platform.
            https://bugs.webkit.org/show_bug.cgi?id=29656
    
            * Scripts/run-sunspider: Perl scripts invoked with same Perl interpreter.
            * Scripts/sunspider-compare-results: Perl scripts invoked with same Perl interpreter.
            * Scripts/webkitdirs.pm: currentPerlPath() added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48931 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f9928d7..2911096 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2009-09-30  Csaba Osztrogonac  <oszi at inf.u-szeged.hu>
+
+        Reviewed by David Kilzer.
+
+        Make sunspider scripts work on Windows platform.
+        https://bugs.webkit.org/show_bug.cgi?id=29656
+
+        * Scripts/run-sunspider: Perl scripts invoked with same Perl interpreter.
+        * Scripts/sunspider-compare-results: Perl scripts invoked with same Perl interpreter.
+        * Scripts/webkitdirs.pm: currentPerlPath() added.
+
 2009-09-29  Brady Eidson  <beidson at apple.com>
 
         Rubberstamped by Dan Bernstein.
diff --git a/WebKitTools/Scripts/run-sunspider b/WebKitTools/Scripts/run-sunspider
index f6bc779..367fd06 100755
--- a/WebKitTools/Scripts/run-sunspider
+++ b/WebKitTools/Scripts/run-sunspider
@@ -87,7 +87,7 @@ sub buildJSC
         push(@ARGV,  "--" . $configuration);
         
         chdirWebKit();
-        my $buildResult = system "WebKitTools/Scripts/build-jsc", @ARGV;
+        my $buildResult = system currentPerlPath(), "WebKitTools/Scripts/build-jsc", @ARGV;
         if ($buildResult) {
             print STDERR "Compiling jsc failed!\n";
             exit exitStatus($buildResult);
@@ -133,4 +133,4 @@ push @args, "--v8" if $v8;
 push @args, "--parse-only" if $parseonly;
 push @args, "--tests", $testsPattern if $testsPattern;
 
-exec "./sunspider", @args;
+exec currentPerlPath(), "./sunspider", @args;
diff --git a/WebKitTools/Scripts/sunspider-compare-results b/WebKitTools/Scripts/sunspider-compare-results
index d219896..ce87a23 100755
--- a/WebKitTools/Scripts/sunspider-compare-results
+++ b/WebKitTools/Scripts/sunspider-compare-results
@@ -67,7 +67,7 @@ sub buildJSC
 {
     if (!defined($root)){
         chdirWebKit();
-        my $buildResult = system "WebKitTools/Scripts/build-jsc", "--" . $configuration;
+        my $buildResult = system currentPerlPath(), "WebKitTools/Scripts/build-jsc", "--" . $configuration;
         if ($buildResult) {
             print STDERR "Compiling jsc failed!\n";
             exit WEXITSTATUS($buildResult);
@@ -124,4 +124,4 @@ my @args = ("--shell", $jscPath);
 push @args, "--ubench" if $ubench;
 push @args, "--v8" if $v8;
 
-exec "./sunspider-compare-results", @args, @ARGV;
+exec currentPerlPath(), "./sunspider-compare-results", @args, @ARGV;
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 3c7b537..60975ef 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -29,6 +29,7 @@
 
 use strict;
 use warnings;
+use Config;
 use FindBin;
 use File::Basename;
 use File::Spec;
@@ -85,6 +86,15 @@ sub determineSourceDir
     $sourceDir = "$sourceDir/OpenSource" if -d "$sourceDir/OpenSource";
 }
 
+sub currentPerlPath()
+{
+    my $thisPerl = $^X;
+    if ($^O ne 'VMS') {
+        $thisPerl .= $Config{_exe} unless $thisPerl =~ m/$Config{_exe}$/i;
+    }
+    return $thisPerl;
+}
+
 # used for scripts which are stored in a non-standard location
 sub setSourceDir($)
 {

-- 
WebKit Debian packaging