Diff
Modified: trunk/Tools/ChangeLog (191771 => 191772)
--- trunk/Tools/ChangeLog 2015-10-30 01:46:10 UTC (rev 191771)
+++ trunk/Tools/ChangeLog 2015-10-30 03:04:12 UTC (rev 191772)
@@ -1,3 +1,16 @@
+2015-10-29 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r191766.
+ https://bugs.webkit.org/show_bug.cgi?id=150707
+
+ Problem with Cygwin build (Requested by bfulgham_ on #webkit).
+
+ Reverted changeset:
+
+ "[Win] build-jsc and run-_javascript_core-tests do not work"
+ https://bugs.webkit.org/show_bug.cgi?id=150700
+ http://trac.webkit.org/changeset/191766
+
2015-10-29 Brent Fulgham <[email protected]>
[Win] build-jsc and run-_javascript_core-tests do not work
Modified: trunk/Tools/Scripts/build-jsc (191771 => 191772)
--- trunk/Tools/Scripts/build-jsc 2015-10-30 01:46:10 UTC (rev 191771)
+++ trunk/Tools/Scripts/build-jsc 2015-10-30 03:04:12 UTC (rev 191772)
@@ -101,8 +101,7 @@
$makeArgs .= ($makeArgs ? " " : "") . "-j" . numberOfCPUs() if $makeArgs !~ /-j\s*\d+/;
# This call only returns if nothing wrong happened
- my $testapi = (isAnyWindows() ? "testapi" : "");
- buildCMakeProjectOrExit(0, cmakeBasedPortName(), undef, "jsc $testapi $makeArgs", (cmakeBasedPortArguments(), $cmakeArgs));
+ buildCMakeProjectOrExit(0, cmakeBasedPortName(), undef, "jsc $makeArgs", (cmakeBasedPortArguments(), $cmakeArgs));
writeCongrats();
exit exitStatus(0);
}
Modified: trunk/Tools/Scripts/build-webkit (191771 => 191772)
--- trunk/Tools/Scripts/build-webkit 2015-10-30 01:46:10 UTC (rev 191771)
+++ trunk/Tools/Scripts/build-webkit 2015-10-30 03:04:12 UTC (rev 191772)
@@ -252,15 +252,15 @@
my $baseProductDir = baseProductDir();
if (isAppleWinWebKit() || isWinCairo()) {
chdirWebKit();
- if (exitStatus(generateBuildSystemFromCMakeProject(cmakeBasedPortName()))) {
- die "Run \"C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/vcvarsall.bat\" before build-webkit when using ninja";
+ if (exitStatus(generateBuildSystemFromCMakeProject(isWinCairo() ? "WinCairo" : "AppleWin"))) {
+ die "Run \"C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/vcvarsall.bat\" before build-webkit when using ninja";
}
chdirWebKit();
if (canUseNinja()) {
- chdir File::Spec->catdir("WebKitBuild", configuration());
+ chdir "WebKitBuild/" . configuration();
$result = system("ninja");
} else {
- $result = buildVisualStudioProject(File::Spec->catfile("WebKitBuild", configuration(), "WebKit.sln"), $clean);
+ $result = buildVisualStudioProject("WebKitBuild/" . configuration() . "/WebKit.sln", $clean);
}
if (exitStatus($result)) {
my $scriptDir = relativeScriptsDir();
Modified: trunk/Tools/Scripts/run-_javascript_core-tests (191771 => 191772)
--- trunk/Tools/Scripts/run-_javascript_core-tests 2015-10-30 01:46:10 UTC (rev 191771)
+++ trunk/Tools/Scripts/run-_javascript_core-tests 2015-10-30 03:04:12 UTC (rev 191772)
@@ -145,7 +145,7 @@
push(@buildArgs, argumentsForConfiguration());
print "Running: build-jsc " . join(" ", @buildArgs) . "\n";
- my $buildResult = system "perl", File::Spec->catfile("Tools", "Scripts", "build-jsc"), @buildArgs;
+ my $buildResult = system "perl", "Tools/Scripts/build-jsc", @buildArgs;
if ($buildResult) {
print STDERR "Compiling jsc failed!\n";
exit exitStatus($buildResult);
@@ -171,7 +171,7 @@
my ($productDir) = @_;
my $jscName = "testapi";
$jscName .= "_debug" if configuration() eq "Debug_All";
- return File::Spec->catfile($productDir, $jscName);
+ return "$productDir/$jscName";
}
#run api tests
Modified: trunk/Tools/Scripts/run-jsc (191771 => 191772)
--- trunk/Tools/Scripts/run-jsc 2015-10-30 01:46:10 UTC (rev 191771)
+++ trunk/Tools/Scripts/run-jsc 2015-10-30 03:04:12 UTC (rev 191772)
@@ -44,7 +44,7 @@
setConfiguration();
-my $jsc = File::Spec->catfile(jscProductDir(), "jsc ") . "@ARGV";
+my $jsc = jscProductDir() . "/jsc @ARGV";
my $dyld = jscProductDir();
Modified: trunk/Tools/Scripts/webkitdirs.pm (191771 => 191772)
--- trunk/Tools/Scripts/webkitdirs.pm 2015-10-30 01:46:10 UTC (rev 191771)
+++ trunk/Tools/Scripts/webkitdirs.pm 2015-10-30 03:04:12 UTC (rev 191772)
@@ -2040,8 +2040,6 @@
return "Efl" if isEfl();
return "GTK" if isGtk();
return "Mac" if isAppleMacWebKit();
- return "WinCairo" if isWinCairo();
- return "AppleWin" if isAppleWinWebKit();
return "";
}
@@ -2053,7 +2051,7 @@
sub isCMakeBuild()
{
- if (isEfl() || isGtk() || isAnyWindows()) {
+ if (isEfl() || isGtk()) {
return 1;
}
determineIsCMakeBuild();
