Replace tools32 folder with tools and update WebKit Windows solution accordingly.

<rdar://problem/14118143>.

Rubberstamped by Brent Fulgham.

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

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index e267c79ab44fb2f115cfd168e227ca20fd5b4f46..a3fd8553087604370666528f6bfaecf1c6dc7689 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,42 @@
+2013-06-18  Roger Fong  <roger_fong@apple.com>
+
+        Replace tools32 folder with tools and update WebKit Windows solution accordingly.
+        <rdar://problem/14118143>.
+
+        Rubberstamped by Brent Fulgham.
+
+        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+        * JavaScriptCore.vcxproj/JavaScriptCoreDebug.props:
+        * JavaScriptCore.vcxproj/JavaScriptCoreDebugCFLite.props:
+        * JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj:
+        * JavaScriptCore.vcxproj/JavaScriptCoreGeneratedDebug.props:
+        * JavaScriptCore.vcxproj/JavaScriptCoreGeneratedProduction.props:
+        * JavaScriptCore.vcxproj/JavaScriptCoreGeneratedRelease.props:
+        * JavaScriptCore.vcxproj/JavaScriptCorePostBuild.cmd:
+        * JavaScriptCore.vcxproj/JavaScriptCoreProduction.props:
+        * JavaScriptCore.vcxproj/JavaScriptCoreRelease.props:
+        * JavaScriptCore.vcxproj/JavaScriptCoreReleaseCFLite.props:
+        * JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj:
+        * JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj:
+        * JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractor.vcxproj:
+        * JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractorDebug.props:
+        * JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractorProduction.props:
+        * JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractorRelease.props:
+        * JavaScriptCore.vcxproj/jsc/jsc.vcxproj:
+        * JavaScriptCore.vcxproj/jsc/jscDebug.props:
+        * JavaScriptCore.vcxproj/jsc/jscProduction.props:
+        * JavaScriptCore.vcxproj/jsc/jscRelease.props:
+        * JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj:
+        * JavaScriptCore.vcxproj/testRegExp/testRegExpDebug.props:
+        * JavaScriptCore.vcxproj/testRegExp/testRegExpProduction.props:
+        * JavaScriptCore.vcxproj/testRegExp/testRegExpRelease.props:
+        * JavaScriptCore.vcxproj/testapi/testapi.vcxproj:
+        * JavaScriptCore.vcxproj/testapi/testapiDebug.props:
+        * JavaScriptCore.vcxproj/testapi/testapiDebugCFLite.props:
+        * JavaScriptCore.vcxproj/testapi/testapiProduction.props:
+        * JavaScriptCore.vcxproj/testapi/testapiRelease.props:
+        * JavaScriptCore.vcxproj/testapi/testapiReleaseCFLite.props:
+
 2013-06-17  Roger Fong  <roger_fong@apple.com>
 
         Modify Windows makefiles to copy some bin output into Program Files.

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
index 27720d2eb504229afd3a9470cf98e0120240bdb6..d90ff2ed581c3c66d8db8db0e9ffd08cdb61ee78 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
@@ -77,7 +77,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="JavaScriptCoreDebug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreDebug.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreDebug.props
index bd343037b6a00fddd236a5b50f72b09f864fd46d..c6031d2bd993dcd22183af401e6e3c2137d4c206 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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\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="JavaScriptCoreCommon.props" />\r
     <Import Project="JavaScriptCoreCF.props" />\r
   </ImportGroup>\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreDebugCFLite.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreDebugCFLite.props
index c5ac8b8773edf73a0ab8b9f7f5c89cdee7489d65..43bb4ff6ff0f35e542c9ae0e6b5c82867b0530ec 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreDebugCFLite.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreDebugCFLite.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)\tools32\vsprops\FeatureDefinesCairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefinesCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
     <Import Project="JavaScriptCoreCommon.props" />\r
     <Import Project="JavaScriptCoreCFLite.props" />\r
   </ImportGroup>\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj
index 03bb358c08768788bf85ad8fab79096df4d3cd40..34e5e4fe94e6fd7813dbd51021cf108df7922317 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj
@@ -75,7 +75,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="JavaScriptCoreGeneratedDebug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />\r
   </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

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGeneratedDebug.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGeneratedDebug.props
index 83099ffe20a42cb182b9e30faab192c42d9e5f2d..eccbcc9ddd4ff246191d91f7cc7d8976a85d0bd9 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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\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="JavaScriptCoreGeneratedCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGeneratedProduction.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGeneratedProduction.props
index b53cc8a5f21656e6cbc7bb563623bb5d7de94c8c..04d85961edbc4986af673329c79d511e280861a5 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGeneratedProduction.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGeneratedProduction.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\production.props" />\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\production.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 6b9eaeb9cb3991199c3d6292fb08f7e3ef1d3531..abc39d5d2a5aa091f024b9af7423d89ca15f84ab 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGeneratedRelease.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGeneratedRelease.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\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="JavaScriptCoreGeneratedCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCorePostBuild.cmd b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCorePostBuild.cmd
index b367b5660672666cdfbf57595325833fcbacfc86..8b0a3a4586bbe3f46197385b9bdb3e9e6c935a34 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCorePostBuild.cmd
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCorePostBuild.cmd
@@ -1,2 +1,2 @@
-if exist "%WEBKIT_LIBRARIES%\tools32\VersionStamper\VersionStamper.exe" "%WEBKIT_LIBRARIES%\tools32\VersionStamper\VersionStamper.exe" --verbose "%TARGETPATH%"
+if exist "%WEBKIT_LIBRARIES%\tools\VersionStamper\VersionStamper.exe" "%WEBKIT_LIBRARIES%\tools\VersionStamper\VersionStamper.exe" --verbose "%TARGETPATH%"
 if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreProduction.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreProduction.props
index 2666139b0cfbbc54c88ec500500893c44cb867b8..628c501b828cf580dcf67e3e75c8904481c8fca0 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreProduction.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreProduction.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\production.props" />\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\production.props" />\r
     <Import Project="JavaScriptCoreCommon.props" />\r
     <Import Project="JavaScriptCoreCF.props" />\r
   </ImportGroup>\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreRelease.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreRelease.props
index 4e6051c4fbb8e2ffe543dddbeeddf18c9a99cfed..96bd35f25ca6b3f6c9c6b60207facc030e2281b6 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreRelease.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreRelease.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\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="JavaScriptCoreCommon.props" />\r
     <Import Project="JavaScriptCoreCF.props" />\r
   </ImportGroup>\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreReleaseCFLite.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreReleaseCFLite.props
index d26417c467595740901511f4614bb8514d553b78..d28b28b435dd6c3b4a625bd1e427c639f0011343 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreReleaseCFLite.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreReleaseCFLite.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)\tools32\vsprops\FeatureDefinesCairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefinesCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
     <Import Project="JavaScriptCoreCommon.props" />\r
     <Import Project="JavaScriptCoreCFLite.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 72471290e9e478fad2f350cfce81622a2523b990..5acbf03570eff2e49d6b733d9cd4a35a597e106b 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj
@@ -55,34 +55,34 @@
   </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="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|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="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|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="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\production.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\production.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="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|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="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.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 1613c28377d628e7d1aaa2b6940019466655422d..fa9240661a39300baec5f9f353b063708ca51c64 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj
@@ -55,34 +55,34 @@
   </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="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|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="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|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="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\production.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\production.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="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|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="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractor.vcxproj b/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractor.vcxproj
index d92948e62612fae685d067e10b19056f2a3a091a..7b0ca287e6624be59fa3c80ddfe081eafaad0a5f 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractor.vcxproj
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractor.vcxproj
@@ -80,7 +80,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="LLIntOffsetsExtractorDebug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractorDebug.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractorDebug.props
index 8b5b79883725b11cad07a3f23c0ff319d52412f2..efc2abf5ad9c4e3293d15d34cea23c7ecc2e6185 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractorDebug.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractorDebug.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\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="LLIntOffsetsExtractorCommon.props" />\r
   </ImportGroup>\r
 </Project>
\ No newline at end of file

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractorProduction.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractorProduction.props
index f2b51f552752d4e65a47d5031b2a3c42c6fe58dd..d9e84cbe0989e3625fabfe0c790660d0e5d4dd06 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractorProduction.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractorProduction.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\production.props" />\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\production.props" />\r
     <Import Project="LLIntOffsetsExtractorCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractorRelease.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractorRelease.props
index 0ada04090c87d0eceae2961fbb254c9fefa98709..77252c1348087cfc7fd4e8ea97475be981d17cf4 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractorRelease.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractorRelease.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\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="LLIntOffsetsExtractorCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup>\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jsc.vcxproj b/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jsc.vcxproj
index 8750adc2a77631d994e1a6a64a208956fae57bf1..9fc964c994ff30dbef135a884a692b4057491e1b 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jsc.vcxproj
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jsc.vcxproj
@@ -76,7 +76,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="jscDebug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscDebug.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscDebug.props
index f8a5d4e78c904f794b81dfa856bdc5af6abf5a97..dcaff7fa2187765e93370f8562bc8c32bec5d4ce 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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\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="jscCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscProduction.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscProduction.props
index 84227e65ce8a630770b97539d4ff82973e355e8d..7a2fb58d5dcc95149c2a7723104f2cff9ce60c43 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscProduction.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscProduction.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\production.props" />\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\production.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 2822e4092a4b5549fc76fc244b7038029bdce66e..24d985fe360f8c702503d561fcb174fd0bb98a4a 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscRelease.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscRelease.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\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="jscCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj
index a31b7bec89e74cb754d15480547e3f374d842c53..c29f52db88d09668d600caf628ea7f4a3cd8c869 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj
@@ -77,7 +77,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="testRegExpDebug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpDebug.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpDebug.props
index 65a744cea0beeccde58c75c7d53ac7fbd081e4d9..6adaee7335a269447d4886ff5c8561340be1df48 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)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
     <Import Project="testRegExpCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpProduction.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpProduction.props
