Replace tools32 folder with tools and update WebKit Windows solution accordingly.
authorroger_fong@apple.com <roger_fong@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 18 Jun 2013 23:16:34 +0000 (23:16 +0000)
committerroger_fong@apple.com <roger_fong@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 18 Jun 2013 23:16:34 +0000 (23:16 +0000)
<rdar://problem/14118143>.

Rubberstamped by Brent Fulgham.

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

169 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreDebug.props
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreDebugCFLite.props
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGeneratedDebug.props
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGeneratedProduction.props
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGeneratedRelease.props
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCorePostBuild.cmd
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreProduction.props
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreRelease.props
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreReleaseCFLite.props
Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj
Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj
Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractor.vcxproj
Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractorDebug.props
Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractorProduction.props
Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractorRelease.props
Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jsc.vcxproj
Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscDebug.props
Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscProduction.props
Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscRelease.props
Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj
Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpDebug.props
Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpProduction.props
Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpRelease.props
Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapi.vcxproj
Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiDebug.props
Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiDebugCFLite.props
Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiProduction.props
Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiRelease.props
Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiReleaseCFLite.props
Source/ThirdParty/ChangeLog
Source/ThirdParty/gtest/msvc/gtest-md.vcxproj
Source/WTF/ChangeLog
Source/WTF/WTF.vcxproj/WTF.vcxproj
Source/WTF/WTF.vcxproj/WTFDebug.props
Source/WTF/WTF.vcxproj/WTFDebugWinCairo.props
Source/WTF/WTF.vcxproj/WTFGenerated.vcxproj
Source/WTF/WTF.vcxproj/WTFGeneratedDebug.props
Source/WTF/WTF.vcxproj/WTFGeneratedProduction.props
Source/WTF/WTF.vcxproj/WTFGeneratedRelease.props
Source/WTF/WTF.vcxproj/WTFProduction.props
Source/WTF/WTF.vcxproj/WTFRelease.props
Source/WTF/WTF.vcxproj/WTFReleaseWinCairo.props
Source/WTF/WTF.vcxproj/work-around-vs-dependency-tracking-bugs.py
Source/WebCore/ChangeLog
Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWin.vcxproj
Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinCairoDebug.props
Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinCairoRelease.props
Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinDebug.props
Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinPostBuild.cmd
Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinProduction.props
Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWinRelease.props
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
Source/WebCore/WebCore.vcxproj/WebCoreDebug.props
Source/WebCore/WebCore.vcxproj/WebCoreDebugWinCairo.props
Source/WebCore/WebCore.vcxproj/WebCoreGenerated.vcxproj
Source/WebCore/WebCore.vcxproj/WebCoreGeneratedDebug.props
Source/WebCore/WebCore.vcxproj/WebCoreGeneratedDebugWinCairo.props
Source/WebCore/WebCore.vcxproj/WebCoreGeneratedProduction.props
Source/WebCore/WebCore.vcxproj/WebCoreGeneratedRelease.props
Source/WebCore/WebCore.vcxproj/WebCoreGeneratedReleaseWinCairo.props
Source/WebCore/WebCore.vcxproj/WebCoreProduction.props
Source/WebCore/WebCore.vcxproj/WebCoreRelease.props
Source/WebCore/WebCore.vcxproj/WebCoreReleaseWinCairo.props
Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj
Source/WebCore/WebCore.vcxproj/build-generated-files.sh
Source/WebKit/ChangeLog
Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj
Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesDebug.props
Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesDebugWinCairo.props
Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd
Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesProduction.props
Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesRelease.props
Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesReleaseWinCairo.props
Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj
Source/WebKit/WebKit.vcxproj/WebKit/WebKitDebug.props
Source/WebKit/WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props
Source/WebKit/WebKit.vcxproj/WebKit/WebKitPreBuild.cmd
Source/WebKit/WebKit.vcxproj/WebKit/WebKitProduction.props
Source/WebKit/WebKit.vcxproj/WebKit/WebKitRelease.props
Source/WebKit/WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props
Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj
Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorDebug.props
Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorDebugWinCairo.props
Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorProduction.props
Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorRelease.props
Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorReleaseWinCairo.props
Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj
Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDDebug.props
Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDDebugWinCairo.props
Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDProduction.props
Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDRelease.props
Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDReleaseWinCairo.props
Tools/ChangeLog
Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj
Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeDebug.props
Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeDebugWinCairo.props
Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj
Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncherDebug.props
Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncherProduction.props
Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncherRelease.props
Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeProduction.props
Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeRelease.props
Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeReleaseWinCairo.props
Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiff.vcxproj
Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffDebug.props
Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffDebugWinCairo.props
Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncher.vcxproj
Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncherDebug.props
Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncherProduction.props
Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncherRelease.props
Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffProduction.props
Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffRelease.props
Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffReleaseWinCairo.props
Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.vcxproj
Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginDebug.props
Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginProduction.props
Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginRelease.props
Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj
Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIDebug.props
Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIDebugWinCairo.props
Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIProduction.props
Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIRelease.props
Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIReleaseWinCairo.props
Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj
Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherDebug.props
Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj
Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibDebug.props
Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibProduction.props
Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibRelease.props
Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherProduction.props
Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherRelease.props
Tools/win/AssembleBuildLogs/AssembleBuildLogs.vcxproj
Tools/win/record-memory/record-memory.vcxproj
Tools/win/record-memory/record-memoryDebug.props
Tools/win/record-memory/record-memoryDebugWinCairo.props
Tools/win/record-memory/record-memoryProduction.props
Tools/win/record-memory/record-memoryRelease.props
Tools/win/record-memory/record-memoryReleaseWinCairo.props
WebKitLibraries/ChangeLog
WebKitLibraries/win/tools/WinTools.make [new file with mode: 0755]
WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR [moved from WebKitLibraries/win/tools32/scripts/COPYRIGHT-END-YEAR with 100% similarity]
WebKitLibraries/win/tools/scripts/VERSION [moved from WebKitLibraries/win/tools32/scripts/VERSION with 100% similarity]
WebKitLibraries/win/tools/scripts/auto-version.sh [moved from WebKitLibraries/win/tools32/scripts/auto-version.sh with 97% similarity]
WebKitLibraries/win/tools/scripts/feature-defines.sh [moved from WebKitLibraries/win/tools32/scripts/feature-defines.sh with 92% similarity]
WebKitLibraries/win/tools/vsprops/FeatureDefines.props [moved from WebKitLibraries/win/tools32/vsprops/FeatureDefines.props with 100% similarity]
WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops [moved from WebKitLibraries/win/tools32/vsprops/FeatureDefines.vsprops with 100% similarity]
WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props [moved from WebKitLibraries/win/tools32/vsprops/FeatureDefinesCairo.props with 100% similarity]
WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops [moved from WebKitLibraries/win/tools32/vsprops/FeatureDefinesCairo.vsprops with 100% similarity]
WebKitLibraries/win/tools/vsprops/WinCairo.props [moved from WebKitLibraries/win/tools32/vsprops/WinCairo.props with 100% similarity]
WebKitLibraries/win/tools/vsprops/WinCairo.vsprops [moved from WebKitLibraries/win/tools32/vsprops/WinCairo.vsprops with 100% similarity]
WebKitLibraries/win/tools/vsprops/cURL.props [moved from WebKitLibraries/win/tools32/vsprops/cURL.props with 100% similarity]
WebKitLibraries/win/tools/vsprops/cURL.vsprops [moved from WebKitLibraries/win/tools32/vsprops/cURL.vsprops with 100% similarity]
WebKitLibraries/win/tools/vsprops/common.props [moved from WebKitLibraries/win/tools32/vsprops/common.props with 100% similarity]
WebKitLibraries/win/tools/vsprops/common.vsprops [moved from WebKitLibraries/win/tools32/vsprops/common.vsprops with 100% similarity]
WebKitLibraries/win/tools/vsprops/debug.props [moved from WebKitLibraries/win/tools32/vsprops/debug.props with 100% similarity]
WebKitLibraries/win/tools/vsprops/debug.vsprops [moved from WebKitLibraries/win/tools32/vsprops/debug.vsprops with 100% similarity]
WebKitLibraries/win/tools/vsprops/debug_all.vsprops [moved from WebKitLibraries/win/tools32/vsprops/debug_all.vsprops with 100% similarity]
WebKitLibraries/win/tools/vsprops/debug_wincairo.props [moved from WebKitLibraries/win/tools32/vsprops/debug_wincairo.props with 100% similarity]
WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops [moved from WebKitLibraries/win/tools32/vsprops/debug_wincairo.vsprops with 100% similarity]
WebKitLibraries/win/tools/vsprops/debugsuffix.props [moved from WebKitLibraries/win/tools32/vsprops/debugsuffix.props with 100% similarity]
WebKitLibraries/win/tools/vsprops/production.props [moved from WebKitLibraries/win/tools32/vsprops/production.props with 100% similarity]
WebKitLibraries/win/tools/vsprops/production.vsprops [moved from WebKitLibraries/win/tools32/vsprops/production.vsprops with 100% similarity]
WebKitLibraries/win/tools/vsprops/release.props [moved from WebKitLibraries/win/tools32/vsprops/release.props with 100% similarity]
WebKitLibraries/win/tools/vsprops/release.vsprops [moved from WebKitLibraries/win/tools32/vsprops/release.vsprops with 100% similarity]
WebKitLibraries/win/tools/vsprops/releaseproduction.vsprops [moved from WebKitLibraries/win/tools32/vsprops/releaseproduction.vsprops with 100% similarity]
WebKitLibraries/win/tools32/WinTools.make [deleted file]

