Title: [172611] branches/safari-600.1-branch/Source/WebCore
- Revision
- 172611
- Author
- [email protected]
- Date
- 2014-08-14 15:59:07 -0700 (Thu, 14 Aug 2014)
Log Message
Merged r172609. <rdar://problem/18023620>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172610 => 172611)
--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-14 22:56:57 UTC (rev 172610)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-14 22:59:07 UTC (rev 172611)
@@ -1,5 +1,28 @@
2014-08-14 Lucas Forschler <[email protected]>
+ Merge r172609
+
+ 2014-08-14 Brent Fulgham <[email protected]>
+
+ [Win] Correct build when DerivedSources location not supplied by build environment
+ https://bugs.webkit.org/show_bug.cgi?id=135954
+ <rdar://problem/18023620>
+
+ Reviewed by Joseph Pecoraro.
+
+ The DerivedSourcesDirectory is not always defined, depending on what
+ solution is being used to build this project. Instead, just define
+ it directly, since we already know where it needs to go.
+
+ Also:
+ 1. Stop redirecting the copy output to NUL so I can see if this fails in the future.
+ 2. Make sure the target directory exists before copying to it.
+
+ * WebCore.vcxproj/copyForwardingHeaders.cmd: Properly specify
+ the directories for copying the JS file.
+
+2014-08-14 Lucas Forschler <[email protected]>
+
Merge r172584
2014-08-14 Jer Noble <[email protected]>
Modified: branches/safari-600.1-branch/Source/WebCore/WebCore.vcxproj/copyForwardingHeaders.cmd (172610 => 172611)
--- branches/safari-600.1-branch/Source/WebCore/WebCore.vcxproj/copyForwardingHeaders.cmd 2014-08-14 22:56:57 UTC (rev 172610)
+++ branches/safari-600.1-branch/Source/WebCore/WebCore.vcxproj/copyForwardingHeaders.cmd 2014-08-14 22:59:07 UTC (rev 172611)
@@ -1,6 +1,7 @@
rem %1 argument is used for graphics. It can be cg or cairo
rem %2 argument is used for network. It can be cf or curl
+mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\private\WebCore"
mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCore"
mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders"
mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\bindings"
@@ -104,7 +105,8 @@
xcopy /y /d "%ProjectDir%..\testing\js\WebCoreTestSupport.h" "%CONFIGURATIONBUILDDIR%\include\WebCoreTestSupport"
+set DerivedSourcesDirectory=%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebCore\DerivedSources
set PrivateHeadersDirectory=%CONFIGURATIONBUILDDIR%\include\private\WebCore
-xcopy /y "%DerivedSourcesDirectory%\InspectorWebBackendCommands.js" "%PrivateHeadersDirectory%" >NUL
+xcopy /y "%DerivedSourcesDirectory%\InspectorWebBackendCommands.js" "%PrivateHeadersDirectory%"
if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