index f7911c0f536ca3eaf8407302ba2e8b5f95ef14b8..5fd2174b0c2a3c2479cd1833e6b4fe0860216d56 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpProduction.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpProduction.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)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\production.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\production.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 d192bf4d991860c669ba3d31186d5ce236af3b68..e830b2f17c5798957a2d97baa0b8dc8f6aba6d3a 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpRelease.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpRelease.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)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
     <Import Project="testRegExpCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapi.vcxproj b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapi.vcxproj
index 2b7e50a0f029c7528359ff389a1832e3673491af..59d31eea96ed47aa250101cbc09c4747624c3701 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapi.vcxproj
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapi.vcxproj
@@ -76,7 +76,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="testapiDebug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiDebug.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiDebug.props
index a06d74fead9b6efc5d84196eb53583f66811d1f8..f7f71fe8a5a211d1f2b97cb42458b51b31b307ee 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)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
     <Import Project="testapiCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiDebugCFLite.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiDebugCFLite.props
index abdafa6a593142bb64f2bcb5db170c957f31899f..3c8b93b2ec98c7e56d79a057294a28b0a06b3a10 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiDebugCFLite.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiDebugCFLite.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)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
     <Import Project="testapiCommonCFLite.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiProduction.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiProduction.props
index 26d2b1147e7d72f814469b0e006ef2c87918a431..c7ac5d0e0ae814f98b03a79977c3513a6ac11c7c 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiProduction.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiProduction.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)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\production.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\production.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 b603a8389d121a4735d01207e4bfe22eb3e0ddab..60b1f0d3570130e9ffe5e38428c44d3d1414f058 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiRelease.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiRelease.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)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
     <Import Project="testapiCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiReleaseCFLite.props b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiReleaseCFLite.props
index 688c4428fcfdf87a25c778ca668b858f23241bcb..c93fd507d79da5331a17c0f90a0094a65d9bd4d0 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiReleaseCFLite.props
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiReleaseCFLite.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)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
     <Import Project="testapiCommonCFLite.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/ThirdParty/ChangeLog b/Source/ThirdParty/ChangeLog
index bc61f9889316c8825b372f79701a70e3622127bf..0b5b4344fec53c6d975e807e503254e738f92c91 100644 (file)
--- a/Source/ThirdParty/ChangeLog
+++ b/Source/ThirdParty/ChangeLog
@@ -1,3 +1,12 @@
+2013-06-18  Roger Fong  <roger_fong@apple.com>
+
+        Replace tools32 folder with tools and update WebKit Windows solution accordingly.
+        <rdar://problem/14118143>.
+
+        Rubberstamped by Brent Fulgham.
+
+        * gtest/msvc/gtest-md.vcxproj:
+
 2013-06-03  Roger Fong  <roger_fong@apple.com>
 
         Nuke VS2005 files from the tree.

diff --git a/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj b/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj
index b69593b795472bad11a74d0fa31440a701ab59bb..d5d06469ec962448c1cb4116a00902c44863c446 100644 (file)
--- a/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj
+++ b/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj
@@ -61,28 +61,28 @@
   </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="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|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="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|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="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\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="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|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="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index 968558fafae10878300556971300edbca6fb1186..ae3817e0a29a5f935421f70a477ffa53b8a5d0d7 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,23 @@
+2013-06-18  Roger Fong  <roger_fong@apple.com>
+
+        Replace tools32 folder with tools and update WebKit Windows solution accordingly.
+        <rdar://problem/14118143>.
+
+        Rubberstamped by Brent Fulgham.
+
+        * WTF.vcxproj/WTF.vcxproj:
+        * WTF.vcxproj/WTFDebug.props:
+        * WTF.vcxproj/WTFDebugWinCairo.props:
+        * WTF.vcxproj/WTFGenerated.vcxproj:
+        * WTF.vcxproj/WTFGeneratedDebug.props:
+        * WTF.vcxproj/WTFGeneratedProduction.props:
+        * WTF.vcxproj/WTFGeneratedRelease.props:
+        * WTF.vcxproj/WTFProduction.props:
+        * WTF.vcxproj/WTFRelease.props:
+        * WTF.vcxproj/WTFReleaseWinCairo.props:
+        * WTF.vcxproj/work-around-vs-dependency-tracking-bugs.py:
+        (react_to_vsprops_changes):
+
 2013-06-18  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
 
         PackedIntVector: check template arguments at compile time

diff --git a/Source/WTF/WTF.vcxproj/WTF.vcxproj b/Source/WTF/WTF.vcxproj/WTF.vcxproj
index 45f539d55673313c9ef193ff35c2df2a0f2e7c23..0d22433fffee81be109ad6644c876ed65e2204b2 100644 (file)
--- a/Source/WTF/WTF.vcxproj/WTF.vcxproj
+++ b/Source/WTF/WTF.vcxproj/WTF.vcxproj
@@ -316,7 +316,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="WTFDebug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />\r
   </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

diff --git a/Source/WTF/WTF.vcxproj/WTFDebug.props b/Source/WTF/WTF.vcxproj/WTFDebug.props
index c307856ca806c63fe455d07be3b85f3dd1f59a64..10e9911564fc6f5341b07d5d7b1131045f40a89c 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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\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="WTFCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup />\r

diff --git a/Source/WTF/WTF.vcxproj/WTFDebugWinCairo.props b/Source/WTF/WTF.vcxproj/WTFDebugWinCairo.props
index b14435fd467e5851c948aa334f6575d62c3d118a..c8051a3ce621ede9eed963d8293c99f82ce2db65 100644 (file)
--- a/Source/WTF/WTF.vcxproj/WTFDebugWinCairo.props
+++ b/Source/WTF/WTF.vcxproj/WTFDebugWinCairo.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)\tools32\vsprops\FeatureDefinesCairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefinesCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
     <Import Project="WTFCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup />\r

diff --git a/Source/WTF/WTF.vcxproj/WTFGenerated.vcxproj b/Source/WTF/WTF.vcxproj/WTFGenerated.vcxproj
index 6f85023bdd2c9811db290cba3521ba4be8a59878..4f430bc129330cb58aa11f19562ea1c62b639d8e 100644 (file)
--- a/Source/WTF/WTF.vcxproj/WTFGenerated.vcxproj
+++ b/Source/WTF/WTF.vcxproj/WTFGenerated.vcxproj
@@ -75,7 +75,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="WTFGeneratedDebug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />\r
   </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

diff --git a/Source/WTF/WTF.vcxproj/WTFGeneratedDebug.props b/Source/WTF/WTF.vcxproj/WTFGeneratedDebug.props
index 232f772a76e75e0fd995229db5dd17fa0e912705..ffff17d150a10f05f5925465bf3bb7071bc1053c 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)\tools32\vsprops\FeatureDefines.props" />\r
-       <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-       <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\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="WTFGeneratedCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/WTF/WTF.vcxproj/WTFGeneratedProduction.props b/Source/WTF/WTF.vcxproj/WTFGeneratedProduction.props
index 9dcbda825075ccbee33ad1b8a98f5c2f3a38a507..3430017d17bc0a512482c00321a643a2eb312ff2 100644 (file)
--- a/Source/WTF/WTF.vcxproj/WTFGeneratedProduction.props
+++ b/Source/WTF/WTF.vcxproj/WTFGeneratedProduction.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\production.props" />\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\production.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 2b3862bf49d6f752a993cc5e2c190a86289512f3..95f2a13a66d20ca2a343cc2182716c446933c228 100644 (file)
--- a/Source/WTF/WTF.vcxproj/WTFGeneratedRelease.props
+++ b/Source/WTF/WTF.vcxproj/WTFGeneratedRelease.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\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="WTFGeneratedCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/WTF/WTF.vcxproj/WTFProduction.props b/Source/WTF/WTF.vcxproj/WTFProduction.props
index a7ecabd78ad7c8ca13f673842754b08d8a6e940e..16de6e33fc26f38efc54152ab202892e5e72b86e 100644 (file)
--- a/Source/WTF/WTF.vcxproj/WTFProduction.props
+++ b/Source/WTF/WTF.vcxproj/WTFProduction.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\production.props" />\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\production.props" />\r
     <Import Project="WTFCommon.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 ea912a8def85c297005ad12589f64c57d92294eb..708e1d1ec50e744fa8c7243c2974a13447c43153 100644 (file)
--- a/Source/WTF/WTF.vcxproj/WTFRelease.props
+++ b/Source/WTF/WTF.vcxproj/WTFRelease.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\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="WTFCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup />\r

