Move all .props files from WebKitLibraries folder to WebKit Source folder.

https://bugs.webkit.org/show_bug.cgi?id=109761

Reviewed by Brent Fulgham.

* win/tools/vsprops/FeatureDefines.props: Removed.
* win/tools/vsprops/common.props: Removed.
* win/tools/vsprops/debug.props: Removed.
* win/tools/vsprops/release.props: Removed.
* win/tools/vsprops/releaseproduction.props: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@142917 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreDebug.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreDebug.props
index c6031d2bd993dcd22183af401e6e3c2137d4c206..1a109151890336f087efdf3ab1f555a6ede51b88 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreDebug.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreDebug.props
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />\r
     <Import Project="JavaScriptCoreCommon.props" />\r
     <Import Project="JavaScriptCoreCF.props" />\r
   </ImportGroup>\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorDebug.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorDebug.props
index 6e5efff5eddf24a42e8f7b9f217247614d2f32dd..f09711bdfd3bcf4fa898365237019d22eca1a0a2 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorDebug.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorDebug.props
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />\r
     <Import Project="JavaScriptCoreExportGeneratorCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorRelease.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorRelease.props
index 9e613187d427efd31df8c176134fdd8ade47ddb1..f4301b30890a0e39b441726b1f7474adbbb86dde 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorRelease.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorRelease.props
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\releaseproduction.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\releaseproduction.props" />\r
     <Import Project="JavaScriptCoreExportGeneratorCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGeneratedDebug.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGeneratedDebug.props
index eccbcc9ddd4ff246191d91f7cc7d8976a85d0bd9..fd40b149fd320e10f881cb27f562280aca5388e0 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGeneratedDebug.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGeneratedDebug.props
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />\r
     <Import Project="JavaScriptCoreGeneratedCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGeneratedRelease.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGeneratedRelease.props
index 1d7270517bee20004308e48dc9864c6066c89164..7dcf4687ea0a7c940d2c8a6dd19f72bb78f0b330 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGeneratedRelease.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGeneratedRelease.props
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-       <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-       <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-       <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
-       <Import Project="$(WebKit_Libraries)\tools\vsprops\releaseproduction.props" />\r
+       <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+       <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+       <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />\r
+       <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\releaseproduction.props" />\r
     <Import Project="JavaScriptCoreGeneratedCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreRelease.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreRelease.props
index 1a63cd676b90f0604b62ebce250bbe51913dd789..0a80a4fb06ab7b612b97d2ca291b33592f660a27 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreRelease.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreRelease.props
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\releaseproduction.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\releaseproduction.props" />\r
     <Import Project="JavaScriptCoreCommon.props" />\r
     <Import Project="JavaScriptCoreCF.props" />\r
   </ImportGroup>\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj b/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj
index 5d81b58ca2ac6388f24c7d12d0ab9699260deb30..178d7d61863144be990869fd4ff695e9865de7a7 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj
@@ -27,14 +27,14 @@
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
-    <Import Project="..\..\..\..\..\WebKitLibraries\win\tools\vsprops\release.props" />\r
-    <Import Project="..\..\..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\releaseproduction.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
-    <Import Project="..\..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj b/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj
index d56883d374e51a2db6fd58ef2aa9b749ea9b0c2a..04b9d1d48623959c4600f0c2042b33b5228acd3a 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj
@@ -27,14 +27,14 @@
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
-    <Import Project="..\..\..\..\..\WebKitLibraries\win\tools\vsprops\release.props" />\r
-    <Import Project="..\..\..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\releaseproduction.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
-    <Import Project="..\..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractorRelease.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractorRelease.props
index 376fa55ae23bbc780a2a659f8ffcff07ea078ba6..4c40b2d34d70d964a6b734a69195f731a7ec7f0c 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractorRelease.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractorRelease.props
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\releaseproduction.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\releaseproduction.props" />\r
     <Import Project="LLIntOffsetsExtractorCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup>\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscDebug.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscDebug.props
index dcaff7fa2187765e93370f8562bc8c32bec5d4ce..1c5982737da31a07847ace6cc42b997be6a5cc9d 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscDebug.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscDebug.props
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />\r
     <Import Project="jscCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscRelease.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscRelease.props
index 42acdce1f3ac85e2fcaa6ea10f2c325ca1d8c7c9..cb0e3130b6e75adb670520dcf7f0d927d1252d97 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscRelease.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscRelease.props
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\releaseproduction.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\releaseproduction.props" />\r
     <Import Project="jscCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpDebug.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpDebug.props