index e267c79..a3fd855 100644 (file)
@@ -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.
index 27720d2..d90ff2e 100644 (file)
@@ -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
index bd34303..c6031d2 100644 (file)
@@ -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
index c5ac8b8..43bb4ff 100644 (file)
@@ -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
index 03bb358..34e5e4f 100644 (file)
@@ -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
index 83099ff..eccbcc9 100644 (file)
@@ -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
index b53cc8a..04d8596 100644 (file)
@@ -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
index 6b9eaeb..abc39d5 100644 (file)
@@ -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
index b367b56..8b0a3a4 100644 (file)
@@ -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"
index 2666139..628c501 100644 (file)
@@ -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
index 4e6051c..96bd35f 100644 (file)
@@ -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
index d26417c..d28b28b 100644 (file)
@@ -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
index 7247129..5acbf03 100644 (file)
   </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
index 1613c28..fa92406 100644 (file)
   </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
index d92948e..7b0ca28 100644 (file)
@@ -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
index 8b5b798..efc2abf 100644 (file)
@@ -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
index f2b51f5..d9e84cb 100644 (file)
@@ -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
index 0ada040..77252c1 100644 (file)
@@ -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
index 8750adc..9fc964c 100644 (file)
@@ -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
index f8a5d4e..dcaff7f 100644 (file)
@@ -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
index 84227e6..7a2fb58 100644 (file)
@@ -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
index 2822e40..24d985f 100644 (file)
@@ -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
index a31b7be..c29f52d 100644 (file)
@@ -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
index 65a744c..6adaee7 100644 (file)
@@ -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
index f7911c0..5fd2174 100644 (file)
@@ -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
index d192bf4..e830b2f 100644 (file)
@@ -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
index 2b7e50a..59d31ee 100644 (file)
@@ -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
index a06d74f..f7f71fe 100644 (file)
@@ -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
index abdafa6..3c8b93b 100644 (file)
@@ -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
index 26d2b11..c7ac5d0 100644 (file)
@@ -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
index b603a83..60b1f0d 100644 (file)
@@ -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
index 688c442..c93fd50 100644 (file)
@@ -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
index bc61f98..0b5b434 100644 (file)
@@ -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.
index b69593b..d5d0646 100644 (file)
   </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