diff --git a/Source/WTF/WTF.vcxproj/WTFReleaseWinCairo.props b/Source/WTF/WTF.vcxproj/WTFReleaseWinCairo.props
index bef8b9c36f851e18c4c1b6ccc75fef94a0f27d2d..40e480d783eb2a9ad7dbf246adf7a9bfb29baaaa 100644 (file)
--- a/Source/WTF/WTF.vcxproj/WTFReleaseWinCairo.props
+++ b/Source/WTF/WTF.vcxproj/WTFReleaseWinCairo.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)\tools32\vsprops\FeatureDefinesCairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefinesCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
     <Import Project="WTFCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup />\r

diff --git a/Source/WTF/WTF.vcxproj/work-around-vs-dependency-tracking-bugs.py b/Source/WTF/WTF.vcxproj/work-around-vs-dependency-tracking-bugs.py
index 940e2d2d5152dfebabeffafa9bfed54a3d1596f9..51d650f7fbc5ac4914ebe3d299e74e798878731c 100644 (file)
--- a/Source/WTF/WTF.vcxproj/work-around-vs-dependency-tracking-bugs.py
+++ b/Source/WTF/WTF.vcxproj/work-around-vs-dependency-tracking-bugs.py
@@ -17,7 +17,7 @@ def main():
 
 
 def react_to_vsprops_changes():
-    vsprops_directory = os.path.join(WEBKIT_LIBRARIES, 'tools32', 'vsprops')
+    vsprops_directory = os.path.join(WEBKIT_LIBRARIES, 'tools', 'vsprops')
     newest_vsprops_time = mtime_of_newest_file_matching_glob(os.path.join(vsprops_directory, '*.props'))
 
     obj_directory = os.path.join(os.environ['CONFIGURATIONBUILDDIR'], 'obj32')

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index f3048ffb68c4bab56fd10d97fdba3ff0f4a2bf53..adb2d37ab2043cc94eb24a8b54b770780fb4a044 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,32 @@
+2013-06-18  Roger Fong  <roger_fong@apple.com>
+
+        Replace tools32 folder with tools and update WebKit Windows solution accordingly.
+        <rdar://problem/14118143>.
+
+        Rubberstamped by Brent Fulgham.
+
+        * WebCore.vcxproj/QTMovieWin/QTMovieWin.vcxproj:
+        * WebCore.vcxproj/QTMovieWin/QTMovieWinCairoDebug.props:
+        * WebCore.vcxproj/QTMovieWin/QTMovieWinCairoRelease.props:
+        * WebCore.vcxproj/QTMovieWin/QTMovieWinDebug.props:
+        * WebCore.vcxproj/QTMovieWin/QTMovieWinPostBuild.cmd:
+        * WebCore.vcxproj/QTMovieWin/QTMovieWinProduction.props:
+        * WebCore.vcxproj/QTMovieWin/QTMovieWinRelease.props:
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.vcxproj/WebCoreDebug.props:
+        * WebCore.vcxproj/WebCoreDebugWinCairo.props:
+        * WebCore.vcxproj/WebCoreGenerated.vcxproj:
+        * WebCore.vcxproj/WebCoreGeneratedDebug.props:
+        * WebCore.vcxproj/WebCoreGeneratedDebugWinCairo.props:
+        * WebCore.vcxproj/WebCoreGeneratedProduction.props:
+        * WebCore.vcxproj/WebCoreGeneratedRelease.props:
+        * WebCore.vcxproj/WebCoreGeneratedReleaseWinCairo.props:
+        * WebCore.vcxproj/WebCoreProduction.props:
+        * WebCore.vcxproj/WebCoreRelease.props:
+        * WebCore.vcxproj/WebCoreReleaseWinCairo.props:
+        * WebCore.vcxproj/WebCoreTestSupport.vcxproj:
+        * WebCore.vcxproj/build-generated-files.sh:
+
 2013-06-18  Zoltan Horvath  <zoltan@webkit.org>
 
         [CSS Shapes] Remove lineOverflowsFromShapeInside boolean from RenderBlock::layoutRunsAndFloatsInRange function

diff --git a/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWin.vcxproj b/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWin.vcxproj
index a3bfc3ff38de2a999cb0ecb2445ff1e3229f2fd8..cc4605fec57f41c0997bcda68d3a8034dab6fe74 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWin.vcxproj
+++ b/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWin.vcxproj
@@ -82,7 +82,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="QTMovieWinDebug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r

diff --git a/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinCairoDebug.props b/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinCairoDebug.props
index c704e51d96913fef1062bf1a2d15c679c1add743..a319032b8d78e378c37205b1171757c8bc40f87c 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinCairoDebug.props
+++ b/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinCairoDebug.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)\tools32\vsprops\FeatureDefinesCairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug_wincairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefinesCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug_wincairo.props" />\r
     <Import Project="QTMovieWinCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup>\r

diff --git a/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinCairoRelease.props b/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinCairoRelease.props
index 44bb5eed8cbf4d48b950f489f5da5b8448f0f2d0..7b3685b8763162064887caca9c80988db8efdc60 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinCairoRelease.props
+++ b/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinCairoRelease.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)\tools32\vsprops\FeatureDefinesCairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\WinCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefinesCairo.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\WinCairo.props" />\r
     <Import Project="QTMovieWinCommon.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 044ef5c677a12d8f100e34854128a45e16a9f9ca..6ae2785aea15217107aaf5cb9f20670a1026ff47 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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\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="QTMovieWinCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup>\r

diff --git a/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinPostBuild.cmd b/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinPostBuild.cmd
index 24d97eaaa8715c136d26262272171f9201409aa0..3ed231d80c2ff725100400f446ea94fd5cf3a5d6 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinPostBuild.cmd
+++ b/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinPostBuild.cmd
@@ -1,5 +1,5 @@
 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\QTMovieWin"
 xcopy /y /d "%PROJECTDIR%..\..\platform\graphics\win\QTMovie.h" "%CONFIGURATIONBUILDDIR%\include\QTMovieWin"
-if exist "%WEBKIT_LIBRARIES%\tools32\VersionStamper\VersionStamper.exe" "%WEBKIT_LIBRARIES%\tools32\VersionStamper\VersionStamper.exe" --verbose "%TARGETPATH%"
+if exist "%WEBKIT_LIBRARIES%\tools\VersionStamper\VersionStamper.exe" "%WEBKIT_LIBRARIES%\tools\VersionStamper\VersionStamper.exe" --verbose "%TARGETPATH%"
 
 if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"

diff --git a/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinProduction.props b/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinProduction.props
index e19a4f9e52318c932be19dc15f3da4c098198f17..fe488cf6c2da1615e58731bda88778f498986a59 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinProduction.props
+++ b/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinProduction.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\production.props" />\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\production.props" />\r
     <Import Project="QTMovieWinCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinRelease.props b/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinRelease.props
index 06641c8c836983a97d9deee7c3fc124dab38b26d..8b91dcad574a5dd4541edbd9520480447fc5fbf9 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinRelease.props
+++ b/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinRelease.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\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="QTMovieWinCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup>\r

diff --git a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
index 55a370406cf2b893b5d31629a548f03c60776676..f7dbbd4a0e8e1a1afe480fed569ba85c5813539e 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
+++ b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
@@ -82,7 +82,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="WebCoreDebug.props" />
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>

diff --git a/Source/WebCore/WebCore.vcxproj/WebCoreDebug.props b/Source/WebCore/WebCore.vcxproj/WebCoreDebug.props
index 1ab565cbd0f62659c8009480f5b702ad6a116f62..ea4db35f9a783995622928dbafaf770d71546c95 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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\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="WebCoreCommon.props" />\r
     <Import Project="WebCoreCG.props" />\r
     <Import Project="WebCoreCFNetwork.props" />\r

diff --git a/Source/WebCore/WebCore.vcxproj/WebCoreDebugWinCairo.props b/Source/WebCore/WebCore.vcxproj/WebCoreDebugWinCairo.props
index 2256b7e5e3002a5292ffd03969f91b34c2a13bf2..1f2a58af3fb7a6f658dd47e839b7cf468d41b6a9 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/WebCoreDebugWinCairo.props
+++ b/Source/WebCore/WebCore.vcxproj/WebCoreDebugWinCairo.props
@@ -1,11 +1,11 @@
 <?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)\tools32\vsprops\FeatureDefinesCairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug_wincairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\WinCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefinesCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug_wincairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />\r
     <Import Project="WebCoreCommon.props" />\r
     <Import Project="WebCoreCairo.props" />\r
     <Import Project="WebCoreCURL.props" />\r

diff --git a/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.vcxproj b/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.vcxproj
index f12a519aca7f306739d595d6db2ae9e8e67853ad..b1a1d6609c80d049494962bd9575e9bbef515390 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.vcxproj
+++ b/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.vcxproj
@@ -81,7 +81,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="WebCoreGeneratedDebug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r

diff --git a/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedDebug.props b/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedDebug.props
index 5dad6ab907aa576702ea73f3d697becfde0bbcf3..152456376b2b6f7c687282359f573b0d0fe07c80 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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\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="WebCoreGeneratedCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedDebugWinCairo.props b/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedDebugWinCairo.props
index b6a4d3fdde6ebcbcfd4af111b911a45c40525361..759b49587ca8e1663180bc7146174d2601e0489d 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedDebugWinCairo.props
+++ b/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedDebugWinCairo.props
@@ -1,11 +1,11 @@
 <?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)\tools32\vsprops\FeatureDefinesCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefinesCairo.props" />\r
     <Import Project="WebCoreGeneratedWinCairoCommon.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug_wincairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\WinCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug_wincairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />\r
     <Import Project="WebCoreGeneratedCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedProduction.props b/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedProduction.props