index 6adaee7335a269447d4886ff5c8561340be1df48..0beede5cc406b6659a263cc83d6ff88a11a947b7 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpDebug.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpDebug.props
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />\r
     <Import Project="testRegExpCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpRelease.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpRelease.props
index 34ac77a4201e02f2ca18baa3df54e5bb90562aa0..6d1e3c38ca694e030efc429209d6cbbcb2bcd034 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpRelease.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpRelease.props
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\releaseproduction.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\releaseproduction.props" />\r
     <Import Project="testRegExpCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiDebug.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiDebug.props
index f7f71fe8a5a211d1f2b97cb42458b51b31b307ee..89116b42156566bea4667a8d609b61472d44d341 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiDebug.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiDebug.props
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />\r
     <Import Project="testapiCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiRelease.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiRelease.props
index 2b6f0fc5aebcc98799b60cfd3548168262b34d6b..77e7f020f8193fbe6fcabcf2e0ef3cf9108bb1f5 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiRelease.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiRelease.props
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\releaseproduction.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\releaseproduction.props" />\r
     <Import Project="testapiCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj b/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj
index d1c6314a152a886e85639f942ed21d2181156a14..b701c1e5993da1cd436af94dbeca33fec670e921 100644 (file)
--- a/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj
+++ b/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj
@@ -29,11 +29,11 @@
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="$(ProjectDir)\..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r
@@ -45,13 +45,11 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\JavaScriptCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <MinimalRebuild>true</MinimalRebuild>\r
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Include;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\JavaScriptCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
     </ClCompile>\r
     <Lib>\r

diff --git a/Source/WTF/WTF.vcxproj/WTFDebug.props b/Source/WTF/WTF.vcxproj/WTFDebug.props
index 10e9911564fc6f5341b07d5d7b1131045f40a89c..6247be44191d765e5de447986526efa9e60428cc 100644 (file)
--- a/Source/WTF/WTF.vcxproj/WTFDebug.props
+++ b/Source/WTF/WTF.vcxproj/WTFDebug.props
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />\r
     <Import Project="WTFCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup />\r

diff --git a/Source/WTF/WTF.vcxproj/WTFGeneratedDebug.props b/Source/WTF/WTF.vcxproj/WTFGeneratedDebug.props
index ffff17d150a10f05f5925465bf3bb7071bc1053c..4fc3f0e566b70fa1f6dcdee10a9dfa72ef35d2c9 100644 (file)
--- a/Source/WTF/WTF.vcxproj/WTFGeneratedDebug.props
+++ b/Source/WTF/WTF.vcxproj/WTFGeneratedDebug.props
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-       <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-       <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-       <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+       <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+       <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+       <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />\r
     <Import Project="WTFGeneratedCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/WTF/WTF.vcxproj/WTFGeneratedRelease.props b/Source/WTF/WTF.vcxproj/WTFGeneratedRelease.props
index 628950650545f06fb0993e57176db603ab4d1be5..3e849250e799ad9687a6e7c96cf0c3c3968a7a1e 100644 (file)
--- a/Source/WTF/WTF.vcxproj/WTFGeneratedRelease.props
+++ b/Source/WTF/WTF.vcxproj/WTFGeneratedRelease.props
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-       <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-       <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-       <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
-       <Import Project="$(WebKit_Libraries)\tools\vsprops\releaseproduction.props" />\r
+       <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+       <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+       <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />\r
+       <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\releaseproduction.props" />\r
     <Import Project="WTFGeneratedCommon.props" />      \r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/WTF/WTF.vcxproj/WTFRelease.props b/Source/WTF/WTF.vcxproj/WTFRelease.props
index ba041ac28785eb6e069655953a488e779f3a4fca..75ddb4b84441838594cefc5624adf32c4fea12a6 100644 (file)
--- a/Source/WTF/WTF.vcxproj/WTFRelease.props
+++ b/Source/WTF/WTF.vcxproj/WTFRelease.props
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\releaseproduction.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\releaseproduction.props" />\r
     <Import Project="WTFCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup />\r

diff --git a/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinDebug.props b/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinDebug.props
index 6ae2785aea15217107aaf5cb9f20670a1026ff47..044a9277598d34bc673adb003a97c4b085549ffe 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinDebug.props
+++ b/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinDebug.props
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />\r
     <Import Project="QTMovieWinCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup>\r

diff --git a/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinRelease.props b/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinRelease.props
index 76dadde8893870236f7178ed8f23cad40ea593cd..4e7cc1296eb1776b80eec7fab8761ef2ebc4a873 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinRelease.props
+++ b/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinRelease.props
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\releaseproduction.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\releaseproduction.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />\r
     <Import Project="QTMovieWinCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup>\r