index 968558f..ae3817e 100644 (file)
@@ -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
index 45f539d..0d22433 100644 (file)
   <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
index c307856..10e9911 100644 (file)
@@ -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
index b14435f..c8051a3 100644 (file)
@@ -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
index 6f85023..4f430bc 100644 (file)
@@ -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
index 232f772..ffff17d 100644 (file)
@@ -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
index 9dcbda8..3430017 100644 (file)
@@ -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
index 2b3862b..95f2a13 100644 (file)
@@ -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
index a7ecabd..16de6e3 100644 (file)
@@ -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
index ea912a8..708e1d1 100644 (file)
@@ -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
index bef8b9c..40e480d 100644 (file)
@@ -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
index 940e2d2..51d650f 100644 (file)
@@ -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')
index f3048ff..adb2d37 100644 (file)
@@ -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
index a3bfc3f..cc4605f 100644 (file)
@@ -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
index c704e51..a319032 100644 (file)
@@ -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
index 44bb5ee..7b3685b 100644 (file)
@@ -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
index 044ef5c..6ae2785 100644 (file)
@@ -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
index 24d97ea..3ed231d 100644 (file)
@@ -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"
index e19a4f9..fe488cf 100644 (file)
@@ -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
index 06641c8..8b91dca 100644 (file)
@@ -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
index 55a3704..f7dbbd4 100644 (file)
@@ -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>
index 1ab565c..ea4db35 100644 (file)
@@ -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
index 2256b7e..1f2a58a 100644 (file)
@@ -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
index f12a519..b1a1d66 100644 (file)
@@ -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
index 5dad6ab..1524563 100644 (file)
@@ -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
index b6a4d3f..759b495 100644 (file)
@@ -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
index 912d5f3..6290f79 100644 (file)
@@ -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
index 0b72ff6..1980d6a 100644 (file)
@@ -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
index 34ed210..1cb8a10 100644 (file)
@@ -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
index dca56f5..cb313b3 100644 (file)
@@ -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
index c8987e3..22b7858 100644 (file)
@@ -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
index e0444f9..764fe1d 100644 (file)
@@ -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
index c5c03f4..dd530e8 100644 (file)
@@ -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
index 891baa5..2f233e1 100644 (file)
@@ -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
index aae0901..7798f3c 100644 (file)
@@ -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.
index 4e4bd79..9fdc3fd 100644 (file)
@@ -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
index 6b8d2bb..4943a9a 100644 (file)
@@ -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
index 3cdc376..f114823 100644 (file)
@@ -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
index 58d8d8c..37b99bc 100644 (file)
@@ -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%"
index dde8b4d..ff60fb0 100644 (file)
@@ -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
index 6059bc8..51f9ce3 100644 (file)
@@ -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
index 0c43830..6b53f1d 100644 (file)
@@ -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
index 84cb011..cd47d70 100644 (file)
@@ -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
index 2e92ef7..04eb617 100644 (file)
@@ -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
index ea0438e..3007427 100644 (file)
@@ -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
index 1dce907..1e26e87 100644 (file)
@@ -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%"
index 35fd6f8..75df6fb 100644 (file)
@@ -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
index dd6b557..3a0ff66 100644 (file)
@@ -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
index 78d9723..3daaf7b 100644 (file)
@@ -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
index cd2be60..06e4bdf 100644 (file)
@@ -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
index 715f583..7521acb 100644 (file)
@@ -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
index a3936b9..2876aae 100644 (file)
@@ -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
index 7d2f1e2..9262f99 100644 (file)
@@ -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
index 4eac560..6b94004 100644 (file)
@@ -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
index 81b8c5b..93089b9 100644 (file)
@@ -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
index 2938ef0..29f5c6c 100644 (file)
@@ -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
index 7c2644c..b66e89a 100644 (file)
@@ -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
index 33cb709..72bf600 100644 (file)
@@ -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
index 8a4c8cc..f090abf 100644 (file)
@@ -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
index 63dc4f2..13d78bf 100644 (file)
@@ -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
index aeb39f5..4c44e4f 100644 (file)
@@ -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
index 2764f6a..9339c4b 100644 (file)
@@ -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.
index fc29a74..e6c142d 100644 (file)
@@ -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
index fea2e26..06bcf15 100644 (file)
@@ -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
index e1a20bb..4c7b50b 100644 (file)
@@ -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
index c759d36..a67ee22 100644 (file)
@@ -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
index 5628784..0faa57f 100644 (file)
@@ -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
index 44f721f..a7098d8 100644 (file)
@@ -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
index b15db6c..b02cd0d 100644 (file)
@@ -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
index bf1bf71..9b6aae0 100644 (file)
@@ -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
index 614d90b..610d794 100644 (file)
@@ -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
index 8db6dd1..e37ad5f 100644 (file)
@@ -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
index e64d07d..144b6b2 100644 (file)
@@ -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
index b2d1e85..29ef2dd 100644 (file)
@@ -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
index fc01c7b..45cdc16 100644 (file)
@@ -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
index 06069f0..a89688e 100644 (file)
@@ -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
index 8111f64..7fb6db6 100644 (file)
@@ -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
index 3694b95..ae18695 100644 (file)
@@ -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
index 3a68a1f..3209436 100644 (file)
@@ -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
index 5237f29..d9296c8 100644 (file)
@@ -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
index 75a1c51..f1be547 100644 (file)
@@ -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
index bb2d062..b0fd860 100644 (file)
@@ -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
index 2c4d01e..81a68bb 100644 (file)
   <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