index 912d5f3a09f0d0ee3b3c7031cc4714353d74ec12..6290f7927810b7e3f77209448d5df421aefd9d37 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedProduction.props
+++ b/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedProduction.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\production.props" />\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\production.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 0b72ff6927ca2e37e351c1176d7fb6b148e52b19..1980d6a3c77e0f223b431b681ed3d17835dc9728 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedRelease.props
+++ b/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedRelease.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\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="WebCoreGeneratedCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedReleaseWinCairo.props b/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedReleaseWinCairo.props
index 34ed21057c860df6b2f74992bd82bb5b548f546c..1cb8a107de950733ac816c29d2d126d1567f0cac 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedReleaseWinCairo.props
+++ b/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedReleaseWinCairo.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)\tools32\vsprops\FeatureDefinesCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefinesCairo.props" />\r
     <Import Project="WebCoreGeneratedWinCairoCommon.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\WinCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />\r
     <Import Project="WebCoreGeneratedCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/WebCore/WebCore.vcxproj/WebCoreProduction.props b/Source/WebCore/WebCore.vcxproj/WebCoreProduction.props
index dca56f513e43f635c55943bf5a5e6553bec934e1..cb313b3786ff44dacab209057121e983c04e8872 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/WebCoreProduction.props
+++ b/Source/WebCore/WebCore.vcxproj/WebCoreProduction.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\production.props" />\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\production.props" />\r
     <Import Project="WebCoreCommon.props" />\r
     <Import Project="WebCoreCG.props" />\r
     <Import Project="WebCoreCFNetwork.props" />\r

diff --git a/Source/WebCore/WebCore.vcxproj/WebCoreRelease.props b/Source/WebCore/WebCore.vcxproj/WebCoreRelease.props
index c8987e346999b180980e177ce81abf2ff41bcc73..22b78589b647be5d0cafff6ba8735a3e0c7950d5 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/WebCoreRelease.props
+++ b/Source/WebCore/WebCore.vcxproj/WebCoreRelease.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\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="WebCoreCommon.props" />\r
     <Import Project="WebCoreCG.props" />\r
     <Import Project="WebCoreCFNetwork.props" />\r

diff --git a/Source/WebCore/WebCore.vcxproj/WebCoreReleaseWinCairo.props b/Source/WebCore/WebCore.vcxproj/WebCoreReleaseWinCairo.props
index e0444f93d01543e7535a3e8d362da790604f9952..764fe1d4adcf5a7ea30217f623f076a80f4cbe95 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/WebCoreReleaseWinCairo.props
+++ b/Source/WebCore/WebCore.vcxproj/WebCoreReleaseWinCairo.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)\tools32\vsprops\FeatureDefinesCairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\WinCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefinesCairo.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\WinCairo.props" />\r
     <Import Project="WebCoreCommon.props" />\r
     <Import Project="WebCoreCairo.props" />\r
     <Import Project="WebCoreCURL.props" />\r

diff --git a/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj b/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj
index c5c03f4d13cd3a73ddd2a9f2b82508726416ed31..dd530e89a38e865872ea2116258dc237ac31701d 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj
+++ b/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj
@@ -82,7 +82,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="WebCoreDebug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r

diff --git a/Source/WebCore/WebCore.vcxproj/build-generated-files.sh b/Source/WebCore/WebCore.vcxproj/build-generated-files.sh
index 891baa58f675b509f0b6953ce1ef4365e8e9cc32..2f233e1026ffda1dddb4204a6d999e27d9a14d71 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/build-generated-files.sh
+++ b/Source/WebCore/WebCore.vcxproj/build-generated-files.sh
@@ -59,5 +59,5 @@ mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources"
 cd "${BUILT_PRODUCTS_DIR}/DerivedSources"
 
 export WebCore="${XSRCROOT}"
-export FEATURE_DEFINES=`$SDKROOT/tools32/scripts/feature-defines.sh $SDKROOT $3`
+export FEATURE_DEFINES=`$SDKROOT/tools/scripts/feature-defines.sh $SDKROOT $3`
 make -f "$WebCore/DerivedSources.make" -j ${NUMCPUS} || exit 1

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index aae0901c9e48b7585b31931150028518e68cc979..7798f3c1cdffa69b171a8f0b9acf2595b9025c53 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,37 @@
+2013-06-18  Roger Fong  <roger_fong@apple.com>
+
+        Replace tools32 folder with tools and update WebKit Windows solution accordingly.
+        <rdar://problem/14118143>.
+
+        Rubberstamped by Brent Fulgham.
+
+        * WebKit.vcxproj/Interfaces/Interfaces.vcxproj:
+        * WebKit.vcxproj/Interfaces/InterfacesDebug.props:
+        * WebKit.vcxproj/Interfaces/InterfacesDebugWinCairo.props:
+        * WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd:
+        * WebKit.vcxproj/Interfaces/InterfacesProduction.props:
+        * WebKit.vcxproj/Interfaces/InterfacesRelease.props:
+        * WebKit.vcxproj/Interfaces/InterfacesReleaseWinCairo.props:
+        * WebKit.vcxproj/WebKit/WebKit.vcxproj:
+        * WebKit.vcxproj/WebKit/WebKitDebug.props:
+        * WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props:
+        * WebKit.vcxproj/WebKit/WebKitPreBuild.cmd:
+        * WebKit.vcxproj/WebKit/WebKitProduction.props:
+        * WebKit.vcxproj/WebKit/WebKitRelease.props:
+        * WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props:
+        * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj:
+        * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorDebug.props:
+        * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorDebugWinCairo.props:
+        * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorProduction.props:
+        * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorRelease.props:
+        * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorReleaseWinCairo.props:
+        * WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj:
+        * WebKit.vcxproj/WebKitGUID/WebKitGUIDDebug.props:
+        * WebKit.vcxproj/WebKitGUID/WebKitGUIDDebugWinCairo.props:
+        * WebKit.vcxproj/WebKitGUID/WebKitGUIDProduction.props:
+        * WebKit.vcxproj/WebKitGUID/WebKitGUIDRelease.props:
+        * WebKit.vcxproj/WebKitGUID/WebKitGUIDReleaseWinCairo.props:
+
 2013-06-17  Roger Fong  <roger_fong@apple.com>
 
         Modify Windows makefiles to copy some bin output into Program Files.

diff --git a/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj b/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj
index 4e4bd79d97375b879d91b8a7a6e7f33c61b1b17f..9fdc3fd3fd21a2a03728c6a0b0662ccc6d356f12 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj
+++ b/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj
@@ -75,7 +75,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="InterfacesDebug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r

diff --git a/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesDebug.props b/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesDebug.props
index 6b8d2bb214306ec44e914f1138efea57c0a8493b..4943a9a169a6d02dcae773fda7b1dfb673d79ca7 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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\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="InterfacesCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesDebugWinCairo.props b/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesDebugWinCairo.props
index 3cdc37677fcfac79356fd3bcd910c8c2e1b7ba03..f114823eafabae84b0eac12f8ff3798fb69a8be5 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesDebugWinCairo.props
+++ b/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesDebugWinCairo.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)\tools32\vsprops\FeatureDefinesCairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefinesCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
     <Import Project="InterfacesCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd b/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd
index 58d8d8c72adf034b970755c016e6874e1706ffcd..37b99bcde19134515314bf49ffa7ce07c4cc38ae 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd
+++ b/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd
@@ -6,4 +6,4 @@ if errorlevel 1 exit 1
 echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
 
 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\obj32\WebKit\%PROJECTNAME%"
-bash "%WEBKIT_LIBRARIES%\tools32\scripts\auto-version.sh" "%INTDIR%"
+bash "%WEBKIT_LIBRARIES%\tools\scripts\auto-version.sh" "%INTDIR%"

diff --git a/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesProduction.props b/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesProduction.props
index dde8b4de075718739163be3a975410155357a324..ff60fb0ea12853f25a4bb117ca7d028218d14698 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesProduction.props
+++ b/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesProduction.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\production.props" />\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\production.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 6059bc87ad3ec6912c03a61c1ec411030d2e220d..51f9ce3c863988d44b15b8474db2f48cefaba669 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesRelease.props
+++ b/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesRelease.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\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="InterfacesCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesReleaseWinCairo.props b/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesReleaseWinCairo.props
index 0c43830c607ff6b1b8242720b9f7dd5e6ac82b02..6b53f1d87000f5bfdb80e69d89a9414d975766c1 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesReleaseWinCairo.props
+++ b/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesReleaseWinCairo.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)\tools32\vsprops\FeatureDefinesCairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefinesCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
     <Import Project="InterfacesCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj b/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj
index 84cb0118fb0c051f5742ba13408124ef9a945406..cd47d702fae8529f5df0c74497800cbed038599e 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj
+++ b/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj
@@ -83,7 +83,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="WebKitDebug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r

diff --git a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitDebug.props b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitDebug.props
index 2e92ef7639647aa2970eeba530d63fdee7a0543e..04eb617dd85e3d2086afc257dae25176bba32edd 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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\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="WebKitCommon.props" />\r
     <Import Project="WebKitDirectX.props" />\r
     <Import Project="WebKitApple.props" />\r