diff --git a/Source/WebCore/WebCore.vcxproj/WebCoreDebug.props b/Source/WebCore/WebCore.vcxproj/WebCoreDebug.props
index 417c77a056b885c5f3ffe303121e1995d443f58e..b0b573d04310d18e3acc17bbe982f2e0886aff96 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/WebCoreDebug.props
+++ b/Source/WebCore/WebCore.vcxproj/WebCoreDebug.props
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />\r
     <Import Project="WebCoreCommon.props" />\r
     <Import Project="WebCoreCG.props" />\r
     <Import Project="WebCoreCFNetwork.props" />\r

diff --git a/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedDebug.props b/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedDebug.props
index 152456376b2b6f7c687282359f573b0d0fe07c80..5f8db100bb664780353555052567d393c7d78853 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedDebug.props
+++ b/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedDebug.props
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />\r
     <Import Project="WebCoreGeneratedCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedRelease.props b/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedRelease.props
index 76a39169b425a674e8443ffe9cb5d6b1d681be8e..ed69614200314591665fa40816f2d0dd2022964d 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedRelease.props
+++ b/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedRelease.props
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\releaseproduction.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\releaseproduction.props" />\r
     <Import Project="WebCoreGeneratedCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/WebCore/WebCore.vcxproj/WebCoreRelease.props b/Source/WebCore/WebCore.vcxproj/WebCoreRelease.props
index f4aa02e6ff5bed542fc53ac9d75f310979cc69f0..98a9446f72411381d729f18a9a8380fb873ef428 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/WebCoreRelease.props
+++ b/Source/WebCore/WebCore.vcxproj/WebCoreRelease.props
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\releaseproduction.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\releaseproduction.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />\r
     <Import Project="WebCoreCommon.props" />\r
     <Import Project="WebCoreCG.props" />\r
     <Import Project="WebCoreCFNetwork.props" />\r

diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefines.props b/Source/WebKit/WebKit.vcxproj/FeatureDefines.props
similarity index 100%
rename from WebKitLibraries/win/tools/vsprops/FeatureDefines.props
rename to Source/WebKit/WebKit.vcxproj/FeatureDefines.props

diff --git a/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesDebug.props b/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesDebug.props
index 4943a9a169a6d02dcae773fda7b1dfb673d79ca7..5caecb89bff816d3d624001e34eac3a9fc4db505 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesDebug.props
+++ b/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesDebug.props
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />\r
     <Import Project="InterfacesCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesRelease.props b/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesRelease.props
index a90c7b7a855c9d95ed09a02c8cc5cf2e07e47185..ffb5346cb297af315a93c749f785d0f0766373c4 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesRelease.props
+++ b/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesRelease.props
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\releaseproduction.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\releaseproduction.props" />\r
     <Import Project="InterfacesCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitDebug.props b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitDebug.props
index 04eb617dd85e3d2086afc257dae25176bba32edd..88aecf6dbd12d772d390fc0717534b798ec06cac 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitDebug.props
+++ b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitDebug.props
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />\r
     <Import Project="WebKitCommon.props" />\r
     <Import Project="WebKitDirectX.props" />\r
     <Import Project="WebKitApple.props" />\r

diff --git a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitRelease.props b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitRelease.props
index 52b154ea8d7b5f97100eaea8e351164279f0df69..8ee30c7eee7e07b58d8b8e92d1984ba46dd7df19 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitRelease.props
+++ b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitRelease.props
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\releaseproduction.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\releaseproduction.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />\r
     <Import Project="WebKitCommon.props" />\r
     <Import Project="WebKitDirectX.props" />\r
     <Import Project="WebKitApple.props" />\r

diff --git a/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorDebug.props b/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorDebug.props
index 7521acbe344cdc75870d6dcbe128ccbf9c10ace3..0f7c76e94fc5d639a78d48761c61ec458277c84e 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorDebug.props
+++ b/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorDebug.props
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />\r
     <Import Project="WebKitExportGeneratorCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorRelease.props b/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorRelease.props
index 0344a12339cb4dcea0cf525b57828ef6e54e5a34..89337e41bf23065088435be3eb2434202facef65 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorRelease.props
+++ b/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorRelease.props
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\releaseproduction.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\releaseproduction.props" />\r
     <Import Project="WebKitExportGeneratorCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDDebug.props b/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDDebug.props
index b66e89a46df135e5700c5cc47bedb894e2edc1b2..b7e6082d9d976f47b801365067e9fefd37361ad5 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDDebug.props
+++ b/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDDebug.props
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />\r
     <Import Project="WebKitGUIDCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDRelease.props b/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDRelease.props
