[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

ossy at webkit.org ossy at webkit.org
Wed Dec 22 13:22:47 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 1b6e4e57f453be706da3215b73474fe665bd8791
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 13 16:17:53 2010 +0000

    2010-09-13  Csaba Osztrogonác  <ossy at webkit.org>
    
            Reviewed by Andreas Kling.
    
            jscPath() is incorrect in Windows' cmd.exe shell
            https://bugs.webkit.org/show_bug.cgi?id=45651
    
            * Scripts/webkitdirs.pm: Add ".exe" suffix to $jscName on Windows.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67391 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 5808341..64f640d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-13  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        jscPath() is incorrect in Windows' cmd.exe shell
+        https://bugs.webkit.org/show_bug.cgi?id=45651
+
+        * Scripts/webkitdirs.pm: Add ".exe" suffix to $jscName on Windows.
+
 2010-09-13  Chris Fleizach  <cfleizach at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index b4d3f60..2980750 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -258,6 +258,7 @@ sub jscPath($)
     my ($productDir) = @_;
     my $jscName = "jsc";
     $jscName .= "_debug"  if (isCygwin() && ($configuration eq "Debug"));
+    $jscName .= ".exe" if (isWindows() || isCygwin());
     return "$productDir/$jscName" if -e "$productDir/$jscName";
     return "$productDir/JavaScriptCore.framework/Resources/$jscName";
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list