+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.
<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
<?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
<?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
<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
<?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
<?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
<?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
-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"
<?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
<?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
<?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
</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
</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
<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
<?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
<?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
<?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
<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
<?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
<?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
<?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
<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
<?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
<?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
<?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
<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
<?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
<?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
<?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
<?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
<?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
+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.
</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
+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
<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
<?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
<?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
<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
<?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
<?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
<?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
<?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
<?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
<?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
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')
+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
<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
<?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
<?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
<?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
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"
<?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
<?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
<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>
<?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
<?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
<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
<?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
<?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
<?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
<?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
<?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
<?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
<?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
<?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
<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
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
+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.
<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
<?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
<?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
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%"
<?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
<?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
<?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
<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
<?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
<?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
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%"
<?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
<?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
<?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
<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
<?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
<?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
<?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
<?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
<?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
<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
<?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
<?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
<?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
<?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
<?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
+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.
<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
<?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
<?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
<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
<?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
<?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
<?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
<?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
<?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
<?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
<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
<?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
<?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
<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
<?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
<?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
<?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
<?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
<?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
<?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
<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
<?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
<?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
<?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
<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
<?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
<?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
<?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
<?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
<?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
<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
<?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
<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
<?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
<?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
<?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
<?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
<?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
</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
<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
<?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
<?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
<?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
<?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
<?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
+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.
--- /dev/null
+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
}
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
# 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'
+++ /dev/null
-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