Changeset 63828 in webkit
- Timestamp:
- Jul 21, 2010 9:01:14 AM (14 years ago)
- Location:
- trunk/WebKitTools
- Files:
-
- 1 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKitTools/ChangeLog
r63826 r63828 1 2010-07-21 Adam Roben <aroben@apple.com> 2 3 Move InjectedBundle's settings to a vsprops file 4 5 This will make it easier to change settings for all configurations, 6 and to add new configurations. 7 8 Fixes <http://webkit.org/b/42748> InjectedBundle should use vsprops 9 files 10 11 Reviewed by Darin Adler. 12 13 * WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops: Added. 14 Moved settings here... 15 * WebKitTestRunner/InjectedBundle/win/InjectedBundle.vcproj: ...from 16 here. 17 1 18 2010-07-21 Adam Roben <aroben@apple.com> 2 19 -
trunk/WebKitTools/WebKitTestRunner/InjectedBundle/win/InjectedBundle.vcproj
r63693 r63828 19 19 Name="Debug|Win32" 20 20 ConfigurationType="2" 21 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops "21 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;..\..\Configurations\InjectedBundleCommon.vsprops" 22 22 CharacterSet="1" 23 23 > 24 24 <Tool 25 25 Name="VCPreBuildEventTool" 26 CommandLine=" %SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
if exist "$(WebKitOutputDir)\buildfailed" grep XX$(ProjectName)XX "$(WebKitOutputDir)\buildfailed"
if errorlevel 1 exit 1
echo XX$(ProjectName)XX > "$(WebKitOutputDir)\buildfailed"
"26 CommandLine="" 27 27 /> 28 28 <Tool … … 40 40 <Tool 41 41 Name="VCCLCompilerTool" 42 AdditionalIncludeDirectories=" "$(ProjectDir)\..";"$(ProjectDir)\..\..";"$(ProjectDir)\..\Bindings";"$(WebKitOutputDir)\Include";"$(WebKitOutputDir)\Include\private";"$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\include";"$(WebKitOutputDir)\obj\InjectedBundle\DerivedSources\""43 ForcedIncludeFiles=" WebKitTestRunnerPrefix.h"42 AdditionalIncludeDirectories="" 43 ForcedIncludeFiles="" 44 44 /> 45 45 <Tool … … 54 54 <Tool 55 55 Name="VCLinkerTool" 56 AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib" 57 OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll" 56 OutputFile="" 58 57 /> 59 58 <Tool … … 80 79 <Tool 81 80 Name="VCPostBuildEventTool" 82 CommandLine=" if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed""81 CommandLine="" 83 82 /> 84 83 </Configuration> … … 86 85 Name="Release|Win32" 87 86 ConfigurationType="2" 88 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops "87 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops;..\..\Configurations\InjectedBundleCommon.vsprops" 89 88 CharacterSet="1" 90 89 WholeProgramOptimization="1" … … 92 91 <Tool 93 92 Name="VCPreBuildEventTool" 94 CommandLine=" %SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
if exist "$(WebKitOutputDir)\buildfailed" grep XX$(ProjectName)XX "$(WebKitOutputDir)\buildfailed"
if errorlevel 1 exit 1
echo XX$(ProjectName)XX > "$(WebKitOutputDir)\buildfailed"
"93 CommandLine="" 95 94 /> 96 95 <Tool … … 108 107 <Tool 109 108 Name="VCCLCompilerTool" 110 AdditionalIncludeDirectories=" "$(ProjectDir)\..";"$(ProjectDir)\..\..";"$(ProjectDir)\..\Bindings";"$(WebKitOutputDir)\Include";"$(WebKitOutputDir)\Include\private";"$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\include";"$(WebKitOutputDir)\obj\InjectedBundle\DerivedSources\""111 ForcedIncludeFiles=" WebKitTestRunnerPrefix.h"109 AdditionalIncludeDirectories="" 110 ForcedIncludeFiles="" 112 111 /> 113 112 <Tool … … 122 121 <Tool 123 122 Name="VCLinkerTool" 124 AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib" 125 OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll" 123 OutputFile="" 126 124 /> 127 125 <Tool … … 148 146 <Tool 149 147 Name="VCPostBuildEventTool" 150 CommandLine=" if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed""148 CommandLine="" 151 149 /> 152 150 </Configuration> … … 154 152 Name="Debug_All|Win32" 155 153 ConfigurationType="2" 156 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops "154 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;..\..\Configurations\InjectedBundleCommon.vsprops" 157 155 CharacterSet="1" 158 156 > 159 157 <Tool 160 158 Name="VCPreBuildEventTool" 161 CommandLine=" %SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
if exist "$(WebKitOutputDir)\buildfailed" grep XX$(ProjectName)XX "$(WebKitOutputDir)\buildfailed"
if errorlevel 1 exit 1
echo XX$(ProjectName)XX > "$(WebKitOutputDir)\buildfailed"
"159 CommandLine="" 162 160 /> 163 161 <Tool … … 175 173 <Tool 176 174 Name="VCCLCompilerTool" 177 AdditionalIncludeDirectories=" "$(ProjectDir)\..";"$(ProjectDir)\..\..";"$(ProjectDir)\..\Bindings";"$(WebKitOutputDir)\Include";"$(WebKitOutputDir)\Include\private";"$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\include";"$(WebKitOutputDir)\obj\InjectedBundle\DerivedSources\""175 AdditionalIncludeDirectories="" 178 176 RuntimeLibrary="3" 179 ForcedIncludeFiles=" WebKitTestRunnerPrefix.h"177 ForcedIncludeFiles="" 180 178 /> 181 179 <Tool … … 190 188 <Tool 191 189 Name="VCLinkerTool" 192 AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib" 193 OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll" 190 OutputFile="" 194 191 /> 195 192 <Tool
Note: See TracChangeset
for help on using the changeset viewer.