Changeset 68905 in webkit
- Timestamp:
- Oct 1, 2010 11:31:14 AM (13 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r68904 r68905 1 2010-10-01 Adam Roben <aroben@apple.com> 2 3 Copy forwarding headers and Inspector JS files as part of 4 WebCoreGenerated.vcproj 5 6 WebCoreGenerated.vcproj runs on every build, while WebCore.vcproj only 7 runs when a .h or .cpp file changes. By moving the copying to 8 WebCoreGenerated, it will happen even when someone only changes a JS 9 file (as happened in r68887). 10 11 Fixes <http://webkit.org/b/46988> <rdar://problem/8502489> REGRESSION 12 (r68887): Web Inspector: inspector/extensions*.html are failing on 13 Windows 14 15 Reviewed by Anders Carlsson. 16 17 * WebCore.vcproj/WebCore.vcproj: Moved invocation of 18 copyForwardingHeaders and copyInspectorFiles from here... 19 * WebCore.vcproj/WebCoreGenerated.vcproj: ...to here. 20 1 21 2010-09-30 Ryosuke Niwa <rniwa@webkit.org> 2 22 -
trunk/WebCore/WebCore.vcproj/WebCore.vcproj
r68878 r68905 68 68 <Tool 69 69 Name="VCPostBuildEventTool" 70 CommandLine=" cmd /C copyForwardingHeaders.cmd cg cf
cmd /C copyInspectorFiles.cmd
"70 CommandLine="" 71 71 /> 72 72 </Configuration> … … 124 124 <Tool 125 125 Name="VCPostBuildEventTool" 126 CommandLine=" cmd /C copyForwardingHeaders.cmd cg cf
cmd /C copyInspectorFiles.cmd
"126 CommandLine="" 127 127 /> 128 128 </Configuration> … … 179 179 <Tool 180 180 Name="VCPostBuildEventTool" 181 CommandLine=" cmd /C copyForwardingHeaders.cmd cg cf
cmd /C copyInspectorFiles.cmd
"181 CommandLine="" 182 182 /> 183 183 </Configuration> … … 234 234 <Tool 235 235 Name="VCPostBuildEventTool" 236 CommandLine=" cmd /C copyForwardingHeaders.cmd cairo curl
cmd /C copyInspectorFiles.cmd
"236 CommandLine="" 237 237 /> 238 238 </Configuration> … … 290 290 <Tool 291 291 Name="VCPostBuildEventTool" 292 CommandLine=" cmd /C copyForwardingHeaders.cmd cairo curl
cmd /C copyInspectorFiles.cmd
"292 CommandLine="" 293 293 /> 294 294 </Configuration> … … 345 345 <Tool 346 346 Name="VCPostBuildEventTool" 347 CommandLine=" cmd /C copyForwardingHeaders.cmd cg cf
cmd /C copyInspectorFiles.cmd
"347 CommandLine="" 348 348 /> 349 349 </Configuration> … … 356 356 > 357 357 <File 358 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\ColorData.cpp" 359 > 360 </File> 361 <File 358 362 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\CSSGrammar.cpp" 359 363 > … … 424 428 </File> 425 429 <File 430 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\CSSPropertyNames.cpp" 431 > 432 </File> 433 <File 434 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\CSSValueKeywords.cpp" 435 > 436 </File> 437 <File 426 438 RelativePath="..\DerivedSources.cpp" 427 439 > … … 482 494 </File> 483 495 <File 496 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\DocTypeStrings.cpp" 497 > 498 </File> 499 <File 500 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\HashTools.h" 501 > 502 </File> 503 <File 484 504 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\HTMLElementFactory.cpp" 485 505 > … … 543 563 <File 544 564 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\HTMLNames.h" 545 >546 </File>547 <File548 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\HashTools.h"549 >550 </File>551 <File552 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\DocTypeStrings.cpp"553 >554 </File>555 <File556 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\CSSValueKeywords.cpp"557 >558 </File>559 <File560 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\CSSPropertyNames.cpp"561 >562 </File>563 <File564 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\ColorData.cpp"565 565 > 566 566 </File> … … 27413 27413 </File> 27414 27414 <File 27415 RelativePath="..\platform\network\ResourceRawHeaders.h" 27416 > 27417 </File> 27418 <File 27415 27419 RelativePath="..\platform\network\ResourceRequestBase.cpp" 27416 27420 > … … 27426 27430 <File 27427 27431 RelativePath="..\platform\network\ResourceResponseBase.h" 27428 >27429 </File>27430 <File27431 RelativePath="..\platform\network\ResourceRawHeaders.h"27432 27432 > 27433 27433 </File> … … 33123 33123 </File> 33124 33124 <File 33125 RelativePath="..\rendering\svg\RenderSVGText.cpp" 33126 > 33127 <FileConfiguration 33128 Name="Debug|Win32" 33129 ExcludedFromBuild="true" 33130 > 33131 <Tool 33132 Name="VCCLCompilerTool" 33133 /> 33134 </FileConfiguration> 33135 <FileConfiguration 33136 Name="Release|Win32" 33137 ExcludedFromBuild="true" 33138 > 33139 <Tool 33140 Name="VCCLCompilerTool" 33141 /> 33142 </FileConfiguration> 33143 <FileConfiguration 33144 Name="Debug_Internal|Win32" 33145 ExcludedFromBuild="true" 33146 > 33147 <Tool 33148 Name="VCCLCompilerTool" 33149 /> 33150 </FileConfiguration> 33151 <FileConfiguration 33152 Name="Debug_Cairo|Win32" 33153 ExcludedFromBuild="true" 33154 > 33155 <Tool 33156 Name="VCCLCompilerTool" 33157 /> 33158 </FileConfiguration> 33159 <FileConfiguration 33160 Name="Release_Cairo|Win32" 33161 ExcludedFromBuild="true" 33162 > 33163 <Tool 33164 Name="VCCLCompilerTool" 33165 /> 33166 </FileConfiguration> 33167 <FileConfiguration 33168 Name="Debug_All|Win32" 33169 ExcludedFromBuild="true" 33170 > 33171 <Tool 33172 Name="VCCLCompilerTool" 33173 /> 33174 </FileConfiguration> 33175 </File> 33176 <File 33177 RelativePath="..\rendering\svg\RenderSVGText.h" 33178 > 33179 </File> 33180 <File 33181 RelativePath="..\rendering\svg\RenderSVGTextPath.cpp" 33182 > 33183 <FileConfiguration 33184 Name="Debug|Win32" 33185 ExcludedFromBuild="true" 33186 > 33187 <Tool 33188 Name="VCCLCompilerTool" 33189 /> 33190 </FileConfiguration> 33191 <FileConfiguration 33192 Name="Release|Win32" 33193 ExcludedFromBuild="true" 33194 > 33195 <Tool 33196 Name="VCCLCompilerTool" 33197 /> 33198 </FileConfiguration> 33199 <FileConfiguration 33200 Name="Debug_Internal|Win32" 33201 ExcludedFromBuild="true" 33202 > 33203 <Tool 33204 Name="VCCLCompilerTool" 33205 /> 33206 </FileConfiguration> 33207 <FileConfiguration 33208 Name="Debug_Cairo|Win32" 33209 ExcludedFromBuild="true" 33210 > 33211 <Tool 33212 Name="VCCLCompilerTool" 33213 /> 33214 </FileConfiguration> 33215 <FileConfiguration 33216 Name="Release_Cairo|Win32" 33217 ExcludedFromBuild="true" 33218 > 33219 <Tool 33220 Name="VCCLCompilerTool" 33221 /> 33222 </FileConfiguration> 33223 <FileConfiguration 33224 Name="Debug_All|Win32" 33225 ExcludedFromBuild="true" 33226 > 33227 <Tool 33228 Name="VCCLCompilerTool" 33229 /> 33230 </FileConfiguration> 33231 </File> 33232 <File 33233 RelativePath="..\rendering\svg\RenderSVGTextPath.h" 33234 > 33235 </File> 33236 <File 33125 33237 RelativePath="..\rendering\svg\RenderSVGTSpan.cpp" 33126 33238 > … … 33176 33288 <File 33177 33289 RelativePath="..\rendering\svg\RenderSVGTSpan.h" 33178 >33179 </File>33180 <File33181 RelativePath="..\rendering\svg\RenderSVGText.cpp"33182 >33183 <FileConfiguration33184 Name="Debug|Win32"33185 ExcludedFromBuild="true"33186 >33187 <Tool33188 Name="VCCLCompilerTool"33189 />33190 </FileConfiguration>33191 <FileConfiguration33192 Name="Release|Win32"33193 ExcludedFromBuild="true"33194 >33195 <Tool33196 Name="VCCLCompilerTool"33197 />33198 </FileConfiguration>33199 <FileConfiguration33200 Name="Debug_Internal|Win32"33201 ExcludedFromBuild="true"33202 >33203 <Tool33204 Name="VCCLCompilerTool"33205 />33206 </FileConfiguration>33207 <FileConfiguration33208 Name="Debug_Cairo|Win32"33209 ExcludedFromBuild="true"33210 >33211 <Tool33212 Name="VCCLCompilerTool"33213 />33214 </FileConfiguration>33215 <FileConfiguration33216 Name="Release_Cairo|Win32"33217 ExcludedFromBuild="true"33218 >33219 <Tool33220 Name="VCCLCompilerTool"33221 />33222 </FileConfiguration>33223 <FileConfiguration33224 Name="Debug_All|Win32"33225 ExcludedFromBuild="true"33226 >33227 <Tool33228 Name="VCCLCompilerTool"33229 />33230 </FileConfiguration>33231 </File>33232 <File33233 RelativePath="..\rendering\svg\RenderSVGText.h"33234 >33235 </File>33236 <File33237 RelativePath="..\rendering\svg\RenderSVGTextPath.cpp"33238 >33239 <FileConfiguration33240 Name="Debug|Win32"33241 ExcludedFromBuild="true"33242 >33243 <Tool33244 Name="VCCLCompilerTool"33245 />33246 </FileConfiguration>33247 <FileConfiguration33248 Name="Release|Win32"33249 ExcludedFromBuild="true"33250 >33251 <Tool33252 Name="VCCLCompilerTool"33253 />33254 </FileConfiguration>33255 <FileConfiguration33256 Name="Debug_Internal|Win32"33257 ExcludedFromBuild="true"33258 >33259 <Tool33260 Name="VCCLCompilerTool"33261 />33262 </FileConfiguration>33263 <FileConfiguration33264 Name="Debug_Cairo|Win32"33265 ExcludedFromBuild="true"33266 >33267 <Tool33268 Name="VCCLCompilerTool"33269 />33270 </FileConfiguration>33271 <FileConfiguration33272 Name="Release_Cairo|Win32"33273 ExcludedFromBuild="true"33274 >33275 <Tool33276 Name="VCCLCompilerTool"33277 />33278 </FileConfiguration>33279 <FileConfiguration33280 Name="Debug_All|Win32"33281 ExcludedFromBuild="true"33282 >33283 <Tool33284 Name="VCCLCompilerTool"33285 />33286 </FileConfiguration>33287 </File>33288 <File33289 RelativePath="..\rendering\svg\RenderSVGTextPath.h"33290 33290 > 33291 33291 </File> … … 37822 37822 </File> 37823 37823 <File 37824 RelativePath="..\html\DOMTokenList.cpp" 37825 > 37826 </File> 37827 <File 37828 RelativePath="..\html\DOMTokenList.h" 37829 > 37830 </File> 37831 <File 37824 37832 RelativePath="..\html\EmailInputType.cpp" 37825 37833 > … … 37974 37982 </File> 37975 37983 <File 37984 RelativePath="..\html\FormDataList.cpp" 37985 > 37986 </File> 37987 <File 37976 37988 RelativePath="..\html\FormDataList.h" 37977 37989 > … … 37982 37994 </File> 37983 37995 <File 37984 RelativePath="..\html\DOMTokenList.cpp"37985 >37986 </File>37987 <File37988 RelativePath="..\html\DOMTokenList.h"37989 >37990 </File>37991 <File37992 RelativePath="..\html\FormDataList.cpp"37993 >37994 </File>37995 <File37996 37996 RelativePath="..\html\FTPDirectoryDocument.h" 37997 37997 > 37998 37998 </File> 37999 37999 <File 38000 RelativePath="..\html\HiddenInputType.cpp" 38001 > 38002 </File> 38003 <File 38004 RelativePath="..\html\HiddenInputType.h" 38005 > 38006 </File> 38007 <File 38000 38008 RelativePath="..\html\HTMLAllCollection.cpp" 38001 38009 > … … 42343 42351 <File 42344 42352 RelativePath="..\html\HTMLViewSourceDocument.h" 42345 >42346 </File>42347 <File42348 RelativePath="..\html\HiddenInputType.cpp"42349 >42350 </File>42351 <File42352 RelativePath="..\html\HiddenInputType.h"42353 42353 > 42354 42354 </File> … … 52997 52997 </File> 52998 52998 <File 52999 RelativePath="..\inspector\front-end\goToLineDialog.css" 53000 > 53001 </File> 53002 <File 52999 53003 RelativePath="..\inspector\front-end\GoToLineDialog.js" 53000 53004 > 53001 53005 </File> 53002 53006 <File 53003 RelativePath="..\inspector\front-end\goToLineDialog.css"53004 >53005 </File>53006 <File53007 53007 RelativePath="..\inspector\front-end\HAREntry.js" 53008 53008 > … … 53061 53061 </File> 53062 53062 <File 53063 RelativePath="..\inspector\front-end\networkPanel.css" 53064 > 53065 </File> 53066 <File 53063 53067 RelativePath="..\inspector\front-end\NetworkPanel.js" 53064 >53065 </File>53066 <File53067 RelativePath="..\inspector\front-end\networkPanel.css"53068 53068 > 53069 53069 </File> -
trunk/WebCore/WebCore.vcproj/WebCoreGenerated.vcproj
r54249 r68905 23 23 <Tool 24 24 Name="VCNMakeTool" 25 BuildCommandLine="%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"

bash build-generated-files.sh "$(WebKitOutputDir)" "$(WebKitLibrariesDir)" windows
bash migrate-scripts.sh "$(WebKitOutputDir)/obj/WebCore/scripts"
 
if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
"26 ReBuildCommandLine="echo XX$(ProjectName)XX > "$(WebKitOutputDir)\buildfailed"

del /s /q "$(WebKitOutputDir)\obj\WebCore\DerivedSources"
del /s /q "$(WebKitOutputDir)\obj\WebCore\scripts"
%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
bash build-generated-files.sh "$(WebKitOutputDir)" "$(WebKitLibrariesDir)" windows
bash migrate-scripts.sh "$(WebKitOutputDir)/obj/WebCore/scripts"
 
if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
"25 BuildCommandLine="%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"

bash build-generated-files.sh "$(WebKitOutputDir)" "$(WebKitLibrariesDir)" windows
bash migrate-scripts.sh "$(WebKitOutputDir)/obj/WebCore/scripts"
cmd /C copyForwardingHeaders.cmd cg cf
cmd /C copyInspectorFiles.cmd

if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
" 26 ReBuildCommandLine="echo XX$(ProjectName)XX > "$(WebKitOutputDir)\buildfailed"

del /s /q "$(WebKitOutputDir)\obj\WebCore\DerivedSources"
del /s /q "$(WebKitOutputDir)\obj\WebCore\scripts"
%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
bash build-generated-files.sh "$(WebKitOutputDir)" "$(WebKitLibrariesDir)" windows
bash migrate-scripts.sh "$(WebKitOutputDir)/obj/WebCore/scripts"
cmd /C copyForwardingHeaders.cmd cg cf
cmd /C copyInspectorFiles.cmd

if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
" 27 27 CleanCommandLine="del /s /q "$(WebKitOutputDir)\obj\WebCore\DerivedSources"
del /s /q "$(WebKitOutputDir)\obj\WebCore\scripts"
if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
" 28 28 Output="" … … 43 43 <Tool 44 44 Name="VCNMakeTool" 45 BuildCommandLine="%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"

bash build-generated-files.sh "$(WebKitOutputDir)" "$(WebKitLibrariesDir)" cairo
bash migrate-scripts.sh "$(WebKitOutputDir)/obj/WebCore/scripts"
 
if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
"46 ReBuildCommandLine="echo XX$(ProjectName)XX > "$(WebKitOutputDir)\buildfailed"

del /s /q "$(WebKitOutputDir)\obj\WebCore\DerivedSources"
del /s /q "$(WebKitOutputDir)\obj\WebCore\scripts"
%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
bash build-generated-files.sh "$(WebKitOutputDir)" "$(WebKitLibrariesDir)" cairo
bash migrate-scripts.sh "$(WebKitOutputDir)/obj/WebCore/scripts"
 
if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
"45 BuildCommandLine="%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"

bash build-generated-files.sh "$(WebKitOutputDir)" "$(WebKitLibrariesDir)" cairo
bash migrate-scripts.sh "$(WebKitOutputDir)/obj/WebCore/scripts"
cmd /C copyForwardingHeaders.cmd cairo curl
cmd /C copyInspectorFiles.cmd

if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
" 46 ReBuildCommandLine="echo XX$(ProjectName)XX > "$(WebKitOutputDir)\buildfailed"

del /s /q "$(WebKitOutputDir)\obj\WebCore\DerivedSources"
del /s /q "$(WebKitOutputDir)\obj\WebCore\scripts"
%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
bash build-generated-files.sh "$(WebKitOutputDir)" "$(WebKitLibrariesDir)" cairo
bash migrate-scripts.sh "$(WebKitOutputDir)/obj/WebCore/scripts"
cmd /C copyForwardingHeaders.cmd cairo curl
cmd /C copyInspectorFiles.cmd

if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
" 47 47 CleanCommandLine="del /s /q "$(WebKitOutputDir)\obj\WebCore\DerivedSources"
del /s /q "$(WebKitOutputDir)\obj\WebCore\scripts"
if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
" 48 48 Output=""
Note: See TracChangeset
for help on using the changeset viewer.