[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
aroben at apple.com
aroben at apple.com
Wed Dec 22 16:13:38 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 6a52cc829b30c48e09fe49fe94c4832c1174378b
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 19 20:46:55 2010 +0000
Update scripts for .exe name changes after r72327
As of r72327, the "_debug" suffix is only used in Debug_All builds.
Reviewed by Sam Weinig.
* Scripts/run-javascriptcore-tests:
(testapiPath):
* Scripts/sunspider-compare-results:
(pathToBuiltJSC):
* Scripts/webkitdirs.pm:
(jscPath):
(safariPath):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72427 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 6c3c2d5..2b5f086 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,21 @@
+2010-11-19 Adam Roben <aroben at apple.com>
+
+ Update scripts for .exe name changes after r72327
+
+ As of r72327, the "_debug" suffix is only used in Debug_All builds.
+
+ Reviewed by Sam Weinig.
+
+ * Scripts/run-javascriptcore-tests:
+ (testapiPath):
+
+ * Scripts/sunspider-compare-results:
+ (pathToBuiltJSC):
+
+ * Scripts/webkitdirs.pm:
+ (jscPath):
+ (safariPath):
+
2010-11-19 Steve Falkenburg <sfalken at apple.com>
Reviewed by Darin Adler.
diff --git a/WebKitTools/Scripts/run-javascriptcore-tests b/WebKitTools/Scripts/run-javascriptcore-tests
index fb4c388..8e8c2ef 100755
--- a/WebKitTools/Scripts/run-javascriptcore-tests
+++ b/WebKitTools/Scripts/run-javascriptcore-tests
@@ -108,7 +108,7 @@ sub testapiPath($)
{
my ($productDir) = @_;
my $jscName = "testapi";
- $jscName .= "_debug" if (isCygwin() && ($configuration eq "Debug"));
+ $jscName .= "_debug" if configurationForVisualStudio() eq "Debug_All";
return "$productDir/$jscName";
}
diff --git a/WebKitTools/Scripts/sunspider-compare-results b/WebKitTools/Scripts/sunspider-compare-results
index 193ee8f..97e0b67 100755
--- a/WebKitTools/Scripts/sunspider-compare-results
+++ b/WebKitTools/Scripts/sunspider-compare-results
@@ -93,7 +93,7 @@ sub pathToBuiltJSC($)
{
my ($productDir) = @_;
my $jscName = "jsc";
- $jscName .= "_debug" if (isCygwin() && ($configuration eq "Debug"));
+ $jscName .= "_debug" if configurationForVisualStudio() eq "Debug_All";
return "$productDir/$jscName";
}
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 126f415..3ccbcb0 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -253,7 +253,7 @@ sub jscPath($)
{
my ($productDir) = @_;
my $jscName = "jsc";
- $jscName .= "_debug" if (isCygwin() && ($configuration eq "Debug"));
+ $jscName .= "_debug" if configurationForVisualStudio() eq "Debug_All";
$jscName .= ".exe" if (isWindows() || isCygwin());
return "$productDir/$jscName" if -e "$productDir/$jscName";
return "$productDir/JavaScriptCore.framework/Resources/$jscName";
@@ -544,7 +544,7 @@ sub safariPath
my $path = "$configurationProductDir/Safari.exe";
my $debugPath = "$configurationProductDir/Safari_debug.exe";
- if (configurationForVisualStudio() =~ /Debug/ && -x $debugPath) {
+ if (configurationForVisualStudio() eq "Debug_All" && -x $debugPath) {
$safariBundle = $debugPath;
} elsif (-x $path) {
$safariBundle = $path;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list