Title: [183521] trunk/Source/WebCore
- Revision
- 183521
- Author
- [email protected]
- Date
- 2015-04-28 17:57:27 -0700 (Tue, 28 Apr 2015)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (183520 => 183521)
--- trunk/Source/WebCore/ChangeLog 2015-04-29 00:51:36 UTC (rev 183520)
+++ trunk/Source/WebCore/ChangeLog 2015-04-29 00:57:27 UTC (rev 183521)
@@ -1,3 +1,15 @@
+2015-04-28 Alex Christensen <[email protected]>
+
+ 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 <[email protected]>
[Content Extensions] Process NFAs individually to avoid having all NFAs live at the same time
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedWinCairo.make (183520 => 183521)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedWinCairo.make 2015-04-29 00:51:36 UTC (rev 183520)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedWinCairo.make 2015-04-29 00:57:27 UTC (rev 183521)
@@ -1,12 +1,12 @@
make:
- if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnle "if (/XXWebCoreGeneratedXX/) { print } else { exit 1 }" "%ConfigurationBuildDir%\buildfailed"
- if errorlevel 1 exit 1
- echo XXWebCoreGeneratedXX > "%ConfigurationBuildDir%\buildfailed"
+ @if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnle "if (/XXWebCoreGeneratedXX/) { print } else { exit 1 }" "%ConfigurationBuildDir%\buildfailed"
+ @if errorlevel 1 exit 1
+ @echo XXWebCoreGeneratedXX > "%ConfigurationBuildDir%\buildfailed"
- perl build-generated-files.pl "%ConfigurationBuildDir%" "%WebKit_Libraries%" cairo "%PlatformArchitecture%"
+ perl build-generated-files.pl "%ConfigurationBuildDir%" "%WebKit_Libraries%" cairo "%PlatformArchitecture%" "$(CC)"
perl migrate-scripts.pl "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\scripts"
- cmd /C copyForwardingHeaders.cmd cairo curl
- cmd /C copyWebCoreResourceFiles.cmd
+ @cmd /C copyForwardingHeaders.cmd cairo curl
+ @cmd /C copyWebCoreResourceFiles.cmd
clean:
if exist "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\DerivedSources" del /s /q "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\DerivedSources"
Modified: trunk/Source/WebCore/WebCore.vcxproj/build-generated-files.pl (183520 => 183521)
--- trunk/Source/WebCore/WebCore.vcxproj/build-generated-files.pl 2015-04-29 00:51:36 UTC (rev 183520)
+++ trunk/Source/WebCore/WebCore.vcxproj/build-generated-files.pl 2015-04-29 00:57:27 UTC (rev 183521)
@@ -33,7 +33,7 @@
use File::Spec;
# Not all build environments have the webkitdirs module installed.
-my $NUMCPUS = 2;
+my $NUMCPUS = 8;
eval "use webkitdirs";
unless ($@) {
$NUMCPUS = numberOfCPUs();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