index 03935f35866c34fb8053e83ebfc19d485a0f01b2..c5f4d03226ae8d8d94ac7cd3669e26d9be8ca5d6 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDRelease.props
+++ b/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDRelease.props
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\releaseproduction.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\releaseproduction.props" />\r
     <Import Project="WebKitGUIDCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/WebKitLibraries/win/tools/vsprops/common.props b/Source/WebKit/WebKit.vcxproj/common.props
similarity index 100%
rename from WebKitLibraries/win/tools/vsprops/common.props
rename to Source/WebKit/WebKit.vcxproj/common.props

diff --git a/WebKitLibraries/win/tools/vsprops/debug.props b/Source/WebKit/WebKit.vcxproj/debug.props
similarity index 100%
rename from WebKitLibraries/win/tools/vsprops/debug.props
rename to Source/WebKit/WebKit.vcxproj/debug.props

diff --git a/WebKitLibraries/win/tools/vsprops/release.props b/Source/WebKit/WebKit.vcxproj/release.props
similarity index 100%
rename from WebKitLibraries/win/tools/vsprops/release.props
rename to Source/WebKit/WebKit.vcxproj/release.props

diff --git a/WebKitLibraries/win/tools/vsprops/releaseproduction.props b/Source/WebKit/WebKit.vcxproj/releaseproduction.props
similarity index 100%
rename from WebKitLibraries/win/tools/vsprops/releaseproduction.props
rename to Source/WebKit/WebKit.vcxproj/releaseproduction.props

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeDebug.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeDebug.props
index 06bcf156a3a4e26d4ba8f02a58a895e27e1689e0..23b82ce5c36189fdbfb81d699fce7fa663f1a975 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeDebug.props
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeDebug.props
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />\r
     <Import Project="DumpRenderTreeCommon.props" />\r
     <Import Project="DumpRenderTreeApple.props" />\r
   </ImportGroup>\r

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncherDebug.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncherDebug.props
index 0faa57f735aee32e8634f5d81e24358af954f2c6..a21ae9b57ad0222023dc8b9f256ffb5ff775e974 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncherDebug.props
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncherDebug.props
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />\r
     <Import Project="DumpRenderTreeLauncherCommon.props" />\r
   </ImportGroup>\r
 </Project>
\ No newline at end of file

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncherRelease.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncherRelease.props
index fb0c5c1567d6606b0626ddd2fa9c414d31e8e715..1d5e9347a9f159467e71d74e436e8c8e582fe137 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncherRelease.props
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncherRelease.props
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\releaseproduction.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\releaseproduction.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />\r
     <Import Project="DumpRenderTreeLauncherCommon.props" />\r
   </ImportGroup>\r
 </Project>
\ No newline at end of file

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeRelease.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeRelease.props
index d4497e02aa559e71397a60c5b50f8059f38fe4c3..3f9162ab756a0de85b1c73b04c6a31ea34a5c689 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeRelease.props
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeRelease.props
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\releaseproduction.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\releaseproduction.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />\r
     <Import Project="DumpRenderTreeCommon.props" />\r
     <Import Project="DumpRenderTreeApple.props" />\r
   </ImportGroup>\r

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffDebug.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffDebug.props
index 29ef2ddc9991c57fbd66137fe76f38bbd5e56f03..8a359d404291ceb23bdf43a634a9bc4b2cfb9c71 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffDebug.props
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffDebug.props
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />\r
     <Import Project="ImageDiffCommon.props" />\r
   </ImportGroup>\r
 </Project>
\ No newline at end of file

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncherDebug.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncherDebug.props
index 7fb6db6348dd19cc814dea60d22503ecf91caeeb..3238e41b8e2d50a306b2de8a21dd03bc11ffa617 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncherDebug.props
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncherDebug.props
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />\r
     <Import Project="ImageDiffLauncherCommon.props" />\r
   </ImportGroup>\r
 </Project>
\ No newline at end of file

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncherRelease.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncherRelease.props
index 4ab2fea9a766fbb98b320f71baa9d1f86da2aa93..a9413c0705a925bc5db5bda7e0037a238620e12c 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncherRelease.props
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncherRelease.props
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\releaseproduction.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\releaseproduction.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />\r
     <Import Project="ImageDiffLauncherCommon.props" />\r
   </ImportGroup>\r
 </Project>
\ No newline at end of file

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffRelease.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffRelease.props
index 9efc9d1633cc752bd597b02b4022fc1bf07a2bef..c5d74fbb16c38b11b91f345459084998bb904b4b 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffRelease.props
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffRelease.props
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\releaseproduction.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\releaseproduction.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />\r
     <Import Project="ImageDiffCommon.props" />\r
   </ImportGroup>\r
 </Project>
