Title: [111800] trunk/Source
- Revision
- 111800
- Author
- [email protected]
- Date
- 2012-03-22 17:57:44 -0700 (Thu, 22 Mar 2012)
Log Message
Windows build fix after r111778.
Source/_javascript_Core:
* _javascript_Core.vcproj/_javascript_Core/_javascript_Core.vcproj:
Don't include and try to build files owned by WTF.
Also, let VS have its way with the vcproj in terms of file ordering.
Source/WTF:
* WTF.vcproj/WTF.vcproj:
DateMath.h and DateMath.cpp should be built by WTF, since they are part of WTF.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (111799 => 111800)
--- trunk/Source/_javascript_Core/ChangeLog 2012-03-23 00:54:09 UTC (rev 111799)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-03-23 00:57:44 UTC (rev 111800)
@@ -1,3 +1,11 @@
+2012-03-22 Jessie Berlin <[email protected]>
+
+ Windows build fix after r111778.
+
+ * _javascript_Core.vcproj/_javascript_Core/_javascript_Core.vcproj:
+ Don't include and try to build files owned by WTF.
+ Also, let VS have its way with the vcproj in terms of file ordering.
+
2012-03-22 Raphael Kubo da Costa <[email protected]>
[CMake] Unreviewed build fix after r111778.
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.vcproj (111799 => 111800)
--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.vcproj 2012-03-23 00:54:09 UTC (rev 111799)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.vcproj 2012-03-23 00:57:44 UTC (rev 111800)
@@ -642,14 +642,6 @@
>
</File>
<File
- RelativePath="..\..\wtf\DateMath.cpp"
- >
- </File>
- <File
- RelativePath="..\..\wtf\DateMath.h"
- >
- </File>
- <File
RelativePath="..\..\runtime\DatePrototype.cpp"
>
</File>
@@ -778,6 +770,14 @@
>
</File>
<File
+ RelativePath="..\..\runtime\JSBoundFunction.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\runtime\JSBoundFunction.h"
+ >
+ </File>
+ <File
RelativePath="..\..\runtime\JSByteArray.cpp"
>
</File>
@@ -810,14 +810,6 @@
>
</File>
<File
- RelativePath="..\..\runtime\JSBoundFunction.cpp"
- >
- </File>
- <File
- RelativePath="..\..\runtime\JSBoundFunction.h"
- >
- </File>
- <File
RelativePath="..\..\runtime\JSGlobalData.cpp"
>
</File>
@@ -1122,6 +1114,14 @@
>
</File>
<File
+ RelativePath="..\..\runtime\SamplingCounter.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\runtime\SamplingCounter.h"
+ >
+ </File>
+ <File
RelativePath="..\..\runtime\ScopeChain.cpp"
>
</File>
@@ -1133,14 +1133,6 @@
RelativePath="..\..\runtime\ScopeChainMark.h"
>
</File>
- <File
- RelativePath="..\..\runtime\SamplingCounter.cpp"
- >
- </File>
- <File
- RelativePath="..\..\runtime\SamplingCounter.h"
- >
- </File>
<File
RelativePath="..\..\runtime\SmallStrings.cpp"
>
@@ -1478,143 +1470,143 @@
Name="bytecode"
>
<File
- RelativePath="..\..\bytecode\ExecutionCounter.cpp"
+ RelativePath="..\..\bytecode\CallLinkInfo.cpp"
>
</File>
<File
- RelativePath="..\..\bytecode\MethodOfGettingAValueProfile.cpp"
+ RelativePath="..\..\bytecode\CallLinkInfo.h"
>
</File>
<File
- RelativePath="..\..\bytecode\MethodOfGettingAValueProfile.h"
+ RelativePath="..\..\bytecode\CallLinkStatus.cpp"
>
</File>
<File
- RelativePath="..\..\bytecode\LazyOperandValueProfile.cpp"
+ RelativePath="..\..\bytecode\CallLinkStatus.h"
>
</File>
<File
- RelativePath="..\..\bytecode\LazyOperandValueProfile.h"
+ RelativePath="..\..\bytecode\CallReturnOffsetToBytecodeOffset.h"
>
</File>
<File
- RelativePath="..\..\bytecode\GetByIdStatus.h"
+ RelativePath="..\..\bytecode\CodeBlock.cpp"
>
</File>
<File
- RelativePath="..\..\bytecode\PutByIdStatus.h"
+ RelativePath="..\..\bytecode\CodeBlock.h"
>
</File>
<File
- RelativePath="..\..\bytecode\CallLinkStatus.h"
+ RelativePath="..\..\bytecode\CodeOrigin.h"
>
</File>
<File
- RelativePath="..\..\bytecode\MethodCallLinkStatus.h"
+ RelativePath="..\..\bytecode\CodeType.h"
>
</File>
<File
- RelativePath="..\..\bytecode\GetByIdStatus.cpp"
+ RelativePath="..\..\bytecode\EvalCodeCache.h"
>
</File>
<File
- RelativePath="..\..\bytecode\PutByIdStatus.cpp"
+ RelativePath="..\..\bytecode\ExecutionCounter.cpp"
>
</File>
<File
- RelativePath="..\..\bytecode\CallLinkStatus.cpp"
+ RelativePath="..\..\bytecode\ExpressionRangeInfo.h"
>
</File>
<File
- RelativePath="..\..\bytecode\MethodCallLinkStatus.cpp"
+ RelativePath="..\..\bytecode\GetByIdStatus.cpp"
>
</File>
<File
- RelativePath="..\..\bytecode\HandlerInfo.h"
+ RelativePath="..\..\bytecode\GetByIdStatus.h"
>
</File>
<File
- RelativePath="..\..\bytecode\CallLinkInfo.cpp"
+ RelativePath="..\..\bytecode\GlobalResolveInfo.h"
>
</File>
<File
- RelativePath="..\..\bytecode\LineInfo.h"
+ RelativePath="..\..\bytecode\HandlerInfo.h"
>
</File>
<File
- RelativePath="..\..\bytecode\MethodCallLinkInfo.h"
+ RelativePath="..\..\bytecode\Instruction.h"
>
</File>
<File
- RelativePath="..\..\bytecode\CallReturnOffsetToBytecodeOffset.h"
+ RelativePath="..\..\bytecode\JumpTable.cpp"
>
</File>
<File
- RelativePath="..\..\bytecode\CodeType.h"
+ RelativePath="..\..\bytecode\JumpTable.h"
>
</File>
<File
- RelativePath="..\..\bytecode\ExpressionRangeInfo.h"
+ RelativePath="..\..\bytecode\LazyOperandValueProfile.cpp"
>
</File>
<File
- RelativePath="..\..\bytecode\MethodCallLinkInfo.cpp"
+ RelativePath="..\..\bytecode\LazyOperandValueProfile.h"
>
</File>
<File
- RelativePath="..\..\bytecode\CallLinkInfo.h"
+ RelativePath="..\..\bytecode\LineInfo.h"
>
</File>
<File
- RelativePath="..\..\bytecode\GlobalResolveInfo.h"
+ RelativePath="..\..\bytecode\MethodCallLinkInfo.cpp"
>
</File>
<File
- RelativePath="..\..\bytecode\CodeBlock.cpp"
+ RelativePath="..\..\bytecode\MethodCallLinkInfo.h"
>
</File>
<File
- RelativePath="..\..\bytecode\CodeBlock.h"
+ RelativePath="..\..\bytecode\MethodCallLinkStatus.cpp"
>
</File>
<File
- RelativePath="..\..\bytecode\CodeOrigin.h"
+ RelativePath="..\..\bytecode\MethodCallLinkStatus.h"
>
</File>
<File
- RelativePath="..\..\bytecode\EvalCodeCache.h"
+ RelativePath="..\..\bytecode\MethodOfGettingAValueProfile.cpp"
>
</File>
<File
- RelativePath="..\..\bytecode\Instruction.h"
+ RelativePath="..\..\bytecode\MethodOfGettingAValueProfile.h"
>
</File>
<File
- RelativePath="..\..\bytecode\JumpTable.cpp"
+ RelativePath="..\..\bytecode\Opcode.cpp"
>
</File>
<File
- RelativePath="..\..\bytecode\JumpTable.h"
+ RelativePath="..\..\bytecode\Opcode.h"
>
</File>
<File
- RelativePath="..\..\bytecode\Opcode.cpp"
+ RelativePath="..\..\bytecode\PolymorphicPutByIdList.cpp"
>
</File>
<File
- RelativePath="..\..\bytecode\Opcode.h"
+ RelativePath="..\..\bytecode\PredictedType.cpp"
>
</File>
<File
- RelativePath="..\..\bytecode\PolymorphicPutByIdList.cpp"
+ RelativePath="..\..\bytecode\PredictedType.h"
>
</File>
<File
- RelativePath="..\..\bytecode\PredictedType.cpp"
+ RelativePath="..\..\bytecode\PutByIdStatus.cpp"
>
</File>
<File
- RelativePath="..\..\bytecode\PredictedType.h"
+ RelativePath="..\..\bytecode\PutByIdStatus.h"
>
</File>
<File
@@ -1706,23 +1698,23 @@
>
</File>
</Filter>
- <Filter
- Name="dfg"
- >
- <File
- RelativePath="..\..\dfg\DFGDriver.h"
- >
- </File>
- <File
- RelativePath="..\..\dfg\DFGIntrinsic.h"
- >
- </File>
- <File
- RelativePath="..\..\dfg\DFGOSREntry.h"
- >
- </File>
- </Filter>
<Filter
+ Name="dfg"
+ >
+ <File
+ RelativePath="..\..\dfg\DFGDriver.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dfg\DFGIntrinsic.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\dfg\DFGOSREntry.h"
+ >
+ </File>
+ </Filter>
+ <Filter
Name="yarr"
>
<File
@@ -1810,6 +1802,14 @@
>
</File>
<File
+ RelativePath="..\..\jit\JITExceptions.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\jit\JITExceptions.h"
+ >
+ </File>
+ <File
RelativePath="..\..\jit\JITInlineMethods.h"
>
</File>
@@ -1834,14 +1834,6 @@
>
</File>
<File
- RelativePath="..\..\jit\JITExceptions.cpp"
- >
- </File>
- <File
- RelativePath="..\..\jit\JITExceptions.h"
- >
- </File>
- <File
RelativePath="..\..\jit\JITStubs.cpp"
>
</File>
@@ -2065,158 +2057,158 @@
<Filter
Name="heap"
>
- <File
- RelativePath="..\..\heap\CopiedAllocator.h"
- >
- </File>
- <File
- RelativePath="..\..\heap\CopiedBlock.h"
- >
- </File>
- <File
- RelativePath="..\..\heap\CopiedSpace.cpp"
- >
- </File>
- <File
- RelativePath="..\..\heap\CopiedSpace.h"
- >
- </File>
- <File
- RelativePath="..\..\heap\CopiedSpaceInlineMethods.h"
- >
- </File>
- <File
- RelativePath="..\..\heap\ConservativeRoots.cpp"
- >
- </File>
- <File
- RelativePath="..\..\heap\ConservativeRoots.h"
- >
- </File>
- <File
- RelativePath="..\..\heap\GCAssertions.h"
- >
- </File>
- <File
- RelativePath="..\..\heap\MachineStackMarker.cpp"
- >
- </File>
- <File
- RelativePath="..\..\heap\MachineStackMarker.h"
- >
- </File>
- <File
- RelativePath="..\..\heap\MarkedAllocator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\heap\MarkedAllocator.h"
- >
- </File>
- <File
- RelativePath="..\..\heap\MarkedBlock.cpp"
- >
- </File>
- <File
- RelativePath="..\..\heap\MarkedBlock.h"
- >
- </File>
- <File
- RelativePath="..\..\heap\MarkedSpace.cpp"
- >
- </File>
- <File
- RelativePath="..\..\heap\MarkedSpace.h"
- >
- </File>
- <File
- RelativePath="..\..\heap\MarkStack.cpp"
- >
- </File>
- <File
- RelativePath="..\..\heap\MarkStack.h"
- >
- </File>
- <File
- RelativePath="..\..\heap\HeapRootVisitor.h"
- >
- </File>
- <File
- RelativePath="..\..\heap\Heap.cpp"
- >
- </File>
- <File
- RelativePath="..\..\heap\Heap.h"
- >
- </File>
- <File
- RelativePath="..\..\heap\HeapBlock.h"
- >
- </File>
- <File
- RelativePath="..\..\heap\Strong.h"
- >
- </File>
- <File
- RelativePath="..\..\heap\StrongInlines.h"
- >
- </File>
- <File
- RelativePath="..\..\heap\Handle.h"
- >
- </File>
- <File
- RelativePath="..\..\heap\HandleHeap.cpp"
- >
- </File>
- <File
- RelativePath="..\..\heap\HandleHeap.h"
- >
- </File>
- <File
- RelativePath="..\..\heap\HandleStack.cpp"
- >
- </File>
- <File
- RelativePath="..\..\heap\HandleStack.h"
- >
- </File>
- <File
- RelativePath="..\..\heap\DFGCodeBlocks.cpp"
- >
- </File>
- <File
- RelativePath="..\..\heap\DFGCodeBlocks.h"
- >
- </File>
- <File
- RelativePath="..\..\heap\Local.h"
- >
- </File>
- <File
- RelativePath="..\..\heap\LocalScope.h"
- >
- </File>
- <File
- RelativePath="..\..\heap\VTableSpectrum.h"
- >
- </File>
- <File
- RelativePath="..\..\heap\VTableSpectrum.cpp"
- >
- </File>
- <File
- RelativePath="..\..\heap\Weak.h"
- >
- </File>
- <File
- RelativePath="..\..\heap\WriteBarrierSupport.cpp"
- >
- </File>
- <File
- RelativePath="..\..\heap\WriteBarrierSupport.h"
- >
- </File>
+ <File
+ RelativePath="..\..\heap\ConservativeRoots.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\ConservativeRoots.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\CopiedAllocator.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\CopiedBlock.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\CopiedSpace.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\CopiedSpace.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\CopiedSpaceInlineMethods.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\DFGCodeBlocks.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\DFGCodeBlocks.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\GCAssertions.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\Handle.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\HandleHeap.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\HandleHeap.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\HandleStack.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\HandleStack.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\Heap.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\Heap.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\HeapBlock.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\HeapRootVisitor.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\Local.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\LocalScope.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\MachineStackMarker.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\MachineStackMarker.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\MarkedAllocator.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\MarkedAllocator.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\MarkedBlock.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\MarkedBlock.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\MarkedSpace.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\MarkedSpace.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\MarkStack.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\MarkStack.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\Strong.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\StrongInlines.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\VTableSpectrum.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\VTableSpectrum.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\Weak.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\WriteBarrierSupport.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\heap\WriteBarrierSupport.h"
+ >
+ </File>
</Filter>
<File
RelativePath="..\..\config.h"
Modified: trunk/Source/WTF/ChangeLog (111799 => 111800)
--- trunk/Source/WTF/ChangeLog 2012-03-23 00:54:09 UTC (rev 111799)
+++ trunk/Source/WTF/ChangeLog 2012-03-23 00:57:44 UTC (rev 111800)
@@ -1,3 +1,10 @@
+2012-03-22 Jessie Berlin <[email protected]>
+
+ Windows build fix after r111778.
+
+ * WTF.vcproj/WTF.vcproj:
+ DateMath.h and DateMath.cpp should be built by WTF, since they are part of WTF.
+
2012-03-22 Raphael Kubo da Costa <[email protected]>
[CMake] Unreviewed build fix after r111778.
Modified: trunk/Source/WTF/WTF.vcproj/WTF.vcproj (111799 => 111800)
--- trunk/Source/WTF/WTF.vcproj/WTF.vcproj 2012-03-23 00:54:09 UTC (rev 111799)
+++ trunk/Source/WTF/WTF.vcproj/WTF.vcproj 2012-03-23 00:57:44 UTC (rev 111800)
@@ -677,6 +677,14 @@
>
</File>
<File
+ RelativePath="..\wtf\DateMath.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\wtf\DateMath.h"
+ >
+ </File>
+ <File
RelativePath="..\wtf\DecimalNumber.cpp"
>
</File>
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