index 758d2ca..87aa3fd 100644 (file)
@@ -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
index addadcc..0edbb86 100644 (file)
@@ -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
index e46c1bc..42c8d7d 100644 (file)
@@ -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
index 64c3190..9020bd2 100644 (file)
@@ -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
index bafbdda..72fe2c9 100644 (file)
@@ -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
index 0b33ac6..6fafee9 100644 (file)
@@ -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
index 3a84b32..7c252b6 100644 (file)
@@ -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
index 1c0f06e..0c1ccbf 100644 (file)
@@ -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
index 4ab2a71..9ef4ff5 100644 (file)
@@ -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
index 7307de6..cc12a70 100644 (file)
@@ -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
index 4ce9feb..084ff52 100644 (file)
@@ -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
index d47b576..448be47 100644 (file)
@@ -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
index 42c0c0e..8c4c7d9 100644 (file)
@@ -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
index ddfa658..8f7f126 100644 (file)
@@ -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
index 409798f..7cb9b66 100644 (file)
@@ -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
index a899b6d..7f3c032 100644 (file)
@@ -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
index d260a68..0a3a226 100644 (file)
@@ -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
index 026a5d0..a126101 100644 (file)
   </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
index d176863..11a2064 100644 (file)
@@ -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
index 0875ee4..5061a80 100644 (file)
@@ -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
index f36bb0e..00dc04f 100644 (file)
@@ -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
index 492dc92..9dc78e2 100644 (file)
@@ -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
index 7cde14e..798046d 100644 (file)
@@ -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
index 87ee6a5..2d040cc 100644 (file)
@@ -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
index 5169b27..b0f6094 100644 (file)
@@ -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
@@ -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
@@ -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
@@ -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/WinTools.make b/WebKitLibraries/win/tools32/WinTools.make
deleted file mode 100755 (executable)
index 08115ab..0000000
+++ /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