Title: [169927] trunk/Source
- Revision
- 169927
- Author
- [email protected]
- Date
- 2014-06-12 18:53:42 -0700 (Thu, 12 Jun 2014)
Log Message
[Win] Avoid fork bomb during build
https://bugs.webkit.org/show_bug.cgi?id=133837
<rdar://problem/17296034>
Reviewed by Tim Horton.
../_javascript_Core:
* _javascript_Core.vcxproj/build-generated-files.sh: Use a
reasonable default value when the 'num-cpus' script is not available.
../WebCore:
* WebCore.vcxproj/build-generated-files.sh: Use a reasonable
default value when the 'num-cpus' script is not available.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (169926 => 169927)
--- trunk/Source/_javascript_Core/ChangeLog 2014-06-13 01:49:16 UTC (rev 169926)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-06-13 01:53:42 UTC (rev 169927)
@@ -1,3 +1,14 @@
+2014-06-12 Brent Fulgham <[email protected]>
+
+ [Win] Avoid fork bomb during build
+ https://bugs.webkit.org/show_bug.cgi?id=133837
+ <rdar://problem/17296034>
+
+ Reviewed by Tim Horton.
+
+ * _javascript_Core.vcxproj/build-generated-files.sh: Use a
+ reasonable default value when the 'num-cpus' script is not available.
+
2014-06-12 Mark Lam <[email protected]>
Remove some dead / unused code.
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/build-generated-files.sh (169926 => 169927)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/build-generated-files.sh 2014-06-13 01:49:16 UTC (rev 169926)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/build-generated-files.sh 2014-06-13 01:53:42 UTC (rev 169927)
@@ -1,6 +1,11 @@
#!/usr/bin/bash
-NUMCPUS=`../../../Tools/Scripts/num-cpus`
+NUMCPUPATH="../../Tools/Scripts/num-cpus"
+if [ -x $NUMCPUPATH ]; then
+ NUMCPUS=`$NUMCPUPATH`
+else
+ NUMCPUS=8
+fi
XSRCROOT="`pwd`/.."
XSRCROOT=`realpath "$XSRCROOT"`
Modified: trunk/Source/WebCore/ChangeLog (169926 => 169927)
--- trunk/Source/WebCore/ChangeLog 2014-06-13 01:49:16 UTC (rev 169926)
+++ trunk/Source/WebCore/ChangeLog 2014-06-13 01:53:42 UTC (rev 169927)
@@ -1,3 +1,14 @@
+2014-06-12 Brent Fulgham <[email protected]>
+
+ [Win] Avoid fork bomb during build
+ https://bugs.webkit.org/show_bug.cgi?id=133837
+ <rdar://problem/17296034>
+
+ Reviewed by Tim Horton.
+
+ * WebCore.vcxproj/build-generated-files.sh: Use a reasonable
+ default value when the 'num-cpus' script is not available.
+
2014-06-12 Gavin Barraclough <[email protected]>
Add support for thread/WorkQueue QoS
Modified: trunk/Source/WebCore/WebCore.vcxproj/build-generated-files.sh (169926 => 169927)
--- trunk/Source/WebCore/WebCore.vcxproj/build-generated-files.sh 2014-06-13 01:49:16 UTC (rev 169926)
+++ trunk/Source/WebCore/WebCore.vcxproj/build-generated-files.sh 2014-06-13 01:53:42 UTC (rev 169927)
@@ -26,7 +26,12 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-NUMCPUS=`../../../Tools/Scripts/num-cpus`
+NUMCPUPATH="../../Tools/Scripts/num-cpus"
+if [ -x $NUMCPUPATH ]; then
+ NUMCPUS=`$NUMCPUPATH`
+else
+ NUMCPUS=8
+fi
XSRCROOT="`pwd`/.."
XSRCROOT=`realpath "$XSRCROOT"`
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