\ No newline at end of file

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginDebug.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginDebug.props
index 87aa3fd4b42b1276725f7147793ca293e299df20..15524fd744c0d9b1a6fbd894f6aa0812323ec8d8 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginDebug.props
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginDebug.props
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />\r
     <Import Project="TestNetscapePluginCommon.props" />\r
   </ImportGroup>\r
 </Project>
\ No newline at end of file

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginRelease.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginRelease.props
index 897412d53c8f4e41aa2e35d13aac9591bc2d01dc..acbade5f8676c0bb783408c92f59a939e01fd30a 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginRelease.props
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginRelease.props
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\releaseproduction.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\releaseproduction.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />\r
     <Import Project="TestNetscapePluginCommon.props" />\r
   </ImportGroup>\r
 </Project>
\ No newline at end of file

diff --git a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherDebug.props b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherDebug.props
index 084ff52249e3dc1e19ff8208ca67bbe947c0c294..9b5261c86f2108dbaa02a3991fd222ae79a70ad8 100644 (file)
--- a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherDebug.props
+++ b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherDebug.props
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />\r
     <Import Project="WinLauncherCommon.props" />\r
   </ImportGroup>\r
 </Project>
\ No newline at end of file

diff --git a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibDebug.props b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibDebug.props
index 8c4c7d95fb51f3974ca4d53448759ba962019451..920318a460f8ddd5aec9bbd993c43968fcafd742 100644 (file)
--- a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibDebug.props
+++ b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibDebug.props
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />\r
     <Import Project="WinLauncherLibCommon.props" />\r
   </ImportGroup>\r
 </Project>
\ No newline at end of file

diff --git a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibRelease.props b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibRelease.props
index a2c3a06593bd04b655fc2fd206226d895e14dea2..9c46ed968b939e8e04c9ec5a2417f454df2acedc 100644 (file)
--- a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibRelease.props
+++ b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibRelease.props
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\releaseproduction.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\releaseproduction.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />\r
     <Import Project="WinLauncherLibCommon.props" />\r
   </ImportGroup>\r
 </Project>
\ No newline at end of file

diff --git a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherRelease.props b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherRelease.props
index 2bd59a152cfc83f48e0e131ad9e6293fa75678a3..d64dd9c8f8a3ba704b8b95428253ecf82cb282d6 100644 (file)
--- a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherRelease.props
+++ b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherRelease.props
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\releaseproduction.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\releaseproduction.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />\r
     <Import Project="WinLauncherCommon.props" />\r
   </ImportGroup>\r
 </Project>
\ No newline at end of file

diff --git a/Tools/win/record-memory/record-memoryDebug.props b/Tools/win/record-memory/record-memoryDebug.props
index 5061a80aef13931a232ab650564747dfcd2eabe2..579492a86412d2b282fd3c14d5a4e6be8829c5cc 100644 (file)
--- a/Tools/win/record-memory/record-memoryDebug.props
+++ b/Tools/win/record-memory/record-memoryDebug.props
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />\r
     <Import Project="record-memoryCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Tools/win/record-memory/record-memoryRelease.props b/Tools/win/record-memory/record-memoryRelease.props
index 40703d8db7c43635911588b8e8e184ca49db1647..dc271fd2711886c57ab379c771078901c78c315b 100644 (file)
--- a/Tools/win/record-memory/record-memoryRelease.props
+++ b/Tools/win/record-memory/record-memoryRelease.props
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools\vsprops\releaseproduction.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\releaseproduction.props" />\r
     <Import Project="record-memoryCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 247f214d36c91ba4e0c4bf33238cf7d64fdfee19..ef206cb33226e8177f530e5df99341f46a405560 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,16 @@
+2013-02-13  Roger Fong  <roger_fong@apple.com>
+
+        Move all .props files from WebKitLibraries folder to WebKit Source folder.
+        https://bugs.webkit.org/show_bug.cgi?id=109761
+
+        Reviewed by Brent Fulgham.
+
+        * win/tools/vsprops/FeatureDefines.props: Removed.
+        * win/tools/vsprops/common.props: Removed.
+        * win/tools/vsprops/debug.props: Removed.
+        * win/tools/vsprops/release.props: Removed.
+        * win/tools/vsprops/releaseproduction.props: Removed.
+
 2013-02-07  Roger Fong  <roger_fong@apple.com>
 
         Unreviewed. More VS2010 WebKit solution touchups.