diff --git a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props
index ea0438e5467773767dfcf5016df4f08fc6a0c088..30074270bc2a4b26fa5db3c0f8e701bf7c1a0f92 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props
+++ b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props
@@ -1,11 +1,11 @@
 <?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)\tools32\vsprops\FeatureDefinesCairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\WinCairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\cURL.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefinesCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\cURL.props" />\r
     <Import Project="WebKitCommon.props" />\r
     <Import Project="WebKitDirectX.props" />\r
     <Import Project="WebKitCFLite.props" />\r

diff --git a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPreBuild.cmd b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPreBuild.cmd
index 1dce9071b98e54dadb695589e3e9c0e21369485e..1e26e874f46fb1ef3a7e0b62a7b154c9244b2279 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPreBuild.cmd
+++ b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPreBuild.cmd
@@ -8,4 +8,4 @@ echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\JavaScriptCore"
 xcopy /y /d "%WEBKIT_LIBRARIES%\include\JavaScriptCore\*" "%CONFIGURATIONBUILDDIR%\include\JavaScriptCore"
 
-bash "%WEBKIT_LIBRARIES%\tools32\scripts\auto-version.sh" "%INTDIR%"
+bash "%WEBKIT_LIBRARIES%\tools\scripts\auto-version.sh" "%INTDIR%"

diff --git a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitProduction.props b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitProduction.props
index 35fd6f8e175994dd2a3a0f3b56aef67db7b1273e..75df6fb2f7699e7462687ca8da08137b728d747b 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitProduction.props
+++ b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitProduction.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\production.props" />\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\production.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 dd6b5577e181a91ee65799bc0b77f4d3217eb347..3a0ff661e920ffd2b2071375c58fca147c059154 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitRelease.props
+++ b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitRelease.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\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="WebKitCommon.props" />\r
     <Import Project="WebKitDirectX.props" />\r
     <Import Project="WebKitApple.props" />\r

diff --git a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props
index 78d9723d5a30a3d2171fa17948d0db22e7d8ae4a..3daaf7b39f450e68c65c4322b6ba8afe2bfbd5c5 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props
+++ b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props
@@ -1,11 +1,11 @@
 <?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)\tools32\vsprops\FeatureDefinesCairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\WinCairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\cURL.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefinesCairo.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\WinCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\cURL.props" />\r
     <Import Project="WebKitCFLite.props" />\r
     <Import Project="WebKitCommon.props" />\r
     <Import Project="WebKitDirectX.props" />\r

diff --git a/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj b/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj
index cd2be607c2b24040b00b29f444af5b980f5cfb4b..06e4bdf4cd78595c211c28f1842ad705b48a88d5 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj
+++ b/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj
@@ -77,7 +77,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="WebKitExportGeneratorDebug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r

diff --git a/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorDebug.props b/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorDebug.props
index 715f583258f2ead8df6044343e48f10c0045d08b..7521acbe344cdc75870d6dcbe128ccbf9c10ace3 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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\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="WebKitExportGeneratorCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorDebugWinCairo.props b/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorDebugWinCairo.props
index a3936b99bec66d89a7a2c3770140e0788cbc4ffd..2876aaec865805bf8e7925f43002c3455015f937 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorDebugWinCairo.props
+++ b/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorDebugWinCairo.props
@@ -1,11 +1,11 @@
 <?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)\tools32\vsprops\FeatureDefinesCairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefinesCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
     <Import Project="WebKitExportGeneratorCommon.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\WinCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup />\r

diff --git a/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorProduction.props b/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorProduction.props
index 7d2f1e246098a9b26a2a5cf1ffbfb0d803f81190..9262f99765909004f491b6ba3b3df842a620b586 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorProduction.props
+++ b/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorProduction.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\production.props" />\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\production.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 4eac56092aaee44c8e21e09dcf1aed37fe2c0bcf..6b940043e74f1365330343c4c2731e770289bbae 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorRelease.props
+++ b/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorRelease.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\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="WebKitExportGeneratorCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorReleaseWinCairo.props b/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorReleaseWinCairo.props
index 81b8c5b8c87a009d6140d96cae0c56e98c8a7c5d..93089b9fde8e4f7ecbb6691822f3cdeb0429c224 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorReleaseWinCairo.props
+++ b/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorReleaseWinCairo.props
@@ -1,11 +1,11 @@
 <?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)\tools32\vsprops\FeatureDefinesCairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefinesCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
     <Import Project="WebKitExportGeneratorCommon.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\WinCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup />\r

diff --git a/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj b/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj
index 2938ef0a31a9375146ebc3462138d19d48d3698e..29f5c6ce7749d2f5fd5e7bad8496552068273256 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj
+++ b/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj
@@ -72,7 +72,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="WebKitGUIDDebug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r

diff --git a/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDDebug.props b/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDDebug.props
index 7c2644c92ed85d174110c636c2aeab854b744d8a..b66e89a46df135e5700c5cc47bedb894e2edc1b2 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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\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="WebKitGUIDCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDDebugWinCairo.props b/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDDebugWinCairo.props
index 33cb7098ce280b9021510bc5478bcc2110ac6b4a..72bf600e4e21306cf015a6b705c4d77f1d4eac2b 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDDebugWinCairo.props
+++ b/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDDebugWinCairo.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)\tools32\vsprops\FeatureDefinesCairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefinesCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
     <Import Project="WebKitGUIDCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDProduction.props b/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDProduction.props
index 8a4c8cce1b97425c55bc114f0eb4dda476873c27..f090abff352ab2504ba460499575a0572053800d 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDProduction.props
+++ b/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDProduction.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\production.props" />\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\production.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 63dc4f2da9c3ec72d4c1756402018f107c2df4d6..13d78bf5102a17659e2232d2efab4dda982c8774 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDRelease.props
+++ b/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDRelease.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\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="WebKitGUIDCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDReleaseWinCairo.props b/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDReleaseWinCairo.props
index aeb39f588e18f0be23e48f98e1bd1da61bbb8827..4c44e4fb62daaa43195a62b24b260e8013e7cbcb 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDReleaseWinCairo.props
+++ b/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDReleaseWinCairo.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)\tools32\vsprops\FeatureDefinesCairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefinesCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
     <Import Project="WebKitGUIDCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 2764f6a3a4fb51b0f3d5bff45e123b830b56607e..9339c4bd0d0e76f41b417b57b2cde43736da98e8 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,56 @@
+2013-06-18  Roger Fong  <roger_fong@apple.com>
+
+        Replace tools32 folder with tools and update WebKit Windows solution accordingly.
+        <rdar://problem/14118143>.
+
+        Rubberstamped by Brent Fulgham.
+
+        * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj:
+        * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeDebug.props:
+        * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeDebugWinCairo.props:
+        * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj:
+        * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncherDebug.props:
+        * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncherProduction.props:
+        * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncherRelease.props:
+        * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeProduction.props:
+        * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeRelease.props:
+        * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeReleaseWinCairo.props:
+        * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiff.vcxproj:
+        * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffDebug.props:
+        * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffDebugWinCairo.props:
+        * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncher.vcxproj:
+        * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncherDebug.props:
+        * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncherProduction.props:
+        * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncherRelease.props:
+        * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffProduction.props:
+        * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffRelease.props:
+        * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffReleaseWinCairo.props:
+        * DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.vcxproj:
+        * DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginDebug.props:
+        * DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginProduction.props:
+        * DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginRelease.props:
+        * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj:
+        * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIDebug.props:
+        * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIDebugWinCairo.props:
+        * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIProduction.props:
+        * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIRelease.props:
+        * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIReleaseWinCairo.props:
+        * WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj:
+        * WinLauncher/WinLauncher.vcxproj/WinLauncherDebug.props:
+        * WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj:
+        * WinLauncher/WinLauncher.vcxproj/WinLauncherLibDebug.props:
+        * WinLauncher/WinLauncher.vcxproj/WinLauncherLibProduction.props:
+        * WinLauncher/WinLauncher.vcxproj/WinLauncherLibRelease.props:
+        * WinLauncher/WinLauncher.vcxproj/WinLauncherProduction.props:
+        * WinLauncher/WinLauncher.vcxproj/WinLauncherRelease.props:
+        * win/AssembleBuildLogs/AssembleBuildLogs.vcxproj:
+        * win/record-memory/record-memory.vcxproj:
+        * win/record-memory/record-memoryDebug.props:
+        * win/record-memory/record-memoryDebugWinCairo.props:
+        * win/record-memory/record-memoryProduction.props:
+        * win/record-memory/record-memoryRelease.props:
+        * win/record-memory/record-memoryReleaseWinCairo.props:
+
 2013-06-17  Kangil Han  <kangil.han@samsung.com>
 
         Unreviewed. Add my email to a DOM watchlist.

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj
index fc29a74a3db3a657464d70d27a03201093f03a68..e6c142dea60405eddf9d77686bf875699592f86d 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj
@@ -82,7 +82,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="DumpRenderTreeDebug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeDebug.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeDebug.props
index fea2e264d638a30c5e81e1a1ba25835f386b913a..06bcf156a3a4e26d4ba8f02a58a895e27e1689e0 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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\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="DumpRenderTreeCommon.props" />\r
     <Import Project="DumpRenderTreeApple.props" />\r
   </ImportGroup>\r

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeDebugWinCairo.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeDebugWinCairo.props
index e1a20bbb4717cdbccfc256896c8a6823b2c6bf1d..4c7b50b3e31e1ad3c3b713fbb72b404dad5cc1ef 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeDebugWinCairo.props
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeDebugWinCairo.props
@@ -1,11 +1,11 @@
 <?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)\tools32\vsprops\FeatureDefinesCairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\WinCairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\cURL.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefinesCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\cURL.props" />\r
     <Import Project="..\..\..\..\Source\WebKit\WebKit.vcxproj\WebKit\WebKitCFLite.props" />\r
     <Import Project="DumpRenderTreeCommon.props" />\r
   </ImportGroup>\r

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj
index c759d36aced5c11a5643a7c95ba069c557f83eb7..a67ee227dfda7584594fecf307b578e5b5196685 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj
@@ -82,7 +82,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="DumpRenderTreeLauncherDebug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncherDebug.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncherDebug.props
index 56287844ce71a5f77bb6c7cb6a3b9848daa6af9d..0faa57f735aee32e8634f5d81e24358af954f2c6 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)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\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/DumpRenderTreeLauncherProduction.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncherProduction.props
index 44f721fefc8b43a8939efda4c0e823542acecfe9..a7098d8fe0cb5ea90eca419119e35faaccee22c8 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncherProduction.props
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncherProduction.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)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\production.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\production.props" />\r
     <Import Project="DumpRenderTreeLauncherCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncherRelease.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncherRelease.props
