Title: [152252] branches/safari-537-branch/Source/WebCore
- Revision
- 152252
- Author
- [email protected]
- Date
- 2013-07-01 13:57:06 -0700 (Mon, 01 Jul 2013)
Log Message
Merged r152231. <rdar://problem/14321403>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (152251 => 152252)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-01 20:54:59 UTC (rev 152251)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-01 20:57:06 UTC (rev 152252)
@@ -1,5 +1,16 @@
2013-07-01 Lucas Forschler <[email protected]>
+ Merge r152231
+
+ 2013-07-01 Roger Fong <[email protected]>
+
+ Unreviewed. Make WebCore.make copy over QTMovieWin DLL's and PDB's.
+ <rdar://problem/14321403>
+
+ * WebCore.vcxproj/WebCore.make:
+
+2013-07-01 Lucas Forschler <[email protected]>
+
Merge r152207
2013-06-29 Carlos Garcia Campos <[email protected]>
Modified: branches/safari-537-branch/Source/WebCore/WebCore.vcxproj/WebCore.make (152251 => 152252)
--- branches/safari-537-branch/Source/WebCore/WebCore.vcxproj/WebCore.make 2013-07-01 20:54:59 UTC (rev 152251)
+++ branches/safari-537-branch/Source/WebCore/WebCore.vcxproj/WebCore.make 2013-07-01 20:57:06 UTC (rev 152252)
@@ -17,6 +17,8 @@
xcopy "%ConfigurationBuildDir%\include\*" "$(DSTROOT)\AppleInternal\include\" /e/v/i/h/y
xcopy "%ConfigurationBuildDir%\lib32\*" "$(DSTROOT)\AppleInternal\lib32\" /e/v/i/h/y
xcopy "%ConfigurationBuildDir%\bin32\WebKit.resources\*" "$(DSTROOT)\%ProgramFilesAAS%\WebKit.resources" /e/v/i/h/y
+ xcopy "%ConfigurationBuildDir%\bin32\*.dll" "$(DSTROOT)\%ProgramFilesAAS%\" /e/v/i/h/y
+ xcopy "%ConfigurationBuildDir%\bin32\*.pdb" "$(DSTROOT)\%ProgramFilesAAS%\" /e/v/i/h/y
xcopy "%ConfigurationBuildDir%\obj32\WebCore\scripts\*" "$(DSTROOT)\AppleInternal\tools\scripts" /e/v/i/h/y
-mkdir "$(DSTROOT)\AppleInternal\Sources32\WebCore"
xcopy "%ConfigurationBuildDir%\obj32\WebCore\DerivedSources\*" "$(DSTROOT)\AppleInternal\Sources32\WebCore" /e/v/i/h/y
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
