Build WinCairo without cygwin.

https://bugs.webkit.org/show_bug.cgi?id=144365

Reviewed by Myles Maxfield.

* WebCore.vcxproj/WebCoreGeneratedWinCairo.make:
Pass the CC executable to build-generated-files.pl like r182164.
* WebCore.vcxproj/build-generated-files.pl:
Default to 8 CPUs unless otherwise specified.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@183521 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 68ab154..c7e7ca0 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2015-04-28  Alex Christensen  <achristensen@webkit.org>
+
+        Build WinCairo without cygwin.
+        https://bugs.webkit.org/show_bug.cgi?id=144365
+
+        Reviewed by Myles Maxfield.
+
+        * WebCore.vcxproj/WebCoreGeneratedWinCairo.make:
+        Pass the CC executable to build-generated-files.pl like r182164.
+        * WebCore.vcxproj/build-generated-files.pl:
+        Default to 8 CPUs unless otherwise specified.
+
 2015-04-28  Sam Weinig  <sam@webkit.org>
 
         [Content Extensions] Process NFAs individually to avoid having all NFAs live at the same time

diff --git a/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedWinCairo.make b/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedWinCairo.make
index cde8994..4e60522 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedWinCairo.make
+++ b/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedWinCairo.make
@@ -1,12 +1,12 @@
 make:\r
-       if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnle "if (/XXWebCoreGeneratedXX/) { print } else { exit 1 }" "%ConfigurationBuildDir%\buildfailed"\r
-       if errorlevel 1 exit 1\r
-       echo XXWebCoreGeneratedXX > "%ConfigurationBuildDir%\buildfailed"\r
+       @if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnle "if (/XXWebCoreGeneratedXX/) { print } else { exit 1 }" "%ConfigurationBuildDir%\buildfailed"\r
+       @if errorlevel 1 exit 1\r
+       @echo XXWebCoreGeneratedXX > "%ConfigurationBuildDir%\buildfailed"\r
 \r
-       perl build-generated-files.pl "%ConfigurationBuildDir%" "%WebKit_Libraries%" cairo "%PlatformArchitecture%"\r
+       perl build-generated-files.pl "%ConfigurationBuildDir%" "%WebKit_Libraries%" cairo "%PlatformArchitecture%" "$(CC)"\r
        perl migrate-scripts.pl "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\scripts"\r
-       cmd /C copyForwardingHeaders.cmd cairo curl\r
-       cmd /C copyWebCoreResourceFiles.cmd\r
+       @cmd /C copyForwardingHeaders.cmd cairo curl\r
+       @cmd /C copyWebCoreResourceFiles.cmd\r
        \r
 clean:\r
        if exist "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\DerivedSources" del /s /q "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\DerivedSources"\r

diff --git a/Source/WebCore/WebCore.vcxproj/build-generated-files.pl b/Source/WebCore/WebCore.vcxproj/build-generated-files.pl
index a6d20db..b8ea3e1 100755 (executable)
--- a/Source/WebCore/WebCore.vcxproj/build-generated-files.pl
+++ b/Source/WebCore/WebCore.vcxproj/build-generated-files.pl
@@ -33,7 +33,7 @@ use File::Path qw(make_path);
 use File::Spec;
 
 # Not all build environments have the webkitdirs module installed.
-my $NUMCPUS = 2;
+my $NUMCPUS = 8;
 eval "use webkitdirs";
 unless ($@) {
     $NUMCPUS = numberOfCPUs();