index b15db6c135a51f8cccc927b41c18a21132929cf6..b02cd0dfce0389233e054cdef6b923cfe3fc6abc 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncherRelease.props
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncherRelease.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)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\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/DumpRenderTreeProduction.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeProduction.props
index bf1bf71fd9ef536b4446b0bf566db955b815154c..9b6aae0c855890f0de7b6a36f0a4275b4ee5ef98 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeProduction.props
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeProduction.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\production.props" />\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\production.props" />\r
     <Import Project="DumpRenderTreeApple.props" />\r
     <Import Project="DumpRenderTreeCommon.props" />\r
   </ImportGroup>\r

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeRelease.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeRelease.props
index 614d90b90099de4050b96e2d6801d53f748671d4..610d794ae58747858e87bd323bcbb817870f0918 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeRelease.props
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeRelease.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\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="DumpRenderTreeCommon.props" />\r
     <Import Project="DumpRenderTreeApple.props" />\r
   </ImportGroup>\r

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeReleaseWinCairo.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeReleaseWinCairo.props
index 8db6dd1dddac671e5196cfb1d43b037205a42578..e37ad5f9426369e545977c993ce13bca08296c7e 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeReleaseWinCairo.props
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeReleaseWinCairo.props
@@ -1,11 +1,11 @@
 <?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)\tools32\vsprops\FeatureDefinesCairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\WinCairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\cURL.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefinesCairo.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\WinCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\cURL.props" />\r
     <Import Project="..\..\..\..\Source\WebKit\WebKit.vcxproj\WebKit\WebKitCFLite.props" />\r
     <Import Project="DumpRenderTreeCommon.props" />\r
   </ImportGroup>\r

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiff.vcxproj b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiff.vcxproj
index e64d07d2e69593518226c3c31e441406c838d2b2..144b6b2f9e7fedb4b5f35d4c86f7ab30339410f0 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiff.vcxproj
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiff.vcxproj
@@ -81,7 +81,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="ImageDiffDebug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffDebug.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffDebug.props
index b2d1e859ebd3e67ce085e25c147b107f5e890257..29ef2ddc9991c57fbd66137fe76f38bbd5e56f03 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)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\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/ImageDiffDebugWinCairo.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffDebugWinCairo.props
index fc01c7b0486412d29d1f73768ae163e2c152f4b2..45cdc1606e069995d84e6fa83729bdcd8fe09482 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffDebugWinCairo.props
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffDebugWinCairo.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)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\WinCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />\r
     <Import Project="ImageDiffCommonWinCairo.props" />\r
   </ImportGroup>\r
 </Project>\r

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncher.vcxproj b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncher.vcxproj
index 06069f0ae1f602c00127e1333644698ae21d492e..a89688e63578ee2145a33abd21280c331429308f 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncher.vcxproj
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncher.vcxproj
@@ -82,7 +82,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="ImageDiffLauncherDebug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncherDebug.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncherDebug.props
index 8111f6423e008d12bc8a897a517d81e9d9cf50a9..7fb6db6348dd19cc814dea60d22503ecf91caeeb 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)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\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/ImageDiffLauncherProduction.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncherProduction.props
index 3694b95469ee34ec98969d9d7f662b84192f7cd2..ae1869575198ea5720259383f34047062a7cdf82 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncherProduction.props
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncherProduction.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)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\production.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\production.props" />\r
     <Import Project="ImageDiffLauncherCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncherRelease.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncherRelease.props
index 3a68a1f9265cff10dc160367b316974157edea86..3209436d12db67d8e479d4ae527e675740511925 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncherRelease.props
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncherRelease.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)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\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/ImageDiffProduction.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffProduction.props
index 5237f29b41d5774c41d1fe101e483a19e1c10f5e..d9296c866551cd96073dd4219d948f1dca5dd519 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffProduction.props
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffProduction.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)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\production.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\production.props" />\r
     <Import Project="ImageDiffCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffRelease.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffRelease.props
index 75a1c51e2a79778f84b929394518b7124070f2a5..f1be5477ec4f337b1528e1c2bd6b284fd7fdbfd7 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffRelease.props
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffRelease.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)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
     <Import Project="ImageDiffCommon.props" />\r
   </ImportGroup>\r
 </Project>
\ No newline at end of file

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffReleaseWinCairo.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffReleaseWinCairo.props
index bb2d062546a7cbf585714dfcc361904866b6d315..b0fd8607265306cc4880d157c6ee559d415fb13e 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffReleaseWinCairo.props
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffReleaseWinCairo.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)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\WinCairo.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\WinCairo.props" />\r
     <Import Project="ImageDiffCommonWinCairo.props" />\r
   </ImportGroup>\r
 </Project>\r

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.vcxproj b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.vcxproj
index 2c4d01e4f883aac416433baa51c75153fe2153b6..81a68bb714b47079d69d96941ec6c5be2669d8e2 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.vcxproj
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.vcxproj
@@ -134,7 +134,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="TestNetscapePluginDebug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginDebug.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginDebug.props
index 758d2cae967ac5e6580b84d40ad816b0623954c8..87aa3fd4b42b1276725f7147793ca293e299df20 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)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\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/TestNetscapePluginProduction.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginProduction.props
index addadcc4a9353f4bdecdba16eca1ecd68e77b32b..0edbb8631822d2c41796e60f6e1b3cd47c0018a3 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginProduction.props
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginProduction.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)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\production.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\production.props" />\r
     <Import Project="TestNetscapePluginCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginRelease.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginRelease.props
index e46c1bc690a38c20a20951f9e7a3724c2b46f436..42c8d7d90aea3b38ecd1e18855b6d79f964f8cf5 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginRelease.props
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginRelease.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)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
     <Import Project="TestNetscapePluginCommon.props" />\r
   </ImportGroup>\r
 </Project>
\ No newline at end of file

diff --git a/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj b/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj
index 64c319032e01e784aa85f778cba7487853625438..9020bd2dec2d46062b05fd47de03083aff27abc6 100644 (file)
--- a/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj
+++ b/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj
@@ -76,7 +76,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="TestWebKitAPIDebug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r

diff --git a/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIDebug.props b/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIDebug.props
index bafbdda14ba22480b172043e43a9ed258dfee225..72fe2c9a2ec8ff63762f2385ad37d1cedfa4021a 100644 (file)
--- a/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIDebug.props
+++ b/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIDebug.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\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="TestWebKitAPICommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIDebugWinCairo.props b/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIDebugWinCairo.props
index 0b33ac6dd44d5ed149c235f2a8e21cd46394817f..6fafee91d05e069a97c59eb46ef4cc1eeb87688c 100644 (file)
--- a/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIDebugWinCairo.props
+++ b/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIDebugWinCairo.props
@@ -1,11 +1,11 @@
 <?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)\tools32\vsprops\FeatureDefinesCairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\WinCairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\cURL.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefinesCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\cURL.props" />\r
     <Import Project="TestWebKitAPICommonWinCairo.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIProduction.props b/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIProduction.props
index 3a84b32a1bd9e2ab1553a5cff3f7f57b24599b47..7c252b6677dc0ab109901638caab2b6e9b7de6c9 100644 (file)
--- a/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIProduction.props
+++ b/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIProduction.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\production.props" />\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\production.props" />\r
     <Import Project="TestWebKitAPICommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIRelease.props b/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIRelease.props
index 1c0f06e8bcdc69e839f6430d0ce0de97b4758873..0c1ccbf8959b08f51e062a9b52e18ec1eed032e7 100644 (file)
--- a/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIRelease.props
+++ b/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIRelease.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\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="TestWebKitAPICommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIReleaseWinCairo.props b/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIReleaseWinCairo.props
index 4ab2a716871b63c78220989297689309d5f2e2b2..9ef4ff5b42434f48cbfaad2df7a679cbcf2c37d3 100644 (file)
--- a/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIReleaseWinCairo.props
+++ b/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIReleaseWinCairo.props
@@ -1,11 +1,11 @@
 <?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)\tools32\vsprops\FeatureDefinesCairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\WinCairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\cURL.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefinesCairo.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\WinCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\cURL.props" />\r
     <Import Project="TestWebKitAPICommonWinCairo.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj
