[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
bweinstein at apple.com
bweinstein at apple.com
Wed Dec 22 11:41:37 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit cbc7b394a3aa2986601babb4be9f98074fed31f0
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 3 23:44:20 2010 +0000
Fix the build by adding the needed MathML source files to WebCore's vcproj.
Also, Visual Studio did some drive-by resorting of the vcproj, the added
MathML files are the only important change.
* WebCore.vcproj/WebCore.vcproj:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64607 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 66b59e2..07010f6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-03 Brian Weinstein <bweinstein at apple.com>
+
+ Fix the build by adding the needed MathML source files to WebCore's vcproj.
+ Also, Visual Studio did some drive-by resorting of the vcproj, the added
+ MathML files are the only important change.
+
+ * WebCore.vcproj/WebCore.vcproj:
+
2010-08-03 Joseph Pecoraro <joepeck at webkit.org>
Reviewed by Nate Chapin.
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index e723572..da2d43d 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -545,6 +545,14 @@
>
</File>
<File
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\InspectorBackendDispatcher.cpp"
+ >
+ </File>
+ <File
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\InspectorBackendDispatcher.h"
+ >
+ </File>
+ <File
RelativePath="$(WebKitOutputDir)\obj\WebCore\DerivedSources\JSAbstractWorker.cpp"
>
<FileConfiguration
@@ -20685,14 +20693,6 @@
>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\InspectorBackendDispatcher.cpp"
- >
- </File>
- <File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\InspectorBackendDispatcher.h"
- >
- </File>
- <File
RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\RemoteInspectorFrontend.cpp"
>
</File>
@@ -22705,15 +22705,15 @@
>
</File>
<File
- RelativePath="..\loader\DocumentLoadTiming.h"
+ RelativePath="..\loader\DocumentLoader.cpp"
>
</File>
<File
- RelativePath="..\loader\DocumentLoader.cpp"
+ RelativePath="..\loader\DocumentLoader.h"
>
</File>
<File
- RelativePath="..\loader\DocumentLoader.h"
+ RelativePath="..\loader\DocumentLoadTiming.h"
>
</File>
<File
@@ -24360,15 +24360,15 @@
>
</File>
<File
- RelativePath="..\platform\graphics\WOFFFileFormat.cpp"
+ RelativePath="..\platform\graphics\UnitBezier.h"
>
</File>
<File
- RelativePath="..\platform\graphics\WOFFFileFormat.h"
+ RelativePath="..\platform\graphics\WOFFFileFormat.cpp"
>
</File>
<File
- RelativePath="..\platform\graphics\UnitBezier.h"
+ RelativePath="..\platform\graphics\WOFFFileFormat.h"
>
</File>
<Filter
@@ -40844,15 +40844,15 @@
RelativePath="..\bindings\ScriptControllerBase.h"
>
</File>
- <Filter
+ <Filter
Name="generic"
>
<File
- RelativePath="..\bindings\generic\ActiveDOMCallback.h"
+ RelativePath="..\bindings\generic\ActiveDOMCallback.cpp"
>
</File>
<File
- RelativePath="..\bindings\generic\ActiveDOMCallback.cpp"
+ RelativePath="..\bindings\generic\ActiveDOMCallback.h"
>
</File>
</Filter>
@@ -44560,11 +44560,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBDatabase.h"
- >
- </File>
- <File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBDatabaseError.cpp"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBDatabase.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -44616,11 +44612,15 @@
</FileConfiguration>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBDatabaseError.h"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBDatabase.h"
>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBDatabaseException.cpp"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBDatabase.h"
+ >
+ </File>
+ <File
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBDatabaseError.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -44672,11 +44672,11 @@
</FileConfiguration>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBDatabaseException.h"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBDatabaseError.h"
>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBDatabase.cpp"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBDatabaseException.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -44728,7 +44728,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBDatabase.h"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBDatabaseException.h"
>
</File>
<File
@@ -44792,7 +44792,7 @@
>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBIndex.cpp"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBFactory.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -44844,11 +44844,11 @@
</FileConfiguration>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBIndex.h"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBFactory.h"
>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBKey.cpp"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBIndex.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -44900,11 +44900,11 @@
</FileConfiguration>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBKey.h"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBIndex.h"
>
</File>
<File
- RelativePath="..\bindings\js\JSIDBKeyCustom.cpp"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBKey.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -44956,7 +44956,11 @@
</FileConfiguration>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBKeyRange.cpp"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBKey.h"
+ >
+ </File>
+ <File
+ RelativePath="..\bindings\js\JSIDBKeyCustom.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -45008,11 +45012,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBKeyRange.h"
- >
- </File>
- <File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBObjectStore.cpp"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBKeyRange.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -45064,6 +45064,10 @@
</FileConfiguration>
</File>
<File
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBKeyRange.h"
+ >
+ </File>
+ <File
RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBObjectStore.cpp"
>
<FileConfiguration
@@ -45116,11 +45120,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBObjectStore.h"
- >
- </File>
- <File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBRequest.cpp"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBObjectStore.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -45172,11 +45172,11 @@
</FileConfiguration>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBRequest.h"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBObjectStore.h"
>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBSuccessEvent.cpp"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBRequest.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -45228,11 +45228,11 @@
</FileConfiguration>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBSuccessEvent.h"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBRequest.h"
>
</File>
<File
- RelativePath="..\bindings\js\JSImageConstructor.cpp"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBSuccessEvent.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -45284,11 +45284,11 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\bindings\js\JSImageConstructor.h"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBSuccessEvent.h"
>
</File>
<File
- RelativePath="..\bindings\js\JSImageDataCustom.cpp"
+ RelativePath="..\bindings\js\JSImageConstructor.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -45340,7 +45340,11 @@
</FileConfiguration>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBFactory.cpp"
+ RelativePath="..\bindings\js\JSImageConstructor.h"
+ >
+ </File>
+ <File
+ RelativePath="..\bindings\js\JSImageDataCustom.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -45392,10 +45396,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBFactory.h"
- >
- </File>
- <File
RelativePath="..\bindings\js\JSInjectedScriptHostCustom.cpp"
>
<FileConfiguration
@@ -50137,19 +50137,19 @@
>
</File>
<File
- RelativePath="..\storage\IDBDatabase.h"
+ RelativePath="..\storage\IDBDatabase.cpp"
>
</File>
<File
- RelativePath="..\storage\IDBDatabase.cpp"
+ RelativePath="..\storage\IDBDatabase.h"
>
</File>
<File
- RelativePath="..\storage\IDBDatabaseBackendImpl.h"
+ RelativePath="..\storage\IDBDatabaseBackendImpl.cpp"
>
</File>
<File
- RelativePath="..\storage\IDBDatabaseBackendImpl.cpp"
+ RelativePath="..\storage\IDBDatabaseBackendImpl.h"
>
</File>
<File
@@ -50181,99 +50181,99 @@
>
</File>
<File
- RelativePath="..\storage\IDBIndex.cpp"
+ RelativePath="..\storage\IDBFactory.cpp"
>
</File>
<File
- RelativePath="..\storage\IDBIndex.h"
+ RelativePath="..\storage\IDBFactory.h"
>
</File>
<File
- RelativePath="..\storage\IDBIndexBackendInterface.h"
+ RelativePath="..\storage\IDBFactoryBackendImpl.cpp"
>
</File>
<File
- RelativePath="..\storage\IDBIndexBackendImpl.cpp"
+ RelativePath="..\storage\IDBFactoryBackendImpl.h"
>
</File>
<File
- RelativePath="..\storage\IDBIndexBackendImpl.h"
+ RelativePath="..\storage\IDBFactoryBackendInterface.cpp"
>
</File>
<File
- RelativePath="..\storage\IDBKey.cpp"
+ RelativePath="..\storage\IDBFactoryBackendInterface.h"
>
</File>
<File
- RelativePath="..\storage\IDBKey.h"
+ RelativePath="..\storage\IDBIndex.cpp"
>
</File>
<File
- RelativePath="..\storage\IDBKeyRange.cpp"
+ RelativePath="..\storage\IDBIndex.h"
>
</File>
<File
- RelativePath="..\storage\IDBKeyRange.h"
+ RelativePath="..\storage\IDBIndexBackendImpl.cpp"
>
</File>
<File
- RelativePath="..\storage\IDBObjectStore.cpp"
+ RelativePath="..\storage\IDBIndexBackendImpl.h"
>
</File>
<File
- RelativePath="..\storage\IDBObjectStore.h"
+ RelativePath="..\storage\IDBIndexBackendInterface.h"
>
</File>
<File
- RelativePath="..\storage\IDBObjectStoreBackendImpl.cpp"
+ RelativePath="..\storage\IDBKey.cpp"
>
</File>
<File
- RelativePath="..\storage\IDBObjectStoreBackendImpl.h"
+ RelativePath="..\storage\IDBKey.h"
>
</File>
<File
- RelativePath="..\storage\IDBObjectStoreBackendInterface.h"
+ RelativePath="..\storage\IDBKeyRange.cpp"
>
</File>
<File
- RelativePath="..\storage\IDBRequest.cpp"
+ RelativePath="..\storage\IDBKeyRange.h"
>
</File>
<File
- RelativePath="..\storage\IDBRequest.h"
+ RelativePath="..\storage\IDBObjectStore.cpp"
>
</File>
<File
- RelativePath="..\storage\IDBSuccessEvent.cpp"
+ RelativePath="..\storage\IDBObjectStore.h"
>
</File>
<File
- RelativePath="..\storage\IDBSuccessEvent.h"
+ RelativePath="..\storage\IDBObjectStoreBackendImpl.cpp"
>
</File>
<File
- RelativePath="..\storage\IDBFactory.cpp"
+ RelativePath="..\storage\IDBObjectStoreBackendImpl.h"
>
</File>
<File
- RelativePath="..\storage\IDBFactory.h"
+ RelativePath="..\storage\IDBObjectStoreBackendInterface.h"
>
</File>
<File
- RelativePath="..\storage\IDBFactoryBackendInterface.cpp"
+ RelativePath="..\storage\IDBRequest.cpp"
>
</File>
<File
- RelativePath="..\storage\IDBFactoryBackendInterface.h"
+ RelativePath="..\storage\IDBRequest.h"
>
</File>
<File
- RelativePath="..\storage\IDBFactoryBackendImpl.cpp"
+ RelativePath="..\storage\IDBSuccessEvent.cpp"
>
</File>
<File
- RelativePath="..\storage\IDBFactoryBackendImpl.h"
+ RelativePath="..\storage\IDBSuccessEvent.h"
>
</File>
<File
@@ -51617,6 +51617,114 @@
>
</File>
</Filter>
+ <Filter
+ Name="mathml"
+ >
+ <File
+ RelativePath="..\mathml\MathMLElement.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\mathml\MathMLElement.h"
+ >
+ </File>
+ <File
+ RelativePath="..\mathml\MathMLInlineContainerElement.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\mathml\MathMLInlineContainerElement.h"
+ >
+ </File>
+ <File
+ RelativePath="..\mathml\MathMLMathElement.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\mathml\MathMLMathElement.h"
+ >
+ </File>
+ <File
+ RelativePath="..\mathml\MathMLTextElement.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\mathml\MathMLTextElement.h"
+ >
+ </File>
+ <File
+ RelativePath="..\mathml\RenderMathMLBlock.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\mathml\RenderMathMLBlock.h"
+ >
+ </File>
+ <File
+ RelativePath="..\mathml\RenderMathMLFraction.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\mathml\RenderMathMLFraction.h"
+ >
+ </File>
+ <File
+ RelativePath="..\mathml\RenderMathMLMath.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\mathml\RenderMathMLMath.h"
+ >
+ </File>
+ <File
+ RelativePath="..\mathml\RenderMathMLOperator.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\mathml\RenderMathMLOperator.h"
+ >
+ </File>
+ <File
+ RelativePath="..\mathml\RenderMathMLRoot.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\mathml\RenderMathMLRoot.h"
+ >
+ </File>
+ <File
+ RelativePath="..\mathml\RenderMathMLRow.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\mathml\RenderMathMLRow.h"
+ >
+ </File>
+ <File
+ RelativePath="..\mathml\RenderMathMLSquareRoot.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\mathml\RenderMathMLSquareRoot.h"
+ >
+ </File>
+ <File
+ RelativePath="..\mathml\RenderMathMLSubSup.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\mathml\RenderMathMLSubSup.h"
+ >
+ </File>
+ <File
+ RelativePath="..\mathml\RenderMathMLUnderOver.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\mathml\RenderMathMLUnderOver.h"
+ >
+ </File>
+ </Filter>
<File
RelativePath="..\config.h"
>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list