diff options
Diffstat (limited to 'Source/JavaScriptCore/JavaScriptCore.vcproj')
35 files changed, 355 insertions, 1883 deletions
diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.make b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.make index bd4753093..a87ecc9dd 100644 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.make +++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.make @@ -10,8 +10,11 @@ install: set WebKitOutputDir=$(OBJROOT) set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE) set WebKitVSPropsRedirectionDir=$(SRCROOT)\AppleInternal\tools\vsprops\OpenSource\1\2\3\4\ + -mkdir "%ConfigurationBuildDir%\include\private" + xcopy "%WebKitLibrariesDir%\include\private\*" "%ConfigurationBuildDir%\include\private" /e/v/i/h/y !IF "$(BUILDSTYLE)"=="Release_PGO" - devenv "JavaScriptCoreSubmit.sln" /rebuild $(BUILDSTYLE) + devenv "JavaScriptCoreSubmit.sln" /clean $(BUILDSTYLE) + devenv "JavaScriptCoreSubmit.sln" /build $(BUILDSTYLE) set PATH=$(SYSTEMDRIVE)\cygwin\bin;$(PATH) xcopy "$(SRCROOT)\AppleInternal\tests\SunSpider\*" "%ConfigurationBuildDir%\tests\SunSpider" /e/v/i/h/y cd "%ConfigurationBuildDir%\tests\SunSpider" @@ -20,7 +23,8 @@ install: cd "$(SRCROOT)\JavaScriptCore.vcproj" devenv "JavaScriptCoreSubmit.sln" /build Release_PGO_Optimize !ELSE - devenv "JavaScriptCoreSubmit.sln" /rebuild $(BUILDSTYLE) + devenv "JavaScriptCoreSubmit.sln" /clean $(BUILDSTYLE) + devenv "JavaScriptCoreSubmit.sln" /build $(BUILDSTYLE) !ENDIF -xcopy "%ConfigurationBuildDir%\bin\JavaScriptCore.dll" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y -xcopy "%ConfigurationBuildDir%\bin\JavaScriptCore_debug.dll" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln index 0834a3fe8..84d5e16a6 100644 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln +++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln @@ -11,7 +11,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsc", "jsc\jsc.vcproj", "{C {011D10F1-B656-4A1B-A0C3-3842F02122C5} = {011D10F1-B656-4A1B-A0C3-3842F02122C5} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTF", "WTF\WTF.vcproj", "{AA8A5A85-592B-4357-BC60-E0E91E026AF6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTF", "..\..\WTF\WTF.vcproj\WTF.vcproj", "{AA8A5A85-592B-4357-BC60-E0E91E026AF6}" ProjectSection(ProjectDependencies) = postProject {5AE5F5E4-782D-4F63-B4D7-3977B52B9950} = {5AE5F5E4-782D-4F63-B4D7-3977B52B9950} EndProjectSection @@ -26,7 +26,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testRegExp", "testRegExp\te {C59E5129-B453-49B7-A52B-1E104715F76E} = {C59E5129-B453-49B7-A52B-1E104715F76E} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTFGenerated", "WTF\WTFGenerated.vcproj", "{5AE5F5E4-782D-4F63-B4D7-3977B52B9950}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTFGenerated", "..\..\WTF\WTF.vcproj\WTFGenerated.vcproj", "{5AE5F5E4-782D-4F63-B4D7-3977B52B9950}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def index c50a4252b..bae50e204 100644..100755 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def +++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def @@ -1,7 +1,5 @@ EXPORTS - ??$strtod@$00@WTF@@YANPBDPAPAD@Z - ??$strtod@$0A@@WTF@@YANPBDPAPAD@Z ??0ArrayBufferView@WTF@@IAE@V?$PassRefPtr@VArrayBuffer@WTF@@@1@I@Z ??0CString@WTF@@QAE@PBD@Z ??0CString@WTF@@QAE@PBDI@Z @@ -11,8 +9,6 @@ EXPORTS ??0DropAllLocks@JSLock@JSC@@QAE@W4JSLockBehavior@2@@Z ??0DynamicGlobalObjectScope@JSC@@QAE@AAVJSGlobalData@1@PAVJSGlobalObject@1@@Z ??0InternalFunction@JSC@@IAE@PAVJSGlobalObject@1@PAVStructure@1@@Z - ??0JSArray@JSC@@IAE@AAVJSGlobalData@1@PAVStructure@1@@Z - ??0JSByteArray@JSC@@AAE@PAVExecState@1@PAVStructure@1@PAVByteArray@WTF@@@Z ??0JSLock@JSC@@QAE@PAVExecState@1@@Z ??0MD5@WTF@@QAE@XZ ??0Mutex@WTF@@QAE@XZ @@ -45,6 +41,7 @@ EXPORTS ??8JSC@@YA_NABVUString@0@0@Z ??8WTF@@YA_NABVCString@0@0@Z ?EcmaScriptConverter@DoubleToStringConverter@double_conversion@WTF@@SAABV123@XZ + ?StringToDouble@StringToDoubleConverter@double_conversion@WTF@@SANPBDIPAI@Z ?ToExponential@DoubleToStringConverter@double_conversion@WTF@@QBE_NNHPAVStringBuilder@23@@Z ?ToFixed@DoubleToStringConverter@double_conversion@WTF@@QBE_NNHPAVStringBuilder@23@@Z ?ToPrecision@DoubleToStringConverter@double_conversion@WTF@@QBE_NNHPAVStringBuilder@23@@Z @@ -65,7 +62,6 @@ EXPORTS ?addSlowCase@Identifier@JSC@@CA?AV?$PassRefPtr@VStringImpl@WTF@@@WTF@@PAVExecState@2@PAVStringImpl@4@@Z ?addSlowCase@Identifier@JSC@@CA?AV?$PassRefPtr@VStringImpl@WTF@@@WTF@@PAVJSGlobalData@2@PAVStringImpl@4@@Z ?addStaticGlobals@JSGlobalObject@JSC@@IAEXPAUGlobalPropertyInfo@12@H@Z - ?allocatePropertyStorage@JSObject@JSC@@QAEXAAVJSGlobalData@2@II@Z ?allocateSlowCase@MarkedAllocator@JSC@@AAEPAXXZ ?append@StringBuilder@WTF@@QAEXPBEI@Z ?append@StringBuilder@WTF@@QAEXPB_WI@Z @@ -93,7 +89,6 @@ EXPORTS ?checksum@MD5@WTF@@QAEXAAV?$Vector@E$0BA@@2@@Z ?className@JSObject@JSC@@SA?AVUString@2@PBV12@@Z ?clear@SourceProviderCache@JSC@@QAEXXZ - ?clearBuiltinStructures@JSGlobalData@JSC@@QAEXXZ ?clearRareData@JSGlobalObject@JSC@@CAXPAVJSCell@2@@Z ?collate@Collator@WTF@@QBE?AW4Result@12@PB_WI0I@Z ?collectAllGarbage@Heap@JSC@@QAEXXZ @@ -106,8 +101,7 @@ EXPORTS ?convertLatin1ToUTF8@Unicode@WTF@@YA?AW4ConversionResult@12@PAPBEPBEPAPADPAD@Z ?convertUTF16ToUTF8@Unicode@WTF@@YA?AW4ConversionResult@12@PAPB_WPB_WPAPADPAD_N@Z ?convertUTF8ToUTF16@Unicode@WTF@@YA?AW4ConversionResult@12@PAPBDPBDPAPA_WPA_W_N@Z - ?create@ByteArray@WTF@@SA?AV?$PassRefPtr@VByteArray@WTF@@@2@I@Z - ?create@JSFunction@JSC@@SAPAV12@PAVExecState@2@PAVJSGlobalObject@2@HABVIdentifier@2@P6I_J0@Z3@Z + ?create@JSFunction@JSC@@SAPAV12@PAVExecState@2@PAVJSGlobalObject@2@HABVIdentifier@2@P6I_J0@ZW4Intrinsic@2@3@Z ?create@JSGlobalData@JSC@@SA?AV?$PassRefPtr@VJSGlobalData@JSC@@@WTF@@W4ThreadStackType@2@W4HeapSize@2@@Z ?create@OpaqueJSString@@SA?AV?$PassRefPtr@UOpaqueJSString@@@WTF@@ABVUString@JSC@@@Z ?create@RegExp@JSC@@SAPAV12@AAVJSGlobalData@2@ABVUString@2@W4RegExpFlags@2@@Z @@ -119,13 +113,13 @@ EXPORTS ?createReferenceError@JSC@@YAPAVJSObject@1@PAVExecState@1@ABVUString@1@@Z ?createSingleCharacterString@SmallStrings@JSC@@AAEXPAVJSGlobalData@2@E@Z ?createStackOverflowError@JSC@@YAPAVJSObject@1@PAVExecState@1@@Z - ?createStructure@JSByteArray@JSC@@SAPAVStructure@2@AAVJSGlobalData@2@PAVJSGlobalObject@2@VJSValue@2@PBUClassInfo@2@@Z ?createSyntaxError@JSC@@YAPAVJSObject@1@PAVExecState@1@ABVUString@1@@Z ?createTable@HashTable@JSC@@ABEXPAVJSGlobalData@2@@Z ?createThread@WTF@@YAIP6APAXPAX@Z0@Z ?createThread@WTF@@YAIP6APAXPAX@Z0PBD@Z ?createThread@WTF@@YAIP6AXPAX@Z0PBD@Z ?createTypeError@JSC@@YAPAVJSObject@1@PAVExecState@1@ABVUString@1@@Z + ?createNotEnoughArgumentsError@JSC@@YAPAVJSObject@1@PAVExecState@1@@Z ?cryptographicallyRandomNumber@WTF@@YAIXZ ?cryptographicallyRandomValues@WTF@@YAXPAXI@Z ?currentThread@WTF@@YAIXZ @@ -151,13 +145,13 @@ EXPORTS ?deleteTable@HashTable@JSC@@QBEXXZ ?despecifyDictionaryFunction@Structure@JSC@@QAEXAAVJSGlobalData@2@ABVIdentifier@2@@Z ?despecifyFunctionTransition@Structure@JSC@@SAPAV12@AAVJSGlobalData@2@PAV12@ABVIdentifier@2@@Z - ?destroy@Heap@JSC@@QAEXXZ - ?destroy@JSByteArray@JSC@@SAXPAVJSCell@2@@Z ?destroy@JSCell@JSC@@KAXPAV12@@Z ?destroy@JSGlobalObject@JSC@@SAXPAVJSCell@2@@Z + ?destroy@OutOfLineBits@BitVector@WTF@@SAXPAV123@@Z ?detach@Debugger@JSC@@UAEXPAVJSGlobalObject@2@@Z ?detachThread@WTF@@YAXI@Z ?didTimeOut@TimeoutChecker@JSC@@QAE_NPAVExecState@2@@Z + ?discardAllCompiledCode@Heap@JSC@@QAEXXZ ?displayName@JSFunction@JSC@@QAE?BVUString@2@PAVExecState@2@@Z ?dtoa@WTF@@YAXQADNAA_NAAHAAI@Z ?dumpSampleData@JSGlobalData@JSC@@QAEXPAVExecState@2@@Z @@ -180,6 +174,7 @@ EXPORTS ?fastZeroedMalloc@WTF@@YAPAXI@Z ?fillGetterPropertySlot@JSObject@JSC@@AAEXAAVPropertySlot@2@PAV?$WriteBarrierBase@W4Unknown@JSC@@@2@@Z ?finalize@WeakHandleOwner@JSC@@UAEXV?$Handle@W4Unknown@JSC@@@2@PAX@Z + ?findAllocator@WeakSet@JSC@@AAEPAUFreeCell@WeakBlock@2@XZ ?finishCreation@DateInstance@JSC@@IAEXAAVJSGlobalData@2@N@Z ?finishCreation@InternalFunction@JSC@@IAEXAAVJSGlobalData@2@ABVIdentifier@2@@Z ?finishCreation@JSArray@JSC@@IAEXAAVJSGlobalData@2@I@Z @@ -195,28 +190,26 @@ EXPORTS ?getCalculatedDisplayName@JSC@@YA?AVUString@1@PAVExecState@1@PAVJSObject@1@@Z ?getCallData@JSCell@JSC@@SA?AW4CallType@2@PAV12@AATCallData@2@@Z ?getConstructData@JSCell@JSC@@SA?AW4ConstructType@2@PAV12@AATConstructData@2@@Z + ?getCurrentLocalTime@WTF@@YAXPAUtm@@@Z ?getObject@JSCell@JSC@@QAEPAVJSObject@2@XZ - ?getOwnPropertyDescriptor@JSByteArray@JSC@@SA_NPAVJSObject@2@PAVExecState@2@ABVIdentifier@2@AAVPropertyDescriptor@2@@Z ?getOwnPropertyDescriptor@JSGlobalObject@JSC@@SA_NPAVJSObject@2@PAVExecState@2@ABVIdentifier@2@AAVPropertyDescriptor@2@@Z ?getOwnPropertyDescriptor@JSObject@JSC@@SA_NPAV12@PAVExecState@2@ABVIdentifier@2@AAVPropertyDescriptor@2@@Z - ?getOwnPropertyNames@JSByteArray@JSC@@SAXPAVJSObject@2@PAVExecState@2@AAVPropertyNameArray@2@W4EnumerationMode@2@@Z ?getOwnPropertyNames@JSObject@JSC@@SAXPAV12@PAVExecState@2@AAVPropertyNameArray@2@W4EnumerationMode@2@@Z ?getOwnPropertyNames@JSVariableObject@JSC@@SAXPAVJSObject@2@PAVExecState@2@AAVPropertyNameArray@2@W4EnumerationMode@2@@Z - ?getOwnPropertySlot@JSByteArray@JSC@@SA_NPAVJSCell@2@PAVExecState@2@ABVIdentifier@2@AAVPropertySlot@2@@Z ?getOwnPropertySlot@JSGlobalObject@JSC@@SA_NPAVJSCell@2@PAVExecState@2@ABVIdentifier@2@AAVPropertySlot@2@@Z ?getOwnPropertySlotByIndex@JSArray@JSC@@SA_NPAVJSCell@2@PAVExecState@2@IAAVPropertySlot@2@@Z - ?getOwnPropertySlotByIndex@JSByteArray@JSC@@SA_NPAVJSCell@2@PAVExecState@2@IAAVPropertySlot@2@@Z ?getOwnPropertySlotByIndex@JSObject@JSC@@SA_NPAVJSCell@2@PAVExecState@2@IAAVPropertySlot@2@@Z ?getPropertyDescriptor@JSObject@JSC@@QAE_NPAVExecState@2@ABVIdentifier@2@AAVPropertyDescriptor@2@@Z ?getPropertyNames@JSObject@JSC@@SAXPAV12@PAVExecState@2@AAVPropertyNameArray@2@W4EnumerationMode@2@@Z ?getSlice@ArgList@JSC@@QBEXHAAV12@@Z - ?getStackTrace@Interpreter@JSC@@SAXPAVJSGlobalData@2@HAAV?$Vector@UStackFrame@JSC@@$0A@@WTF@@@Z + ?getStackTrace@Interpreter@JSC@@SAXPAVJSGlobalData@2@AAV?$Vector@UStackFrame@JSC@@$0A@@WTF@@@Z ?getString@JSCell@JSC@@QBE?AVUString@2@PAVExecState@2@@Z ?getString@JSCell@JSC@@QBE_NPAVExecState@2@AAVUString@2@@Z ?getter@PropertyDescriptor@JSC@@QBE?AVJSValue@2@XZ ?globalExec@JSGlobalObject@JSC@@QAEPAVExecState@2@XZ ?globalObjectCount@Heap@JSC@@QAEIXZ - ?grow@HandleHeap@JSC@@AAEXXZ + ?grow@HandleSet@JSC@@AAEXXZ + ?growPropertyStorage@JSObject@JSC@@QAEPAV?$WriteBarrierBase@W4Unknown@JSC@@@2@AAVJSGlobalData@2@II@Z ?hasInstance@JSObject@JSC@@SA_NPAV12@PAVExecState@2@VJSValue@2@2@Z ?hasProperty@JSObject@JSC@@QBE_NPAVExecState@2@ABVIdentifier@2@@Z ?hasProperty@JSObject@JSC@@QBE_NPAVExecState@2@I@Z @@ -229,7 +222,7 @@ EXPORTS ?initializeMainThread@WTF@@YAXXZ ?initializeThreading@JSC@@YAXXZ ?initializeThreading@WTF@@YAXXZ - ?interpret@Yarr@JSC@@YAIPAUBytecodePattern@12@ABVUString@2@IIPAI@Z + ?interpret@Yarr@JSC@@YAIPAUBytecodePattern@12@ABVUString@2@IPAI@Z ?isAccessorDescriptor@PropertyDescriptor@JSC@@QBE_NXZ ?isBusy@Heap@JSC@@QAE_NXZ ?isDataDescriptor@PropertyDescriptor@JSC@@QBE_NXZ @@ -246,7 +239,7 @@ EXPORTS ?lock@Mutex@WTF@@QAEXXZ ?lockAtomicallyInitializedStaticMutex@WTF@@YAXXZ ?lockCount@JSLock@JSC@@SAHXZ - ?match@RegExp@JSC@@QAEHAAVJSGlobalData@2@ABVUString@2@IPAV?$Vector@H$0CA@@WTF@@@Z + ?match@RegExp@JSC@@QAEHAAVJSGlobalData@2@ABVUString@2@IAAV?$Vector@H$0CA@@WTF@@@Z ?materializePropertyMap@Structure@JSC@@AAEXAAVJSGlobalData@2@@Z ?monotonicallyIncreasingTime@WTF@@YANXZ ?monthFromDayInYear@WTF@@YAHH_N@Z @@ -267,12 +260,12 @@ EXPORTS ?objectProtoFuncToString@JSC@@YI_JPAVExecState@1@@Z ?objectTypeCounts@Heap@JSC@@QAE?AV?$PassOwnPtr@V?$HashCountedSet@PBDU?$PtrHash@PBD@WTF@@U?$HashTraits@PBD@2@@WTF@@@WTF@@XZ ?parseDateFromNullTerminatedCharacters@WTF@@YANPBD@Z + ?parseDoubleFromLongString@Internal@WTF@@YANPB_WIAAI@Z ?profiler@Profiler@JSC@@SAPAV12@XZ ?protect@Heap@JSC@@QAEXVJSValue@2@@Z ?protectedGlobalObjectCount@Heap@JSC@@QAEIXZ ?protectedObjectCount@Heap@JSC@@QAEIXZ ?protectedObjectTypeCounts@Heap@JSC@@QAE?AV?$PassOwnPtr@V?$HashCountedSet@PBDU?$PtrHash@PBD@WTF@@U?$HashTraits@PBD@2@@WTF@@@WTF@@XZ - ?put@JSByteArray@JSC@@SAXPAVJSCell@2@PAVExecState@2@ABVIdentifier@2@VJSValue@2@AAVPutPropertySlot@2@@Z ?put@JSGlobalObject@JSC@@SAXPAVJSCell@2@PAVExecState@2@ABVIdentifier@2@VJSValue@2@AAVPutPropertySlot@2@@Z ?put@JSObject@JSC@@SAXPAVJSCell@2@PAVExecState@2@ABVIdentifier@2@VJSValue@2@AAVPutPropertySlot@2@@Z ?putByIndex@JSObject@JSC@@SAXPAVJSCell@2@PAVExecState@2@IVJSValue@2@_N@Z @@ -286,6 +279,7 @@ EXPORTS ?releaseDecommitted@OSAllocator@WTF@@SAXPAXI@Z ?releaseExecutableMemory@JSGlobalData@JSC@@QAEXXZ ?removeBlock@MarkedAllocator@JSC@@QAEXPAVMarkedBlock@2@@Z + ?reportAbandonedObjectGraph@Heap@JSC@@QAEXXZ ?reportExtraMemoryCostSlowCase@Heap@JSC@@AAEXI@Z ?reserveAndCommit@OSAllocator@WTF@@SAPAXIW4Usage@12@_N11@Z ?reserveCapacity@StringBuilder@WTF@@QAEXI@Z @@ -293,7 +287,8 @@ EXPORTS ?reset@TimeoutChecker@JSC@@QAEXXZ ?resetDateCache@JSGlobalData@JSC@@QAEXXZ ?resize@StringBuilder@WTF@@QAEXI@Z - ?resolveRope@JSString@JSC@@ABEXPAVExecState@2@@Z + ?resizeOutOfLine@BitVector@WTF@@AAEXI@Z + ?resolveRope@JSRopeString@JSC@@ABEXPAVExecState@2@@Z ?restoreAll@Profile@JSC@@QAEXXZ ?retrieveCallerFromVMCode@Interpreter@JSC@@QBE?AVJSValue@2@PAVExecState@2@PAVJSFunction@2@@Z ?retrieveLastCaller@Interpreter@JSC@@QBEXPAVExecState@2@AAH1AAVUString@2@AAVJSValue@2@@Z @@ -308,6 +303,7 @@ EXPORTS ?setPrototype@JSObject@JSC@@QAEXAAVJSGlobalData@2@VJSValue@2@@Z ?setSetter@PropertyDescriptor@JSC@@QAEXVJSValue@2@@Z ?setUndefined@PropertyDescriptor@JSC@@QAEXXZ + ?setUnwrappedObject@JSGlobalThis@JSC@@IAEXAAVJSGlobalData@2@PAVJSGlobalObject@2@@Z ?setUpStaticFunctionSlot@JSC@@YA_NPAVExecState@1@PBVHashEntry@1@PAVJSObject@1@ABVIdentifier@1@AAVPropertySlot@1@@Z ?setWritable@PropertyDescriptor@JSC@@QAEX_N@Z ?setter@PropertyDescriptor@JSC@@QBE?AVJSValue@2@XZ @@ -324,6 +320,7 @@ EXPORTS ?stopProfiling@Profiler@JSC@@QAE?AV?$PassRefPtr@VProfile@JSC@@@WTF@@PAVExecState@2@ABVUString@2@@Z ?stopSampling@JSGlobalData@JSC@@QAEXXZ ?substringSharingImpl@UString@JSC@@QBE?AV12@II@Z + ?suggestedNewPropertyStorageSize@Structure@JSC@@QAEIXZ ?symbolTableGet@JSVariableObject@JSC@@IAE_NABVIdentifier@2@AAVPropertyDescriptor@2@@Z ?synthesizePrototype@JSValue@JSC@@QBEPAVJSObject@2@PAVExecState@2@@Z ?thisObject@DebuggerCallFrame@JSC@@QBEPAVJSObject@2@XZ @@ -368,11 +365,12 @@ EXPORTS ?waitForThreadCompletion@WTF@@YAHI@Z ?waitForThreadCompletion@WTF@@YAHIPAPAX@Z ?writable@PropertyDescriptor@JSC@@QBE_NXZ - ?writeBarrier@HandleHeap@JSC@@QAEXPAVJSValue@2@ABV32@@Z + ?writeBarrier@HandleSet@JSC@@QAEXPAVJSValue@2@ABV32@@Z ?yield@WTF@@YAXXZ WTFGetBacktrace WTFInvokeCrashHook WTFLog + WTFLogAlways WTFLogVerbose WTFReportArgumentAssertionFailure WTFReportAssertionFailure diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj index 8599dedb8..e71b433e0 100644 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj +++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj @@ -642,14 +642,6 @@ > </File> <File - RelativePath="..\..\wtf\DateMath.cpp" - > - </File> - <File - RelativePath="..\..\wtf\DateMath.h" - > - </File> - <File RelativePath="..\..\runtime\DatePrototype.cpp" > </File> @@ -778,11 +770,11 @@ > </File> <File - RelativePath="..\..\runtime\JSByteArray.cpp" + RelativePath="..\..\runtime\JSBoundFunction.cpp" > </File> <File - RelativePath="..\..\runtime\JSByteArray.h" + RelativePath="..\..\runtime\JSBoundFunction.h" > </File> <File @@ -810,14 +802,6 @@ > </File> <File - RelativePath="..\..\runtime\JSBoundFunction.cpp" - > - </File> - <File - RelativePath="..\..\runtime\JSBoundFunction.h" - > - </File> - <File RelativePath="..\..\runtime\JSGlobalData.cpp" > </File> @@ -905,6 +889,14 @@ RelativePath="..\..\runtime\JSString.h" > </File> + <File + RelativePath="..\..\runtime\JSStringJoiner.cpp" + > + </File> + <File + RelativePath="..\..\runtime\JSStringJoiner.h" + > + </File> <File RelativePath="..\..\runtime\JSType.h" > @@ -1098,10 +1090,22 @@ > </File> <File + RelativePath="..\..\runtime\RegExpCachedResult.cpp" + > + </File> + <File + RelativePath="..\..\runtime\RegExpCachedResult.h" + > + </File> + <File RelativePath="..\..\runtime\RegExpKey.h" > </File> <File + RelativePath="..\..\runtime\RegExpMatchesArray.cpp" + > + </File> + <File RelativePath="..\..\runtime\RegExpMatchesArray.h" > </File> @@ -1122,6 +1126,14 @@ > </File> <File + RelativePath="..\..\runtime\SamplingCounter.cpp" + > + </File> + <File + RelativePath="..\..\runtime\SamplingCounter.h" + > + </File> + <File RelativePath="..\..\runtime\ScopeChain.cpp" > </File> @@ -1133,14 +1145,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 +1482,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,22 +1710,22 @@ > </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" > @@ -1730,6 +1734,14 @@ > </File> <File + RelativePath="..\..\yarr\YarrCanonicalizeUCS2.cpp" + > + </File> + <File + RelativePath="..\..\yarr\YarrCanonicalizeUCS2.h" + > + </File> + <File RelativePath="..\..\yarr\YarrInterpreter.cpp" > </File> @@ -1810,35 +1822,35 @@ > </File> <File - RelativePath="..\..\jit\JITInlineMethods.h" + RelativePath="..\..\jit\JITExceptions.cpp" > </File> <File - RelativePath="..\..\jit\JITOpcodes.cpp" + RelativePath="..\..\jit\JITExceptions.h" > </File> <File - RelativePath="..\..\jit\JITOpcodes32_64.cpp" + RelativePath="..\..\jit\JITInlineMethods.h" > </File> <File - RelativePath="..\..\jit\JITPropertyAccess.cpp" + RelativePath="..\..\jit\JITOpcodes.cpp" > </File> <File - RelativePath="..\..\jit\JITPropertyAccess32_64.cpp" + RelativePath="..\..\jit\JITOpcodes32_64.cpp" > </File> <File - RelativePath="..\..\jit\JITStubCall.h" + RelativePath="..\..\jit\JITPropertyAccess.cpp" > </File> <File - RelativePath="..\..\jit\JITExceptions.cpp" + RelativePath="..\..\jit\JITPropertyAccess32_64.cpp" > </File> <File - RelativePath="..\..\jit\JITExceptions.h" + RelativePath="..\..\jit\JITStubCall.h" > </File> <File @@ -2065,158 +2077,198 @@ <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\HandleSet.cpp" + > + </File> + <File + RelativePath="..\..\heap\HandleSet.h" + > + </File> + <File + RelativePath="..\..\heap\WeakBlock.cpp" + > + </File> + <File + RelativePath="..\..\heap\WeakBlock.h" + > + </File> + <File + RelativePath="..\..\heap\WeakSet.cpp" + > + </File> + <File + RelativePath="..\..\heap\WeakSet.h" + > + </File> + <File + RelativePath="..\..\heap\WeakSetInlines.h" + > + </File> + <File + RelativePath="..\..\heap\WeakImpl.h" + > + </File> + <File + RelativePath="..\..\heap\WeakHandleOwner.cpp" + > + </File> + <File + RelativePath="..\..\heap\WeakHandleOwner.h" + > + </File> + <File + RelativePath="..\..\heap\HandleStack.cpp" + > + </File> + <File + RelativePath="..\..\heap\HandleStack.h" + > + </File> + <File + RelativePath="..\..\heap\BlockAllocator.cpp" + > + </File> + <File + RelativePath="..\..\heap\BlockAllocator.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" diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops index b0b45d38d..fac0af564 100644 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops +++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops @@ -6,7 +6,7 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\obj\JavaScriptCore\DerivedSources\";../../;../../API/;../../parser/;../../bytecompiler/;../../dfg/;../../jit/;../../llint/;../../runtime/;../../tools/;../../bytecode/;../../interpreter/;../../wtf/;../../profiler;../../assembler/;../../debugger/;../../heap/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\private";"$(ConfigurationBuildDir)\include";"$(ConfigurationBuildDir)\include\JavaScriptCore";"$(ConfigurationBuildDir)\include\private";"$(WebKitLibrariesDir)\include\pthreads"" + AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\obj\JavaScriptCore\DerivedSources\";../../;../../API/;../../parser/;../../bytecompiler/;../../dfg/;../../jit/;../../llint/;../../runtime/;../../tools/;../../bytecode/;../../interpreter/;../../wtf/;../../profiler;../../assembler/;../../debugger/;../../heap/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\private";"$(ConfigurationBuildDir)\include";"$(ConfigurationBuildDir)\include\JavaScriptCore";"$(ConfigurationBuildDir)\include\private";"$(ConfigurationBuildDir)\include\private\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads"" PreprocessorDefinitions="__STD_C" ForcedIncludeFiles="ICUVersion.h" /> diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj index 5e91b148b..9ab7648e3 100644 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj +++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj @@ -69,6 +69,15 @@ Name="VCNMakeTool" /> </Configuration> + <Configuration + Name="Release_PGO|Win32" + ConfigurationType="0" + InheritedPropertySheets=".\JavaScriptCoreGeneratedReleasePGO.vsprops" + > + <Tool + Name="VCNMakeTool" + /> + </Configuration> </Configurations> <References> </References> diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreReleasePGO.vsprops b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreReleasePGO.vsprops index c64bfc30a..79eca08ea 100644 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreReleasePGO.vsprops +++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreReleasePGO.vsprops @@ -5,4 +5,12 @@ Name="JavaScriptCoreReleasePGO" InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\production.vsprops;.\JavaScriptCoreCommon.vsprops;.\JavaScriptCoreCF.vsprops" > + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories=""$(ConfigurationBuildDir)\..\Production\lib"" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\..\Production\include\private"" + /> </VisualStudioPropertySheet> diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreReleasePGOOptimize.vsprops b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreReleasePGOOptimize.vsprops index b38b28556..e8faef70b 100644 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreReleasePGOOptimize.vsprops +++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreReleasePGOOptimize.vsprops @@ -5,4 +5,8 @@ Name="JavaScriptCoreReleasePGOOptimize" InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\production.vsprops;.\JavaScriptCoreCommon.vsprops;.\JavaScriptCoreCF.vsprops;.\JavaScriptCorePGOOptimize.vsprops" > + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories=""$(ConfigurationBuildDir)\..\Production\lib"" + /> </VisualStudioPropertySheet> diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCoreSubmit.sln b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCoreSubmit.sln index 2ff339fb1..f2ccebe6f 100644 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCoreSubmit.sln +++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCoreSubmit.sln @@ -7,22 +7,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCore", "JavaScrip EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCoreGenerated", "JavaScriptCore\JavaScriptCoreGenerated.vcproj", "{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}" - ProjectSection(ProjectDependencies) = postProject - {AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsc", "jsc\jsc.vcproj", "{C59E5129-B453-49B7-A52B-1E104715F76E}" ProjectSection(ProjectDependencies) = postProject {011D10F1-B656-4A1B-A0C3-3842F02122C5} = {011D10F1-B656-4A1B-A0C3-3842F02122C5} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTF", "WTF\WTF.vcproj", "{AA8A5A85-592B-4357-BC60-E0E91E026AF6}" - ProjectSection(ProjectDependencies) = postProject - {5AE5F5E4-782D-4F63-B4D7-3977B52B9950} = {5AE5F5E4-782D-4F63-B4D7-3977B52B9950} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTFGenerated", "WTF\WTFGenerated.vcproj", "{5AE5F5E4-782D-4F63-B4D7-3977B52B9950}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug_All|Win32 = Debug_All|Win32 @@ -83,38 +73,6 @@ Global {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGO|Win32.Build.0 = Release_PGO|Win32 {C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.ActiveCfg = Release|Win32 {C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.Build.0 = Release|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_All|Win32.Build.0 = Debug_All|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.ActiveCfg = Debug|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.Build.0 = Debug|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Production|Win32.ActiveCfg = Production|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Production|Win32.Build.0 = Production|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGO_Optimize|Win32.ActiveCfg = Production|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGO_Optimize|Win32.Build.0 = Production|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGO|Win32.ActiveCfg = Production|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGO|Win32.Build.0 = Production|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.ActiveCfg = Release|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.Build.0 = Release|Win32 - {5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 - {5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Debug_All|Win32.Build.0 = Debug_All|Win32 - {5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 - {5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 - {5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Debug|Win32.ActiveCfg = Debug|Win32 - {5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Debug|Win32.Build.0 = Debug|Win32 - {5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Production|Win32.ActiveCfg = Production|Win32 - {5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Production|Win32.Build.0 = Production|Win32 - {5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 - {5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 - {5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Release_PGO_Optimize|Win32.ActiveCfg = Production|Win32 - {5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Release_PGO_Optimize|Win32.Build.0 = Production|Win32 - {5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Release_PGO|Win32.ActiveCfg = Production|Win32 - {5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Release_PGO|Win32.Build.0 = Production|Win32 - {5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Release|Win32.ActiveCfg = Release|Win32 - {5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj b/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj deleted file mode 100644 index 3bf7817f3..000000000 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj +++ /dev/null @@ -1,1210 +0,0 @@ -<?xml version="1.0" encoding="windows-1251"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8.00" - Name="WTF" - ProjectGUID="{AA8A5A85-592B-4357-BC60-E0E91E026AF6}" - RootNamespace="WTF" - Keyword="Win32Proj" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - ConfigurationType="4" - InheritedPropertySheets=".\WTFDebug.vsprops" - CharacterSet="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - ConfigurationType="4" - InheritedPropertySheets=".\WTFRelease.vsprops" - CharacterSet="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Debug_All|Win32" - ConfigurationType="4" - InheritedPropertySheets=".\WTFDebugAll.vsprops" - CharacterSet="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Production|Win32" - ConfigurationType="4" - InheritedPropertySheets=".\WTFProduction.vsprops" - CharacterSet="1" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release_Cairo_CFLite|Win32" - ConfigurationType="4" - InheritedPropertySheets=".\WTFReleaseCairoCFLite.vsprops" - CharacterSet="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Debug_Cairo_CFLite|Win32" - ConfigurationType="4" - InheritedPropertySheets=".\WTFDebugCairoCFLite.vsprops" - CharacterSet="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="win" - > - <File - RelativePath="..\..\wtf\win\MainThreadWin.cpp" - > - </File> - <File - RelativePath="..\..\wtf\win\OwnPtrWin.cpp" - > - </File> - </Filter> - <Filter - Name="unicode" - > - <File - RelativePath="..\..\wtf\unicode\CharacterNames.h" - > - </File> - <File - RelativePath="..\..\wtf\unicode\Collator.h" - > - </File> - <File - RelativePath="..\..\wtf\unicode\Unicode.h" - > - </File> - <File - RelativePath="..\..\wtf\unicode\UnicodeMacrosFromICU.h" - > - </File> - <File - RelativePath="..\..\wtf\unicode\UTF8.cpp" - > - </File> - <File - RelativePath="..\..\wtf\unicode\UTF8.h" - > - </File> - <Filter - Name="icu" - > - <File - RelativePath="..\..\wtf\unicode\icu\CollatorICU.cpp" - > - </File> - <File - RelativePath="..\..\wtf\unicode\icu\UnicodeIcu.h" - > - </File> - </Filter> - </Filter> - <Filter - Name="text" - > - <File - RelativePath="..\..\wtf\text\ASCIIFastPath.h" - > - </File> - <File - RelativePath="..\..\wtf\text\AtomicString.cpp" - > - </File> - <File - RelativePath="..\..\wtf\text\AtomicString.h" - > - </File> - <File - RelativePath="..\..\wtf\text\AtomicStringHash.h" - > - </File> - <File - RelativePath="..\..\wtf\text\AtomicStringImpl.h" - > - </File> - <File - RelativePath="..\..\wtf\text\CString.cpp" - > - </File> - <File - RelativePath="..\..\wtf\text\CString.h" - > - </File> - <File - RelativePath="..\..\wtf\text\StringBuffer.h" - > - </File> - <File - RelativePath="..\..\wtf\text\StringBuilder.cpp" - > - </File> - <File - RelativePath="..\..\wtf\text\StringBuilder.h" - > - </File> - <File - RelativePath="..\..\wtf\text\StringConcatenate.h" - > - </File> - <File - RelativePath="..\..\wtf\text\StringHash.h" - > - </File> - <File - RelativePath="..\..\wtf\text\StringImpl.cpp" - > - </File> - <File - RelativePath="..\..\wtf\text\StringImpl.h" - > - </File> - <File - RelativePath="..\..\wtf\text\StringOperators.h" - > - </File> - <File - RelativePath="..\..\wtf\text\StringStatics.cpp" - > - </File> - <File - RelativePath="..\..\wtf\text\WTFString.cpp" - > - </File> - <File - RelativePath="..\..\wtf\text\WTFString.h" - > - </File> - </Filter> - <Filter - Name="dtoa" - > - <File - RelativePath="..\..\wtf\dtoa\bignum-dtoa.cc" - > - </File> - <File - RelativePath="..\..\wtf\dtoa\bignum-dtoa.h" - > - </File> - <File - RelativePath="..\..\wtf\dtoa\bignum.cc" - > - </File> - <File - RelativePath="..\..\wtf\dtoa\bignum.h" - > - </File> - <File - RelativePath="..\..\wtf\dtoa\cached-powers.cc" - > - </File> - <File - RelativePath="..\..\wtf\dtoa\cached-powers.h" - > - </File> - <File - RelativePath="..\..\wtf\dtoa\diy-fp.cc" - > - </File> - <File - RelativePath="..\..\wtf\dtoa\diy-fp.h" - > - </File> - <File - RelativePath="..\..\wtf\dtoa\double-conversion.cc" - > - </File> - <File - RelativePath="..\..\wtf\dtoa\double-conversion.h" - > - </File> - <File - RelativePath="..\..\wtf\dtoa\double.h" - > - </File> - <File - RelativePath="..\..\wtf\dtoa\fast-dtoa.cc" - > - </File> - <File - RelativePath="..\..\wtf\dtoa\fast-dtoa.h" - > - </File> - <File - RelativePath="..\..\wtf\dtoa\fixed-dtoa.cc" - > - </File> - <File - RelativePath="..\..\wtf\dtoa\fixed-dtoa.h" - > - </File> - <File - RelativePath="..\..\wtf\dtoa\strtod.cc" - > - </File> - <File - RelativePath="..\..\wtf\dtoa\strtod.h" - > - </File> - <File - RelativePath="..\..\wtf\dtoa\utils.h" - > - </File> - </Filter> - <Filter - Name="threads" - > - <File - RelativePath="..\..\wtf\threads\BinarySemaphore.cpp" - > - </File> - <File - RelativePath="..\..\wtf\threads\BinarySemaphore.h" - > - </File> - <Filter - Name="win" - > - <File - RelativePath="..\..\wtf\threads\win\BinarySemaphoreWin.cpp" - > - </File> - </Filter> - </Filter> - <File - RelativePath="..\..\wtf\Alignment.h" - > - </File> - <File - RelativePath="..\..\wtf\AlwaysInline.h" - > - </File> - <File - RelativePath="..\..\wtf\ArrayBuffer.cpp" - > - </File> - <File - RelativePath="..\..\wtf\ArrayBuffer.h" - > - </File> - <File - RelativePath="..\..\wtf\ArrayBufferView.cpp" - > - </File> - <File - RelativePath="..\..\wtf\ArrayBufferView.h" - > - </File> - <File - RelativePath="..\..\wtf\ASCIICType.h" - > - </File> - <File - RelativePath="..\..\wtf\Assertions.cpp" - > - </File> - <File - RelativePath="..\..\wtf\Assertions.h" - > - </File> - <File - RelativePath="..\..\wtf\Atomics.h" - > - </File> - <File - RelativePath="..\..\wtf\AVLTree.h" - > - </File> - <File - RelativePath="..\..\wtf\Bitmap.h" - > - </File> - <File - RelativePath="..\..\wtf\BitVector.cpp" - > - </File> - <File - RelativePath="..\..\wtf\BitVector.h" - > - </File> - <File - RelativePath="..\..\wtf\BlockStack.h" - > - </File> - <File - RelativePath="..\..\wtf\BloomFilter.h" - > - </File> - <File - RelativePath="..\..\wtf\BoundsCheckedPointer.h" - > - </File> - <File - RelativePath="..\..\wtf\BumpPointerAllocator.h" - > - </File> - <File - RelativePath="..\..\wtf\ByteArray.cpp" - > - </File> - <File - RelativePath="..\..\wtf\ByteArray.h" - > - </File> - <File - RelativePath="..\..\wtf\CheckedArithmetic.h" - > - </File> - <File - RelativePath="..\..\wtf\CheckedBoolean.h" - > - </File> - <File - RelativePath="..\..\wtf\Compiler.h" - > - </File> - <File - RelativePath="..\..\wtf\Complex.h" - > - </File> - <File - RelativePath="..\..\wtf\CryptographicallyRandomNumber.cpp" - > - </File> - <File - RelativePath="..\..\wtf\CryptographicallyRandomNumber.h" - > - </File> - <File - RelativePath="..\..\wtf\CurrentTime.cpp" - > - </File> - <File - RelativePath="..\..\wtf\CurrentTime.h" - > - </File> - <File - RelativePath="..\..\wtf\DataLog.cpp" - > - </File> - <File - RelativePath="..\..\wtf\DataLog.h" - > - </File> - <File - RelativePath="..\..\wtf\DecimalNumber.cpp" - > - </File> - <File - RelativePath="..\..\wtf\DecimalNumber.h" - > - </File> - <File - RelativePath="..\..\wtf\Decoder.h" - > - </File> - <File - RelativePath="..\..\wtf\Deque.h" - > - </File> - <File - RelativePath="..\..\wtf\DisallowCType.h" - > - </File> - <File - RelativePath="..\..\wtf\DoublyLinkedList.h" - > - </File> - <File - RelativePath="..\..\wtf\dtoa.cpp" - > - </File> - <File - RelativePath="..\..\wtf\dtoa.h" - > - </File> - <File - RelativePath="..\..\wtf\DynamicAnnotations.cpp" - > - </File> - <File - RelativePath="..\..\wtf\DynamicAnnotations.h" - > - </File> - <File - RelativePath="..\..\wtf\Encoder.h" - > - </File> - <File - RelativePath="..\..\wtf\FastAllocBase.h" - > - </File> - <File - RelativePath="..\..\wtf\FastMalloc.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - DisableSpecificWarnings="4702" - /> - </FileConfiguration> - <FileConfiguration - Name="Production|Win32" - > - <Tool - Name="VCCLCompilerTool" - DisableSpecificWarnings="4702" - /> - </FileConfiguration> - <FileConfiguration - Name="Release_Cairo_CFLite|Win32" - > - <Tool - Name="VCCLCompilerTool" - DisableSpecificWarnings="4702" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\wtf\FastMalloc.h" - > - </File> - <File - RelativePath="..\..\wtf\FixedArray.h" - > - </File> - <File - RelativePath="..\..\wtf\Float32Array.h" - > - </File> - <File - RelativePath="..\..\wtf\Float64Array.h" - > - </File> - <File - RelativePath="..\..\wtf\Forward.h" - > - </File> - <File - RelativePath="..\..\wtf\Functional.h" - > - </File> - <File - RelativePath="..\..\wtf\GetPtr.h" - > - </File> - <File - RelativePath="..\..\wtf\HashCountedSet.h" - > - </File> - <File - RelativePath="..\..\wtf\HashFunctions.h" - > - </File> - <File - RelativePath="..\..\wtf\HashIterators.h" - > - </File> - <File - RelativePath="..\..\wtf\HashMap.h" - > - </File> - <File - RelativePath="..\..\wtf\HashSet.h" - > - </File> - <File - RelativePath="..\..\wtf\HashTable.cpp" - > - </File> - <File - RelativePath="..\..\wtf\HashTable.h" - > - </File> - <File - RelativePath="..\..\wtf\HashTraits.h" - > - </File> - <File - RelativePath="..\..\wtf\HexNumber.h" - > - </File> - <File - RelativePath="..\..\wtf\Int16Array.h" - > - </File> - <File - RelativePath="..\..\wtf\Int32Array.h" - > - </File> - <File - RelativePath="..\..\wtf\Int8Array.h" - > - </File> - <File - RelativePath="..\..\wtf\ListHashSet.h" - > - </File> - <File - RelativePath="..\..\wtf\ListRefPtr.h" - > - </File> - <File - RelativePath="..\..\wtf\Locker.h" - > - </File> - <File - RelativePath="..\..\wtf\MainThread.cpp" - > - </File> - <File - RelativePath="..\..\wtf\MainThread.h" - > - </File> - <File - RelativePath="..\..\wtf\MallocZoneSupport.h" - > - </File> - <File - RelativePath="..\..\wtf\MathExtras.h" - > - </File> - <File - RelativePath="..\..\wtf\MD5.cpp" - > - </File> - <File - RelativePath="..\..\wtf\MD5.h" - > - </File> - <File - RelativePath="..\..\wtf\MessageQueue.h" - > - </File> - <File - RelativePath="..\..\wtf\MetaAllocator.cpp" - > - </File> - <File - RelativePath="..\..\wtf\MetaAllocator.h" - > - </File> - <File - RelativePath="..\..\wtf\MetaAllocatorHandle.h" - > - </File> - <File - RelativePath="..\..\wtf\Noncopyable.h" - > - </File> - <File - RelativePath="..\..\wtf\NonCopyingSort.h" - > - </File> - <File - RelativePath="..\..\wtf\NotFound.h" - > - </File> - <File - RelativePath="..\..\wtf\NullPtr.cpp" - > - </File> - <File - RelativePath="..\..\wtf\NullPtr.h" - > - </File> - <File - RelativePath="..\..\wtf\NumberOfCores.cpp" - > - </File> - <File - RelativePath="..\..\wtf\NumberOfCores.h" - > - </File> - <File - RelativePath="..\..\wtf\OSAllocatorWin.cpp" - > - </File> - <File - RelativePath="..\..\wtf\OSRandomSource.cpp" - > - </File> - <File - RelativePath="..\..\wtf\OSRandomSource.h" - > - </File> - <File - RelativePath="..\..\wtf\OwnArrayPtr.h" - > - </File> - <File - RelativePath="..\..\wtf\OwnPtr.h" - > - </File> - <File - RelativePath="..\..\wtf\OwnPtrCommon.h" - > - </File> - <File - RelativePath="..\..\wtf\PackedIntVector.h" - > - </File> - <File - RelativePath="..\..\wtf\PageAllocation.h" - > - </File> - <File - RelativePath="..\..\wtf\PageAllocationAligned.cpp" - > - </File> - <File - RelativePath="..\..\wtf\PageAllocationAligned.h" - > - </File> - <File - RelativePath="..\..\wtf\PageBlock.cpp" - > - </File> - <File - RelativePath="..\..\wtf\PageBlock.h" - > - </File> - <File - RelativePath="..\..\wtf\PageReservation.h" - > - </File> - <File - RelativePath="..\..\wtf\ParallelJobs.h" - > - </File> - <File - RelativePath="..\..\wtf\ParallelJobsGeneric.cpp" - > - </File> - <File - RelativePath="..\..\wtf\ParallelJobsGeneric.h" - > - </File> - <File - RelativePath="..\..\wtf\ParallelJobsLibdispatch.h" - > - </File> - <File - RelativePath="..\..\wtf\ParallelJobsOpenMP.h" - > - </File> - <File - RelativePath="..\..\wtf\PassOwnArrayPtr.h" - > - </File> - <File - RelativePath="..\..\wtf\PassOwnPtr.h" - > - </File> - <File - RelativePath="..\..\wtf\PassRefPtr.h" - > - </File> - <File - RelativePath="..\..\wtf\PassTraits.h" - > - </File> - <File - RelativePath="..\..\wtf\Platform.h" - > - </File> - <File - RelativePath="..\..\wtf\PossiblyNull.h" - > - </File> - <File - RelativePath="..\..\wtf\RandomNumber.cpp" - > - </File> - <File - RelativePath="..\..\wtf\RandomNumber.h" - > - </File> - <File - RelativePath="..\..\wtf\RandomNumberSeed.h" - > - </File> - <File - RelativePath="..\..\wtf\RedBlackTree.h" - > - </File> - <File - RelativePath="..\..\wtf\RefCounted.h" - > - </File> - <File - RelativePath="..\..\wtf\RefCountedLeakCounter.cpp" - > - </File> - <File - RelativePath="..\..\wtf\RefCountedLeakCounter.h" - > - </File> - <File - RelativePath="..\..\wtf\RefPtr.h" - > - </File> - <File - RelativePath="..\..\wtf\RefPtrHashMap.h" - > - </File> - <File - RelativePath="..\..\wtf\RetainPtr.h" - > - </File> - <File - RelativePath="..\..\wtf\SegmentedVector.h" - > - </File> - <File - RelativePath="..\..\wtf\SentinelLinkedList.h" - > - </File> - <File - RelativePath="..\..\wtf\SHA1.cpp" - > - </File> - <File - RelativePath="..\..\wtf\SHA1.h" - > - </File> - <File - RelativePath="..\..\wtf\SinglyLinkedList.h" - > - </File> - <File - RelativePath="..\..\wtf\SizeLimits.cpp" - > - </File> - <File - RelativePath="..\..\wtf\StackBounds.cpp" - > - </File> - <File - RelativePath="..\..\wtf\StackBounds.h" - > - </File> - <File - RelativePath="..\..\wtf\StaticConstructors.h" - > - </File> - <File - RelativePath="..\..\wtf\StdLibExtras.h" - > - </File> - <File - RelativePath="..\..\wtf\StringExtras.cpp" - > - </File> - <File - RelativePath="..\..\wtf\StringExtras.h" - > - </File> - <File - RelativePath="..\..\wtf\StringHasher.h" - > - </File> - <File - RelativePath="..\..\wtf\TCPackedCache.h" - > - </File> - <File - RelativePath="..\..\wtf\TCPageMap.h" - > - </File> - <File - RelativePath="..\..\wtf\TCSpinLock.h" - > - </File> - <File - RelativePath="..\..\wtf\TCSystemAlloc.cpp" - > - </File> - <File - RelativePath="..\..\wtf\TCSystemAlloc.h" - > - </File> - <File - RelativePath="..\..\wtf\TemporaryChange.h" - > - </File> - <File - RelativePath="..\..\wtf\Threading.cpp" - > - </File> - <File - RelativePath="..\..\wtf\Threading.h" - > - </File> - <File - RelativePath="..\..\wtf\ThreadingPrimitives.h" - > - </File> - <File - RelativePath="..\..\wtf\ThreadingWin.cpp" - > - </File> - <File - RelativePath="..\..\wtf\ThreadRestrictionVerifier.h" - > - </File> - <File - RelativePath="..\..\wtf\ThreadSafeRefCounted.h" - > - </File> - <File - RelativePath="..\..\wtf\ThreadSpecific.h" - > - </File> - <File - RelativePath="..\..\wtf\ThreadSpecificWin.cpp" - > - </File> - <File - RelativePath="..\..\wtf\TypeTraits.cpp" - > - </File> - <File - RelativePath="..\..\wtf\TypeTraits.h" - > - </File> - <File - RelativePath="..\..\wtf\UInt16Array.h" - > - </File> - <File - RelativePath="..\..\wtf\UInt32Array.h" - > - </File> - <File - RelativePath="..\..\wtf\UInt8Array.h" - > - </File> - <File - RelativePath="..\..\wtf\UnusedParam.h" - > - </File> - <File - RelativePath="..\..\wtf\ValueCheck.h" - > - </File> - <File - RelativePath="..\..\wtf\Vector.h" - > - </File> - <File - RelativePath="..\..\wtf\Vector3.h" - > - </File> - <File - RelativePath="..\..\wtf\VectorTraits.h" - > - </File> - <File - RelativePath="..\..\wtf\VMTags.h" - > - </File> - <File - RelativePath="..\..\wtf\WTFThreadData.cpp" - > - </File> - <File - RelativePath="..\..\wtf\WTFThreadData.h" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFCommon.vsprops b/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFCommon.vsprops deleted file mode 100644 index ed682216b..000000000 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFCommon.vsprops +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioPropertySheet - ProjectType="Visual C++" - Version="8.00" - Name="WTFCommon" - OutputDirectory="$(ConfigurationBuildDir)\lib" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\obj\JavaScriptCore\DerivedSources\";../../;"../../os-win32/";../../parser/;../../wtf/;../../wtf/threads;../../wtf/unicode/;"$(ConfigurationBuildDir)\include\private";"$(WebKitLibrariesDir)\include";../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni;"$(ConfigurationBuildDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads"" - PreprocessorDefinitions="__STD_C" - ForcedIncludeFiles="ICUVersion.h" - ProgramDataBaseFileName="$(OutDir)\$(TargetName).vc80.pdb" - /> - <Tool - Name="VCLibrarianTool" - AdditionalDependencies="user32.lib" - OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).lib" - /> -</VisualStudioPropertySheet> diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFDebug.vsprops b/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFDebug.vsprops deleted file mode 100644 index ecad463ee..000000000 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFDebug.vsprops +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioPropertySheet - ProjectType="Visual C++" - Version="8.00" - Name="WTFDebug" - InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\WTFCommon.vsprops" - > -</VisualStudioPropertySheet> diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFDebugAll.vsprops b/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFDebugAll.vsprops deleted file mode 100644 index 511618ff5..000000000 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFDebugAll.vsprops +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioPropertySheet - ProjectType="Visual C++" - Version="8.00" - Name="WTFDebugAll" - InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\WTFCommon.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops" - > -</VisualStudioPropertySheet> diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFDebugCairoCFLite.vsprops b/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFDebugCairoCFLite.vsprops deleted file mode 100644 index 3ef5c6c93..000000000 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFDebugCairoCFLite.vsprops +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioPropertySheet - ProjectType="Visual C++" - Version="8.00" - Name="WTFDebugCairoCFLite" - InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;.\WTFCommon.vsprops" - > -</VisualStudioPropertySheet> diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFGenerated.make b/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFGenerated.make deleted file mode 100644 index e7896fdfb..000000000 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFGenerated.make +++ /dev/null @@ -1,13 +0,0 @@ -all: - touch "%ConfigurationBuildDir%\buildfailed" - bash build-generated-files.sh "%ConfigurationBuildDir%" "$(WEBKITLIBRARIESDIR)" -!IF "$(OFFICIAL_BUILD)"!="1" - bash -c "python work-around-vs-dependency-tracking-bugs.py" -!ENDIF - copy-files.cmd - - -del "%ConfigurationBuildDir%\buildfailed" - -clean: - -del "%ConfigurationBuildDir%\buildfailed" - copy-files.cmd clean diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFGenerated.vcproj b/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFGenerated.vcproj deleted file mode 100644 index 3cb825062..000000000 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFGenerated.vcproj +++ /dev/null @@ -1,95 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8.00" - Name="WTFGenerated" - ProjectGUID="{5AE5F5E4-782D-4F63-B4D7-3977B52B9950}" - RootNamespace="WTFGenerated" - Keyword="MakeFileProj" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - ConfigurationType="0" - InheritedPropertySheets=".\WTFGeneratedDebug.vsprops" - > - <Tool - Name="VCNMakeTool" - /> - </Configuration> - <Configuration - Name="Debug_All|Win32" - ConfigurationType="0" - InheritedPropertySheets=".\WTFGeneratedDebugAll.vsprops" - > - <Tool - Name="VCNMakeTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - ConfigurationType="0" - InheritedPropertySheets=".\WTFGeneratedRelease.vsprops" - > - <Tool - Name="VCNMakeTool" - /> - </Configuration> - <Configuration - Name="Production|Win32" - ConfigurationType="0" - InheritedPropertySheets=".\WTFGeneratedProduction.vsprops" - > - <Tool - Name="VCNMakeTool" - /> - </Configuration> - <Configuration - Name="Release_Cairo_CFLite|Win32" - ConfigurationType="0" - InheritedPropertySheets=".\WTFGeneratedReleaseCairoCFLite.vsprops" - > - <Tool - Name="VCNMakeTool" - /> - </Configuration> - <Configuration - Name="Debug_Cairo_CFLite|Win32" - ConfigurationType="0" - InheritedPropertySheets=".\WTFGeneratedDebugCairoCFLite.vsprops" - > - <Tool - Name="VCNMakeTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath=".\build-generated-files.sh" - > - </File> - <File - RelativePath=".\copy-files.cmd" - > - </File> - <File - RelativePath=".\work-around-vs-dependency-tracking-bugs.py" - > - </File> - <File - RelativePath=".\WTFGenerated.make" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFGeneratedCommon.vsprops b/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFGeneratedCommon.vsprops deleted file mode 100644 index 5173df8ef..000000000 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFGeneratedCommon.vsprops +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioPropertySheet - ProjectType="Visual C++" - Version="8.00" - Name="WTFGeneratedCommon" - OutputDirectory="$(ConfigurationBuildDir)\lib" - > - <Tool - Name="VCNMakeTool" - BuildCommandLine="%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c

set CONFIGURATIONBUILDDIR=$(WebKitOutputDir)\$(ConfigurationName)
set PRODUCTION=$(PRODUCTION)
nmake /nologo -f WTFGenerated.make" - ReBuildCommandLine="%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c

set CONFIGURATIONBUILDDIR=$(WebKitOutputDir)\$(ConfigurationName)
set PRODUCTION=$(PRODUCTION)
nmake /nologo -f WTFGenerated.make clean
nmake -f WTFGenerated.make" - CleanCommandLine="%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c

set CONFIGURATIONBUILDDIR=$(WebKitOutputDir)\$(ConfigurationName)
set PRODUCTION=$(PRODUCTION)
nmake /nologo -f WTFGenerated.make clean" - /> -</VisualStudioPropertySheet> diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFGeneratedDebug.vsprops b/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFGeneratedDebug.vsprops deleted file mode 100644 index bc16aca94..000000000 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFGeneratedDebug.vsprops +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioPropertySheet - ProjectType="Visual C++" - Version="8.00" - Name="WTFGeneratedDebug" - InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\WTFGeneratedCommon.vsprops" - > -</VisualStudioPropertySheet> diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFGeneratedDebugAll.vsprops b/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFGeneratedDebugAll.vsprops deleted file mode 100644 index cacea402c..000000000 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFGeneratedDebugAll.vsprops +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioPropertySheet - ProjectType="Visual C++" - Version="8.00" - Name="WTFGeneratedDebugAll" - InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops;.\WTFGeneratedCommon.vsprops" - > -</VisualStudioPropertySheet> diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFGeneratedDebugCairoCFLite.vsprops b/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFGeneratedDebugCairoCFLite.vsprops deleted file mode 100644 index fbc371372..000000000 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFGeneratedDebugCairoCFLite.vsprops +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioPropertySheet - ProjectType="Visual C++" - Version="8.00" - Name="WTFGeneratedDebugCairoCFLite" - InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;.\WTFGeneratedCommon.vsprops" - > -</VisualStudioPropertySheet> diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFGeneratedProduction.vsprops b/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFGeneratedProduction.vsprops deleted file mode 100644 index 3e49ed6ea..000000000 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFGeneratedProduction.vsprops +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioPropertySheet - ProjectType="Visual C++" - Version="8.00" - Name="WTFGeneratedProduction" - InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\production.vsprops;.\WTFGeneratedCommon.vsprops" - > -</VisualStudioPropertySheet> diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFGeneratedRelease.vsprops b/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFGeneratedRelease.vsprops deleted file mode 100644 index 74a4debaa..000000000 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFGeneratedRelease.vsprops +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioPropertySheet - ProjectType="Visual C++" - Version="8.00" - Name="WTFGeneratedRelease" - InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WTFGeneratedCommon.vsprops" - > -</VisualStudioPropertySheet> diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFGeneratedReleaseCairoCFLite.vsprops b/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFGeneratedReleaseCairoCFLite.vsprops deleted file mode 100644 index 730d71941..000000000 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFGeneratedReleaseCairoCFLite.vsprops +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioPropertySheet - ProjectType="Visual C++" - Version="8.00" - Name="WTFGeneratedReleaseCairoCFLite" - InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;.\WTFGeneratedCommon.vsprops" - > -</VisualStudioPropertySheet> diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFPostBuild.cmd b/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFPostBuild.cmd deleted file mode 100644 index 26707cac6..000000000 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFPostBuild.cmd +++ /dev/null @@ -1 +0,0 @@ -if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed" diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFPreBuild.cmd b/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFPreBuild.cmd deleted file mode 100644 index a77077674..000000000 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFPreBuild.cmd +++ /dev/null @@ -1,6 +0,0 @@ -%SystemDrive%\cygwin\bin\which.exe bash -if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH% -cmd /c -if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed" -if errorlevel 1 exit 1 -echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed" diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFProduction.vsprops b/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFProduction.vsprops deleted file mode 100644 index 7e8904b00..000000000 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFProduction.vsprops +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioPropertySheet - ProjectType="Visual C++" - Version="8.00" - Name="WTFProduction" - InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\production.vsprops;.\WTFCommon.vsprops" - > -</VisualStudioPropertySheet> diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFRelease.vsprops b/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFRelease.vsprops deleted file mode 100644 index b0af34238..000000000 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFRelease.vsprops +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioPropertySheet - ProjectType="Visual C++" - Version="8.00" - Name="WTFRelease" - InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WTFCommon.vsprops" - > -</VisualStudioPropertySheet> diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFReleaseCairoCFLite.vsprops b/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFReleaseCairoCFLite.vsprops deleted file mode 100644 index c39ae128d..000000000 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFReleaseCairoCFLite.vsprops +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioPropertySheet - ProjectType="Visual C++" - Version="8.00" - Name="WTFReleaseCairoCFLite" - InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;.\WTFCommon.vsprops" - > -</VisualStudioPropertySheet> diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/build-generated-files.sh b/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/build-generated-files.sh deleted file mode 100755 index d1a4e560f..000000000 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/build-generated-files.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/bash - -# Determine whether we have the versioned ICU 4.0 or the unversioned ICU 4.4 -UNVERSIONED_ICU_LIB_PATH=$(cygpath -u "${WEBKITLIBRARIESDIR}/lib/libicuuc.lib") -ICUVERSION_H_PATH=$(cygpath -u "${CONFIGURATIONBUILDDIR}/include/private/ICUVersion.h") -if test \( ! -f "${ICUVERSION_H_PATH}" \) -o \( -f "${UNVERSIONED_ICU_LIB_PATH}" -a \( "${UNVERSIONED_ICU_LIB_PATH}" -nt "${ICUVERSION_H_PATH}" \) \) -then - mkdir -p "$(dirname "${ICUVERSION_H_PATH}")" - test ! -f "${UNVERSIONED_ICU_LIB_PATH}" - echo "#define U_DISABLE_RENAMING $?" > "${ICUVERSION_H_PATH}" -fi diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/copy-files.cmd b/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/copy-files.cmd deleted file mode 100755 index 3160e5cc1..000000000 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/copy-files.cmd +++ /dev/null @@ -1,37 +0,0 @@ -@echo off
-
-set PrivateHeadersDirectory=%CONFIGURATIONBUILDDIR%\include\private\JavaScriptCore
-
-if "%1" EQU "clean" goto :clean
-if "%1" EQU "rebuild" call :clean
-
-echo Copying WTF headers...
-for %%d in (
- wtf
- wtf\dtoa
- wtf\text
- wtf\threads
- wtf\unicode
- wtf\unicode\icu
-) do (
- mkdir "%PrivateHeadersDirectory%\%%d" 2>NUL
- xcopy /y /d ..\..\%%d\*.h "%PrivateHeadersDirectory%\%%d" >NUL
-)
-
-echo Copying other files...
-for %%f in (
- create_hash_table
- wtf\text\AtomicString.cpp
- wtf\text\StringBuilder.cpp
- wtf\text\StringImpl.cpp
- wtf\text\WTFString.cpp
-) do (
- echo F | xcopy /y /d ..\..\%%f "%PrivateHeadersDirectory%\%%f" >NUL
-)
-
-goto :EOF
-
-:clean
-
-echo Deleting copied files...
-if exist "%PrivateHeadersDirectory%" rmdir /s /q "%PrivateHeadersDirectory%" >NUL
diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/work-around-vs-dependency-tracking-bugs.py b/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/work-around-vs-dependency-tracking-bugs.py deleted file mode 100644 index 5060f69c4..000000000 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/work-around-vs-dependency-tracking-bugs.py +++ /dev/null @@ -1,66 +0,0 @@ -#!/usr/bin/env python - -import glob -import os -import re -import sys - - -# It's fragile to rely on the location of this script to find the top-level -# source directory. -TOP_LEVEL_DIRECTORY = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))) - - -def main(): - react_to_vsprops_changes() - react_to_webkit1_interface_changes() - - -def react_to_vsprops_changes(): - vsprops_directory = os.path.join(TOP_LEVEL_DIRECTORY, 'WebKitLibraries', 'win', 'tools', 'vsprops') - newest_vsprops_time = mtime_of_newest_file_matching_glob(os.path.join(vsprops_directory, '*.vsprops')) - - obj_directory = os.path.join(os.environ['CONFIGURATIONBUILDDIR'], 'obj') - - # Visual Studio isn't smart enough to figure out it needs to rebuild these file types when - # .vsprops files change (even if we touch wtf/Platform.h below), so we delete them to force them - # to be rebuilt. - for extension in ('dep', 'manifest', 'pch', 'res'): - for filepath in glob.iglob(os.path.join(obj_directory, '*', '*.%s' % extension)): - delete_if_older_than(filepath, newest_vsprops_time) - - # Touch wtf/Platform.h so all files will be recompiled. This is necessary - # to pick up changes to preprocessor macros (e.g., ENABLE_*). - wtf_platform_h = os.path.join(TOP_LEVEL_DIRECTORY, 'Source', 'JavaScriptCore', 'wtf', 'Platform.h') - touch_if_older_than(wtf_platform_h, newest_vsprops_time) - - -def react_to_webkit1_interface_changes(): - interfaces_directory = os.path.join(TOP_LEVEL_DIRECTORY, 'Source', 'WebKit', 'win', 'Interfaces') - newest_idl_time = mtime_of_newest_file_matching_glob(os.path.join(interfaces_directory, '*.idl')) - # WebKit.idl includes all the other IDL files, so needs to be rebuilt if any IDL file changes. - # But Visual Studio isn't smart enough to figure this out, so we touch WebKit.idl to ensure that - # it gets rebuilt. - touch_if_older_than(os.path.join(interfaces_directory, 'WebKit.idl'), newest_idl_time) - - -def mtime_of_newest_file_matching_glob(glob_pattern): - files = glob.glob(glob_pattern) - assert len(files), "Couldn't find any files matching glob %s" % glob_pattern - return max(map(os.path.getmtime, files)) - - -def delete_if_older_than(path, reference_time): - if os.path.getmtime(path) < reference_time: - print 'Deleting %s' % path - os.remove(path) - - -def touch_if_older_than(path, reference_time): - if os.path.getmtime(path) < reference_time: - print 'Touching %s' % path - os.utime(path, None) - - -if __name__ == '__main__': - sys.exit(main()) diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/jsc/jsc.vcproj b/Source/JavaScriptCore/JavaScriptCore.vcproj/jsc/jsc.vcproj index 21f13fc47..9e04fee9c 100644 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/jsc/jsc.vcproj +++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/jsc/jsc.vcproj @@ -448,7 +448,7 @@ </References> <Files> <File - RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\AtomicString.cpp" + RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\AtomicString.cpp" > </File> <File @@ -456,15 +456,15 @@ > </File> <File - RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\StringBuilder.cpp" + RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\StringBuilder.cpp" > </File> <File - RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\StringImpl.cpp" + RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\StringImpl.cpp" > </File> <File - RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\WTFString.cpp" + RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\WTFString.cpp" > </File> </Files> diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscReleasePGO.vsprops b/Source/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscReleasePGO.vsprops index 72789b98c..0e4fb8459 100644 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscReleasePGO.vsprops +++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscReleasePGO.vsprops @@ -5,4 +5,8 @@ Name="jscReleasePGO" InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\production.vsprops;.\jscCommon.vsprops" > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\..\Production\include\private";"$(ConfigurationBuildDir)\..\Production\include\private\wtf\text"" + /> </VisualStudioPropertySheet> diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/testRegExp/testRegExp.vcproj b/Source/JavaScriptCore/JavaScriptCore.vcproj/testRegExp/testRegExp.vcproj index 6d44dce91..b7053908d 100755 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/testRegExp/testRegExp.vcproj +++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/testRegExp/testRegExp.vcproj @@ -448,15 +448,15 @@ </References> <Files> <File - RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\AtomicString.cpp" + RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\AtomicString.cpp" > </File> <File - RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\StringBuilder.cpp" + RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\StringBuilder.cpp" > </File> <File - RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\StringImpl.cpp" + RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\StringImpl.cpp" > </File> <File @@ -464,7 +464,7 @@ > </File> <File - RelativePath="$(ConfigurationBuildDir)\include\private\JavaScriptCore\wtf\text\WTFString.cpp" + RelativePath="$(ConfigurationBuildDir)\include\private\wtf\text\WTFString.cpp" > </File> </Files> diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/testRegExp/testRegExpReleasePGO.vsprops b/Source/JavaScriptCore/JavaScriptCore.vcproj/testRegExp/testRegExpReleasePGO.vsprops index e226c42e6..079224b2b 100755 --- a/Source/JavaScriptCore/JavaScriptCore.vcproj/testRegExp/testRegExpReleasePGO.vsprops +++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/testRegExp/testRegExpReleasePGO.vsprops @@ -5,4 +5,8 @@ Name="testRegExpReleasePGO" InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\production.vsprops;.\testRegExpCommon.vsprops" > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\..\Production\include\private";"$(ConfigurationBuildDir)\..\Production\include\private\wtf\text"" + /> </VisualStudioPropertySheet> |