<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[182089] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/182089">182089</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-03-27 16:08:01 -0700 (Fri, 27 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Support building WTF on Windows without Cygwin
https://bugs.webkit.org/show_bug.cgi?id=143084
Reviewed by Brent Fulgham.
Tools:
Windows without Cygwin doesn't have curl, unzip, or grep. Luckily, Perl does all of these things.
This patch also migrates to using File::Spec->catfile() for directory separators.
* Scripts/update-webkit-dependency:
(wanted):
* Scripts/update-webkit-support-libs:
(wanted):
(downloadExpectedVersionNumber):
(zipFileVersion):
(toUnixPath): Deleted.
* Scripts/webkitdirs.pm:
(determineSourceDir):
(windowsSourceSourceDir):
(windowsLibrariesDir):
(windowsOutputDir):
(checkInstalledTools):
(buildVisualStudioProject):
Source/WTF:
Windows doesn't have "touch".
* WTF.vcxproj/WTFGenerated.make:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojWTFGeneratedmake">trunk/Source/WTF/WTF.vcxproj/WTFGenerated.make</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsupdatewebkitdependency">trunk/Tools/Scripts/update-webkit-dependency</a></li>
<li><a href="#trunkToolsScriptsupdatewebkitsupportlibs">trunk/Tools/Scripts/update-webkit-support-libs</a></li>
<li><a href="#trunkToolsScriptswebkitdirspm">trunk/Tools/Scripts/webkitdirs.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (182088 => 182089)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-03-27 23:01:37 UTC (rev 182088)
+++ trunk/Source/WTF/ChangeLog 2015-03-27 23:08:01 UTC (rev 182089)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-03-27 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Support building WTF on Windows without Cygwin
+ https://bugs.webkit.org/show_bug.cgi?id=143084
+
+ Reviewed by Brent Fulgham.
+
+ Windows doesn't have "touch".
+
+ * WTF.vcxproj/WTFGenerated.make:
+
</ins><span class="cx"> 2015-03-26 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Progress towards CMake on Mac.
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFGeneratedmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTFGenerated.make (182088 => 182089)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/WTFGenerated.make 2015-03-27 23:01:37 UTC (rev 182088)
+++ trunk/Source/WTF/WTF.vcxproj/WTFGenerated.make 2015-03-27 23:08:01 UTC (rev 182089)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> all: WTFHeaderDetection.h
</span><del>- @touch "%ConfigurationBuildDir%\buildfailed"
</del><ins>+ @type NUL > "%ConfigurationBuildDir%\buildfailed"
</ins><span class="cx"> @perl build-generated-files.pl "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "$(DEBUGSUFFIX)" "%PlatformArchitecture%"
</span><span class="cx"> !IF "$(OFFICIAL_BUILD)"!="1"
</span><span class="cx"> -@python2.7 work-around-vs-dependency-tracking-bugs.py
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (182088 => 182089)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-03-27 23:01:37 UTC (rev 182088)
+++ trunk/Tools/ChangeLog 2015-03-27 23:08:01 UTC (rev 182089)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-03-27 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Support building WTF on Windows without Cygwin
+ https://bugs.webkit.org/show_bug.cgi?id=143084
+
+ Reviewed by Brent Fulgham.
+
+ Windows without Cygwin doesn't have curl, unzip, or grep. Luckily, Perl does all of these things.
+ This patch also migrates to using File::Spec->catfile() for directory separators.
+
+ * Scripts/update-webkit-dependency:
+ (wanted):
+ * Scripts/update-webkit-support-libs:
+ (wanted):
+ (downloadExpectedVersionNumber):
+ (zipFileVersion):
+ (toUnixPath): Deleted.
+ * Scripts/webkitdirs.pm:
+ (determineSourceDir):
+ (windowsSourceSourceDir):
+ (windowsLibrariesDir):
+ (windowsOutputDir):
+ (checkInstalledTools):
+ (buildVisualStudioProject):
+
</ins><span class="cx"> 2015-03-27 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix WinCairo bot.
</span></span></pre></div>
<a id="trunkToolsScriptsupdatewebkitdependency"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/update-webkit-dependency (182088 => 182089)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/update-webkit-dependency 2015-03-27 23:01:37 UTC (rev 182088)
+++ trunk/Tools/Scripts/update-webkit-dependency 2015-03-27 23:08:01 UTC (rev 182089)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> my $sourceDir = sourceDir();
</span><span class="cx"> my $file = getLibraryName($libsURL);
</span><span class="cx"> my $zipFile = "$file.zip";
</span><del>-my $webkitLibrariesDir = $ENV{'WEBKIT_LIBRARIES'} || "$sourceDir/WebKitLibraries/win";
</del><ins>+my $webkitLibrariesDir = $ENV{'WEBKIT_LIBRARIES'} || File::Spec->catdir($sourceDir, "WebKitLibraries", "win");
</ins><span class="cx"> my $tmpRelativeDir = File::Temp::tempdir("webkitlibsXXXXXXX", TMPDIR => 1, CLEANUP => 1);
</span><span class="cx"> my $tmpAbsDir = File::Spec->rel2abs($tmpRelativeDir);
</span><span class="cx">
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">
</span><span class="cx"> if (defined $modified_time) {
</span><span class="cx">
</span><del>- open NEW, ">", "$tmpAbsDir/$file.headers";
</del><ins>+ open NEW, ">", File::Spec->catfile($tmpAbsDir, "$file.headers");
</ins><span class="cx"> print NEW "Last-Modified: " . time2str($modified_time) . "\n";
</span><span class="cx"> close NEW;
</span><span class="cx">
</span><span class="lines">@@ -91,14 +91,14 @@
</span><span class="cx"> my $headerURL = $libsURL;
</span><span class="cx"> $headerURL =~ s/\.zip$/\.headers/;
</span><span class="cx">
</span><del>- my $result = getstore($headerURL, "$tmpAbsDir/$file.headers");
</del><ins>+ my $result = getstore($headerURL, File::Spec->catfile($tmpAbsDir, "$file.headers"));
</ins><span class="cx">
</span><span class="cx"> if (!is_success($result)) {
</span><span class="cx"> print STDERR "Couldn't check Last-Modified date of new $zipFile.\n";
</span><span class="cx"> print STDERR "Please ensure that Perl can use LWP::Simple to connect to HTTPS urls, and that $libsURL is reachable.\n";
</span><span class="cx"> print STDERR "You may have to run \$ cpan LWP::Protocol::https\n";
</span><span class="cx">
</span><del>- if (! -f "$webkitLibrariesDir/$file.headers") {
</del><ins>+ if (! -f File::Spec->catfile($webkitLibrariesDir, "$file.headers")) {
</ins><span class="cx"> print STDERR "Unable to check Last-Modified date and no version of $file to fall back to.\n";
</span><span class="cx"> exit 1;
</span><span class="cx"> }
</span><span class="lines">@@ -108,11 +108,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if (open NEW, "$tmpAbsDir/$file.headers") {
</del><ins>+if (open NEW, File::Spec->catfile($tmpAbsDir, "$file.headers")) {
</ins><span class="cx"> my $new = lastModifiedToUnixTime(<NEW>);
</span><span class="cx"> close NEW;
</span><span class="cx">
</span><del>- if (defined $new && open OLD, "$webkitLibrariesDir/$file.headers") {
</del><ins>+ if (defined $new && open OLD, File::Spec->catfile($webkitLibrariesDir, "$file.headers")) {
</ins><span class="cx"> my $old = lastModifiedToUnixTime(<OLD>);
</span><span class="cx"> close OLD;
</span><span class="cx"> if (defined $old && abs($new - $old) < $newnessThreshold) {
</span><span class="lines">@@ -124,10 +124,10 @@
</span><span class="cx">
</span><span class="cx"> print "Downloading $zipFile...\n\n";
</span><span class="cx"> print "$libsURL\n";
</span><del>-my $result = getstore($libsURL, "$tmpAbsDir/$zipFile");
</del><ins>+my $result = getstore($libsURL, File::Spec->catfile($tmpAbsDir, $zipFile));
</ins><span class="cx"> die "Couldn't download $zipFile!" if is_error($result);
</span><span class="cx">
</span><del>-my $zip = Archive::Zip->new("$tmpAbsDir/$zipFile");
</del><ins>+my $zip = Archive::Zip->new(File::Spec->catfile($tmpAbsDir, $zipFile));
</ins><span class="cx"> $result = $zip->extractTree("", $tmpAbsDir);
</span><span class="cx"> die "Couldn't unzip $zipFile." if $result != AZ_OK;
</span><span class="cx">
</span><span class="lines">@@ -135,8 +135,8 @@
</span><span class="cx">
</span><span class="cx"> sub wanted
</span><span class="cx"> {
</span><del>- my $relativeName = File::Spec->abs2rel($File::Find::name, "$tmpAbsDir/$file/$prefixInZip");
- my $destination = "$webkitLibrariesDir/$relativeName";
</del><ins>+ my $relativeName = File::Spec->abs2rel($File::Find::name, File::Spec->catdir($tmpAbsDir, $file, $prefixInZip));
+ my $destination = File::Spec->catfile($webkitLibrariesDir, $relativeName);
</ins><span class="cx">
</span><span class="cx"> if (-d $_) {
</span><span class="cx"> mkdir $destination;
</span><span class="lines">@@ -146,9 +146,9 @@
</span><span class="cx"> copy($_, $destination);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-File::Find::find(\&wanted, "$tmpAbsDir/$file");
</del><ins>+File::Find::find(\&wanted, File::Spec->catfile($tmpAbsDir, $file));
</ins><span class="cx">
</span><del>-$result = move("$tmpAbsDir/$file.headers", $webkitLibrariesDir);
</del><ins>+$result = move(File::Spec->catfile($tmpAbsDir, "$file.headers"), $webkitLibrariesDir);
</ins><span class="cx"> print STDERR "Couldn't move $file.headers to $webkitLibrariesDir" . ".\n" if $result == 0;
</span><span class="cx">
</span><span class="cx"> print "The $file has been sucessfully installed in\n $webkitLibrariesDir\n";
</span></span></pre></div>
<a id="trunkToolsScriptsupdatewebkitsupportlibs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/update-webkit-support-libs (182088 => 182089)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/update-webkit-support-libs 2015-03-27 23:01:37 UTC (rev 182088)
+++ trunk/Tools/Scripts/update-webkit-support-libs 2015-03-27 23:08:01 UTC (rev 182089)
</span><span class="lines">@@ -32,11 +32,14 @@
</span><span class="cx"> use strict;
</span><span class="cx"> use warnings;
</span><span class="cx">
</span><ins>+use Archive::Zip qw( :ERROR_CODES );
+use File::Copy;
</ins><span class="cx"> use File::Find;
</span><span class="cx"> use File::Temp ();
</span><span class="cx"> use File::Spec;
</span><span class="cx"> use FindBin;
</span><span class="cx"> use lib $FindBin::Bin;
</span><ins>+use LWP::Simple;
</ins><span class="cx"> use webkitdirs;
</span><span class="cx">
</span><span class="cx"> use constant NOTAVERSION => "-1";
</span><span class="lines">@@ -44,9 +47,9 @@
</span><span class="cx"> my $sourceDir = sourceDir();
</span><span class="cx"> my $file = "WebKitSupportLibrary";
</span><span class="cx"> my $zipFile = "$file.zip";
</span><del>-my $zipDirectory = toUnixPath($ENV{'WEBKITSUPPORTLIBRARIESZIPDIR'}) || $sourceDir;
</del><ins>+my $zipDirectory = $ENV{'WEBKITSUPPORTLIBRARIESZIPDIR'} || $sourceDir;
</ins><span class="cx"> my $pathToZip = File::Spec->catfile($zipDirectory, $zipFile);
</span><del>-my $webkitLibrariesDir = toUnixPath($ENV{'WEBKIT_LIBRARIES'}) || "$sourceDir/WebKitLibraries/win";
</del><ins>+my $webkitLibrariesDir = $ENV{'WEBKIT_LIBRARIES'} || File::Spec->catdir($sourceDir, "WebKitLibraries", "win");
</ins><span class="cx"> my $versionFile = $file . "Version";
</span><span class="cx"> my $pathToVersionFile = File::Spec->catfile($webkitLibrariesDir, $versionFile);
</span><span class="cx"> my $tmpRelativeDir = File::Temp::tempdir("webkitlibsXXXXXXX", TMPDIR => 1, CLEANUP => 1);
</span><span class="lines">@@ -71,37 +74,30 @@
</span><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-my $result = system "unzip", "-q", "-d", $tmpAbsDir, $pathToZip;
-die "Couldn't unzip $zipFile." if $result;
</del><ins>+my $zip = Archive::Zip->new($pathToZip);
+my $result = $zip->extractTree("", $tmpAbsDir);
+die "Couldn't unzip $zipFile." if $result != AZ_OK;
</ins><span class="cx">
</span><span class="cx"> print "\nInstalling $file...\n";
</span><span class="cx">
</span><span class="cx"> sub wanted
</span><span class="cx"> {
</span><del>- my $relativeName = File::Spec->abs2rel($File::Find::name, "$tmpAbsDir/$file/win");
- my $destination = "$webkitLibrariesDir/$relativeName";
</del><ins>+ my $relativeName = File::Spec->abs2rel($File::Find::name, File::Spec->catdir($tmpAbsDir, "$file", "win"));
+ my $destination = File::Spec->catfile($webkitLibrariesDir, $relativeName);
</ins><span class="cx">
</span><span class="cx"> if (-d $_) {
</span><span class="cx"> mkdir $destination;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- system "cp", $_, $destination;
</del><ins>+ copy($_, $destination);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-File::Find::find(\&wanted, "$tmpAbsDir/$file");
</del><ins>+File::Find::find(\&wanted, File::Spec->catfile($tmpAbsDir, $file));
</ins><span class="cx">
</span><span class="cx"> print "The $file has been sucessfully installed in\n $webkitLibrariesDir\n";
</span><span class="cx"> exit;
</span><span class="cx">
</span><del>-sub toUnixPath
-{
- my $path = shift;
- return unless $path;
- chomp($path = `cygpath -u '$path'`);
- return $path;
-}
-
</del><span class="cx"> sub extractedVersion
</span><span class="cx"> {
</span><span class="cx"> if (open VERSION, "<", $pathToVersionFile) {
</span><span class="lines">@@ -114,14 +110,15 @@
</span><span class="cx">
</span><span class="cx"> sub downloadExpectedVersionNumber
</span><span class="cx"> {
</span><del>- chomp(my $expectedVersion = `curl -s --sslv3 -k $versionFileURL`);
- return WEXITSTATUS($?) ? NOTAVERSION : $expectedVersion;
</del><ins>+ chomp(my $expectedVersion = get($versionFileURL));
+ return defined $expectedVersion ? $expectedVersion : NOTAVERSION;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub zipFileVersion
</span><span class="cx"> {
</span><span class="cx"> return NOTAVERSION unless -f $pathToZip;
</span><del>- chomp(my $zipFileVersion = `unzip -p "$pathToZip" $file/win/$versionFile`);
</del><ins>+ my $zip = Archive::Zip->new($pathToZip);
+ chomp(my $zipFileVersion = $zip->contents("$file/win/$versionFile"));
</ins><span class="cx"> return $zipFileVersion;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (182088 => 182089)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2015-03-27 23:01:37 UTC (rev 182088)
+++ trunk/Tools/Scripts/webkitdirs.pm 2015-03-27 23:08:01 UTC (rev 182089)
</span><span class="lines">@@ -144,14 +144,14 @@
</span><span class="cx">
</span><span class="cx"> # walks up path checking each directory to see if it is the main WebKit project dir,
</span><span class="cx"> # defined by containing Sources, WebCore, and WebKit
</span><del>- until ((-d "$sourceDir/Source" && -d "$sourceDir/Source/WebCore" && -d "$sourceDir/Source/WebKit") || (-d "$sourceDir/Internal" && -d "$sourceDir/OpenSource"))
</del><ins>+ until ((-d File::Spec->catdir($sourceDir, "Source") && -d File::Spec->catdir($sourceDir, "Source", "WebCore") && -d File::Spec->catdir($sourceDir, "Source", "WebKit")) || (-d File::Spec->catdir($sourceDir, "Internal") && -d File::Spec->catdir($sourceDir, "OpenSource")))
</ins><span class="cx"> {
</span><span class="cx"> if ($sourceDir !~ s|/[^/]+$||) {
</span><span class="cx"> die "Could not find top level webkit directory above source directory using FindBin.\n";
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $sourceDir = "$sourceDir/OpenSource" if -d "$sourceDir/OpenSource";
</del><ins>+ $sourceDir = File::Spec->catdir($sourceDir, "OpenSource") if -d File::Spec->catdir($sourceDir, "OpenSource");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub currentPerlPath()
</span><span class="lines">@@ -1433,17 +1433,17 @@
</span><span class="cx">
</span><span class="cx"> sub windowsSourceSourceDir()
</span><span class="cx"> {
</span><del>- return windowsSourceDir() . "\\Source";
</del><ins>+ return File::Spec->catdir(windowsSourceDir(), "Source");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub windowsLibrariesDir()
</span><span class="cx"> {
</span><del>- return windowsSourceDir() . "\\WebKitLibraries\\win";
</del><ins>+ return File::Spec->catdir(windowsSourceDir(), "WebKitLibraries", "win");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub windowsOutputDir()
</span><span class="cx"> {
</span><del>- return windowsSourceDir() . "\\WebKitBuild";
</del><ins>+ return File::Spec->catdir(windowsSourceDir(), "WebKitBuild");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub fontExists($)
</span><span class="lines">@@ -1456,26 +1456,20 @@
</span><span class="cx">
</span><span class="cx"> sub checkInstalledTools()
</span><span class="cx"> {
</span><del>- # SVN 1.7.10 is known to be compatible with current servers. SVN 1.8.x seems to be missing some authentication
- # protocols we use for svn.webkit.org:
- my $svnVersion = `svn --version 2> NUL | grep "\\sversion"`;
- chomp($svnVersion);
- if (!$? and $svnVersion =~ /1\.8\./) {
- print "svn 1.7.10 is known to be compatible with our servers. You are running $svnVersion,\nwhich may not work properly.\n"
- }
-
</del><span class="cx"> # environment variables. Avoid until this is corrected.
</span><span class="cx"> my $pythonVer = `python --version 2>&1`;
</span><span class="cx"> die "You must have Python installed to build WebKit.\n" if ($?);
</span><span class="cx">
</span><span class="cx"> # cURL 7.34.0 has a bug that prevents authentication with opensource.apple.com (and other things using SSL3).
</span><del>- my $curlVer = `curl --version 2> NUL | grep "curl"`;
- chomp($curlVer);
- if (!$? and $curlVer =~ /libcurl\/7\.34\.0/) {
- print "cURL version 7.34.0 has a bug that prevents authentication with SSL v2 or v3.\n";
- print "cURL 7.33.0 is known to work. The cURL projects is preparing an update to\n";
- print "correct this problem.\n\n";
- die "Please install a working cURL and try again.\n";
</del><ins>+ my $curlVer = `curl --version 2> NUL`;
+ if (!$? and $curlVer =~ "(.*curl.*)") {
+ $curlVer = $1;
+ if ($curlVer =~ /libcurl\/7\.34\.0/) {
+ print "cURL version 7.34.0 has a bug that prevents authentication with SSL v2 or v3.\n";
+ print "cURL 7.33.0 is known to work. The cURL projects is preparing an update to\n";
+ print "correct this problem.\n\n";
+ die "Please install a working cURL and try again.\n";
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # MathML requires fonts that do not ship with Windows (at least through Windows 8). Warn the user if they are missing
</span><span class="lines">@@ -1675,7 +1669,7 @@
</span><span class="cx">
</span><span class="cx"> my $platform = "/p:Platform=" . (isWin64() ? "x64" : "Win32");
</span><span class="cx"> my $logPath = File::Spec->catdir($baseProductDir, $configuration);
</span><del>- File::Path->make_path($logPath) unless -d $logPath or $logPath eq ".";
</del><ins>+ make_path($logPath) unless -d $logPath or $logPath eq ".";
</ins><span class="cx">
</span><span class="cx"> my $errorLogFile = File::Spec->catfile($logPath, "webkit_errors.log");
</span><span class="cx"> chomp($errorLogFile = `cygpath -w "$errorLogFile"`) if isCygwin();
</span></span></pre>
</div>
</div>
</body>
</html>