index 7307de66747f334047cd45619a65ddfc43eac526..cc12a7067d447740bc0c781f737381d7a08f46c7 100644 (file)
--- a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj
+++ b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj
@@ -82,7 +82,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="WinLauncherDebug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r

diff --git a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherDebug.props b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherDebug.props
index 4ce9febf137891be7ea973755fe76da2958b3741..084ff52249e3dc1e19ff8208ca67bbe947c0c294 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)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
     <Import Project="WinLauncherCommon.props" />\r
   </ImportGroup>\r
 </Project>
\ No newline at end of file

diff --git a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj
index d47b576d62d162b5c12268ff611b1a3e45527180..448be478a619d4eb7b28ffd89b31d78ed27a6d07 100644 (file)
--- a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj
+++ b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj
@@ -82,7 +82,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="WinLauncherLibDebug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r

diff --git a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibDebug.props b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibDebug.props
index 42c0c0eb7f8ddaff8ff5b9fc27e5bdaac420f3cf..8c4c7d95fb51f3974ca4d53448759ba962019451 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)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
     <Import Project="WinLauncherLibCommon.props" />\r
   </ImportGroup>\r
 </Project>
\ No newline at end of file

diff --git a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibProduction.props b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibProduction.props
index ddfa658c58fd367ac279101a37165b38f457ff9c..8f7f126c75e6663f07d6d885946d548c1813bdd7 100644 (file)
--- a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibProduction.props
+++ b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibProduction.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)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\production.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\production.props" />\r
     <Import Project="WinLauncherLibCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibRelease.props b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibRelease.props
index 409798ffaf23a9adac654c1f8c6c9d702414d2f4..7cb9b661a67b4ec5d87bd7315ff8c6ec9515f90a 100644 (file)
--- a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibRelease.props
+++ b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibRelease.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)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
     <Import Project="WinLauncherLibCommon.props" />\r
   </ImportGroup>\r
 </Project>
\ No newline at end of file

diff --git a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherProduction.props b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherProduction.props
index a899b6daf1adbd8e8d6d85809dcaaab433ebc0b9..7f3c032ec2bc406f7ffcb3b3abefd8cd06972a69 100644 (file)
--- a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherProduction.props
+++ b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherProduction.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)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\production.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\production.props" />\r
     <Import Project="WinLauncherCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherRelease.props b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherRelease.props
index d260a68803f16623d4a02be5434d3b0758e2ff62..0a3a22637701049a0901ea943fc831e6c1463c0c 100644 (file)
--- a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherRelease.props
+++ b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherRelease.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)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
     <Import Project="WinLauncherCommon.props" />\r
   </ImportGroup>\r
 </Project>
\ No newline at end of file

diff --git a/Tools/win/AssembleBuildLogs/AssembleBuildLogs.vcxproj b/Tools/win/AssembleBuildLogs/AssembleBuildLogs.vcxproj
index 026a5d0f8eebe39d78155f9e507b84ef6e818b2a..a1261017454f291632b382ddc7b7edf278cc7370 100644 (file)
--- a/Tools/win/AssembleBuildLogs/AssembleBuildLogs.vcxproj
+++ b/Tools/win/AssembleBuildLogs/AssembleBuildLogs.vcxproj
@@ -36,15 +36,15 @@
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|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="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r

diff --git a/Tools/win/record-memory/record-memory.vcxproj b/Tools/win/record-memory/record-memory.vcxproj
index d176863b2249a1745f489e655e193615e7a58f3d..11a20648aa60df3215ec1b21112ce0ec4f16b311 100644 (file)
--- a/Tools/win/record-memory/record-memory.vcxproj
+++ b/Tools/win/record-memory/record-memory.vcxproj
@@ -76,7 +76,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="record-memoryDebug.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debugsuffix.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r

diff --git a/Tools/win/record-memory/record-memoryDebug.props b/Tools/win/record-memory/record-memoryDebug.props
index 0875ee4f53183fd8f9c58ce9b4db13842c195037..5061a80aef13931a232ab650564747dfcd2eabe2 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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\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="record-memoryCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Tools/win/record-memory/record-memoryDebugWinCairo.props b/Tools/win/record-memory/record-memoryDebugWinCairo.props
index f36bb0e091fc2e26cf018012e2b951b5ea8f6d32..00dc04f3d00400979c0059bab2c469cb7576e056 100644 (file)
--- a/Tools/win/record-memory/record-memoryDebugWinCairo.props
+++ b/Tools/win/record-memory/record-memoryDebugWinCairo.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)\tools32\vsprops\FeatureDefinesCairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefinesCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
     <Import Project="record-memoryCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Tools/win/record-memory/record-memoryProduction.props b/Tools/win/record-memory/record-memoryProduction.props
index 492dc92ef1a8ce950717a07c5c0118f2018f6fe8..9dc78e26e9c5b4a24ba8754ec227ec66924b4fc0 100644 (file)
--- a/Tools/win/record-memory/record-memoryProduction.props
+++ b/Tools/win/record-memory/record-memoryProduction.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\production.props" />\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\production.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 7cde14e38e9fac95bc1b6ad87cad9c2265864409..798046d3484214166bd1407111f603179a32db13 100644 (file)
--- a/Tools/win/record-memory/record-memoryRelease.props
+++ b/Tools/win/record-memory/record-memoryRelease.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)\tools32\vsprops\FeatureDefines.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\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="record-memoryCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/Tools/win/record-memory/record-memoryReleaseWinCairo.props b/Tools/win/record-memory/record-memoryReleaseWinCairo.props
index 87ee6a5f2c134e2133f5c1c7ed7f8535e3a90fa0..2d040cc46aa828cd5dbcbd88120ea93a59a53b31 100644 (file)
--- a/Tools/win/record-memory/record-memoryReleaseWinCairo.props
+++ b/Tools/win/record-memory/record-memoryReleaseWinCairo.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)\tools32\vsprops\FeatureDefinesCairo.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />\r
-    <Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefinesCairo.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
     <Import Project="record-memoryCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 5169b276d9cddf6305e8cb7ead3507ee6eca2f1d..b0f6094f811fda1abbd69ab4627d6289c60dca5b 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,44 @@
+2013-06-18  Roger Fong  <roger_fong@apple.com>
+
+        Replace tools32 folder with tools and update WebKit Windows solution accordingly.
+        <rdar://problem/14118143>.
+
+        Rubberstamped by Brent Fulgham.
+
+        * win/tools: Copied from win/tools32.
+        * win/tools/WinTools.make:
+        * win/tools/scripts/auto-version.sh:
+        * win/tools/scripts/feature-defines.sh:
+        * win/tools32: Removed.
+        * win/tools32/WinTools.make: Removed.
+        * win/tools32/scripts: Removed.
+        * win/tools32/scripts/COPYRIGHT-END-YEAR: Removed.
+        * win/tools32/scripts/VERSION: Removed.
+        * win/tools32/scripts/auto-version.sh: Removed.
+        * win/tools32/scripts/feature-defines.sh: Removed.
+        * win/tools32/vsprops: Removed.
+        * win/tools32/vsprops/FeatureDefines.props: Removed.
+        * win/tools32/vsprops/FeatureDefines.vsprops: Removed.
+        * win/tools32/vsprops/FeatureDefinesCairo.props: Removed.
+        * win/tools32/vsprops/FeatureDefinesCairo.vsprops: Removed.
+        * win/tools32/vsprops/WinCairo.props: Removed.
+        * win/tools32/vsprops/WinCairo.vsprops: Removed.
+        * win/tools32/vsprops/cURL.props: Removed.
+        * win/tools32/vsprops/cURL.vsprops: Removed.
+        * win/tools32/vsprops/common.props: Removed.
+        * win/tools32/vsprops/common.vsprops: Removed.
+        * win/tools32/vsprops/debug.props: Removed.
+        * win/tools32/vsprops/debug.vsprops: Removed.
+        * win/tools32/vsprops/debug_all.vsprops: Removed.
+        * win/tools32/vsprops/debug_wincairo.props: Removed.
+        * win/tools32/vsprops/debug_wincairo.vsprops: Removed.
+        * win/tools32/vsprops/debugsuffix.props: Removed.
+        * win/tools32/vsprops/production.props: Removed.
+        * win/tools32/vsprops/production.vsprops: Removed.
+        * win/tools32/vsprops/release.props: Removed.
+        * win/tools32/vsprops/release.vsprops: Removed.
+        * win/tools32/vsprops/releaseproduction.vsprops: Removed.
+
 2013-06-12  Brent Fulgham  <bfulgham@webkit.org>
 
         [WinCairo] Unreviewed build correction.

diff --git a/WebKitLibraries/win/tools/WinTools.make b/WebKitLibraries/win/tools/WinTools.make
new file mode 100755 (executable)
index 0000000..46263b1
--- /dev/null
+++ b/WebKitLibraries/win/tools/WinTools.make
@@ -0,0 +1,3 @@
+install:
+    xcopy "$(SRCROOT)\vsprops\*.props" "$(DSTROOT)\AppleInternal\tools\vsprops" /e/v/i/h/y
+    xcopy "$(SRCROOT)\scripts\*" "$(DSTROOT)\AppleInternal\tools\scripts" /e/v/i/h/y
\ No newline at end of file

diff --git a/WebKitLibraries/win/tools32/scripts/COPYRIGHT-END-YEAR b/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR
similarity index 100%
rename from WebKitLibraries/win/tools32/scripts/COPYRIGHT-END-YEAR
rename to WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR

diff --git a/WebKitLibraries/win/tools32/scripts/VERSION b/WebKitLibraries/win/tools/scripts/VERSION
similarity index 100%
rename from WebKitLibraries/win/tools32/scripts/VERSION
rename to WebKitLibraries/win/tools/scripts/VERSION

diff --git a/WebKitLibraries/win/tools32/scripts/auto-version.sh b/WebKitLibraries/win/tools/scripts/auto-version.sh
similarity index 97%
rename from WebKitLibraries/win/tools32/scripts/auto-version.sh
rename to WebKitLibraries/win/tools/scripts/auto-version.sh
index 0fe98073c4b80c5802f628e370b2749126a544ca..b5c25f353b6dca88e402865e48ac6b3f8a567517 100755 (executable)
--- a/WebKitLibraries/win/tools32/scripts/auto-version.sh
+++ b/WebKitLibraries/win/tools/scripts/auto-version.sh
@@ -33,10 +33,10 @@ chomp()
 }
 
 if [[ -n "$WEBKIT_LIBRARIES" ]]; then
-    FALLBACK_VERSION_PATH=`cygpath -u "$WEBKIT_LIBRARIES\\tools32\\scripts\\VERSION"`
+    FALLBACK_VERSION_PATH=`cygpath -u "$WEBKIT_LIBRARIES\\tools\\scripts\\VERSION"`
     FALLBACK_VERSION=$(cat "$FALLBACK_VERSION_PATH");
 
-    COPYRIGHT_END_YEAR_PATH=`cygpath -u "$WEBKIT_LIBRARIES\\tools32\\scripts\\COPYRIGHT-END-YEAR"`
+    COPYRIGHT_END_YEAR_PATH=`cygpath -u "$WEBKIT_LIBRARIES\\tools\\scripts\\COPYRIGHT-END-YEAR"`
     COPYRIGHT_END_YEAR=$(cat "$COPYRIGHT_END_YEAR_PATH");
     chomp COPYRIGHT_END_YEAR
 fi

diff --git a/WebKitLibraries/win/tools32/scripts/feature-defines.sh b/WebKitLibraries/win/tools/scripts/feature-defines.sh
similarity index 92%
rename from WebKitLibraries/win/tools32/scripts/feature-defines.sh
rename to WebKitLibraries/win/tools/scripts/feature-defines.sh
index 23c78f4ba85658ecf519ab9cf24d3b5eec8c4835..a6fdcaa364831a9f0e76504f90067968c90010da 100755 (executable)
--- a/WebKitLibraries/win/tools32/scripts/feature-defines.sh
+++ b/WebKitLibraries/win/tools/scripts/feature-defines.sh
@@ -23,9 +23,9 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 if [ "$2" = "cairo" ]; then
-    FeatureDefines=$1/tools32/vsprops/FeatureDefinesCairo.props
+    FeatureDefines=$1/tools/vsprops/FeatureDefinesCairo.props
 else
-    FeatureDefines=$1/tools32/vsprops/FeatureDefines.props
+    FeatureDefines=$1/tools/vsprops/FeatureDefines.props
 fi
 
 grep "<ENABLE_" $FeatureDefines | sed '/\/>/d' | sed 's/<\/.*>//' | sed 's/<.*>//' | tr -d '\n'

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

diff --git a/WebKitLibraries/win/tools32/vsprops/FeatureDefines.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
similarity index 100%
rename from WebKitLibraries/win/tools32/vsprops/FeatureDefines.vsprops
rename to WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops

diff --git a/WebKitLibraries/win/tools32/vsprops/FeatureDefinesCairo.props b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props
similarity index 100%
rename from WebKitLibraries/win/tools32/vsprops/FeatureDefinesCairo.props
rename to WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props

diff --git a/WebKitLibraries/win/tools32/vsprops/FeatureDefinesCairo.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops
similarity index 100%
rename from WebKitLibraries/win/tools32/vsprops/FeatureDefinesCairo.vsprops
rename to WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops

diff --git a/WebKitLibraries/win/tools32/vsprops/WinCairo.props b/WebKitLibraries/win/tools/vsprops/WinCairo.props
similarity index 100%
rename from WebKitLibraries/win/tools32/vsprops/WinCairo.props
rename to WebKitLibraries/win/tools/vsprops/WinCairo.props

diff --git a/WebKitLibraries/win/tools32/vsprops/WinCairo.vsprops b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops
similarity index 100%
rename from WebKitLibraries/win/tools32/vsprops/WinCairo.vsprops
rename to WebKitLibraries/win/tools/vsprops/WinCairo.vsprops

diff --git a/WebKitLibraries/win/tools32/vsprops/cURL.props b/WebKitLibraries/win/tools/vsprops/cURL.props
similarity index 100%
rename from WebKitLibraries/win/tools32/vsprops/cURL.props
rename to WebKitLibraries/win/tools/vsprops/cURL.props

diff --git a/WebKitLibraries/win/tools32/vsprops/cURL.vsprops b/WebKitLibraries/win/tools/vsprops/cURL.vsprops
similarity index 100%
rename from WebKitLibraries/win/tools32/vsprops/cURL.vsprops
rename to WebKitLibraries/win/tools/vsprops/cURL.vsprops

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

diff --git a/WebKitLibraries/win/tools32/vsprops/common.vsprops b/WebKitLibraries/win/tools/vsprops/common.vsprops
similarity index 100%
rename from WebKitLibraries/win/tools32/vsprops/common.vsprops
rename to WebKitLibraries/win/tools/vsprops/common.vsprops

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

diff --git a/WebKitLibraries/win/tools32/vsprops/debug.vsprops b/WebKitLibraries/win/tools/vsprops/debug.vsprops
similarity index 100%
rename from WebKitLibraries/win/tools32/vsprops/debug.vsprops
rename to WebKitLibraries/win/tools/vsprops/debug.vsprops

diff --git a/WebKitLibraries/win/tools32/vsprops/debug_all.vsprops b/WebKitLibraries/win/tools/vsprops/debug_all.vsprops
similarity index 100%
rename from WebKitLibraries/win/tools32/vsprops/debug_all.vsprops
rename to WebKitLibraries/win/tools/vsprops/debug_all.vsprops

diff --git a/WebKitLibraries/win/tools32/vsprops/debug_wincairo.props b/WebKitLibraries/win/tools/vsprops/debug_wincairo.props
similarity index 100%
rename from WebKitLibraries/win/tools32/vsprops/debug_wincairo.props
rename to WebKitLibraries/win/tools/vsprops/debug_wincairo.props

diff --git a/WebKitLibraries/win/tools32/vsprops/debug_wincairo.vsprops b/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops
similarity index 100%
rename from WebKitLibraries/win/tools32/vsprops/debug_wincairo.vsprops
rename to WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops

diff --git a/WebKitLibraries/win/tools32/vsprops/debugsuffix.props b/WebKitLibraries/win/tools/vsprops/debugsuffix.props
similarity index 100%
rename from WebKitLibraries/win/tools32/vsprops/debugsuffix.props
rename to WebKitLibraries/win/tools/vsprops/debugsuffix.props

diff --git a/WebKitLibraries/win/tools32/vsprops/production.props b/WebKitLibraries/win/tools/vsprops/production.props
similarity index 100%
rename from WebKitLibraries/win/tools32/vsprops/production.props
rename to WebKitLibraries/win/tools/vsprops/production.props

diff --git a/WebKitLibraries/win/tools32/vsprops/production.vsprops b/WebKitLibraries/win/tools/vsprops/production.vsprops
similarity index 100%
rename from WebKitLibraries/win/tools32/vsprops/production.vsprops
rename to WebKitLibraries/win/tools/vsprops/production.vsprops

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

diff --git a/WebKitLibraries/win/tools32/vsprops/release.vsprops b/WebKitLibraries/win/tools/vsprops/release.vsprops
similarity index 100%
rename from WebKitLibraries/win/tools32/vsprops/release.vsprops
rename to WebKitLibraries/win/tools/vsprops/release.vsprops

diff --git a/WebKitLibraries/win/tools32/vsprops/releaseproduction.vsprops b/WebKitLibraries/win/tools/vsprops/releaseproduction.vsprops
similarity index 100%
rename from WebKitLibraries/win/tools32/vsprops/releaseproduction.vsprops
rename to WebKitLibraries/win/tools/vsprops/releaseproduction.vsprops

diff --git a/WebKitLibraries/win/tools32/WinTools.make b/WebKitLibraries/win/tools32/WinTools.make
deleted file mode 100755 (executable)
index 08115ab..0000000
--- a/WebKitLibraries/win/tools32/WinTools.make
+++ /dev/null
@@ -1,5 +0,0 @@
-install:
-    xcopy "$(SRCROOT)\vsprops\*.props" "$(DSTROOT)\AppleInternal\tools32\vsprops" /e/v/i/h/y
-    xcopy "$(SRCROOT)\scripts\*" "$(DSTROOT)\AppleInternal\tools32\scripts" /e/v/i/h/y
-    xcopy "$(SRCROOT)\vsprops\*.props" "$(DSTROOT)\AppleInternal\tools64\vsprops" /e/v/i/h/y
-    xcopy "$(SRCROOT)\scripts\*" "$(DSTROOT)\AppleInternal\tools64\scripts" /e/v/i/h/y
\ No newline at end of file