Title: [160426] branches/safari-537.74-branch/Source/WebKit
- Revision
- 160426
- Author
- [email protected]
- Date
- 2013-12-11 04:26:15 -0800 (Wed, 11 Dec 2013)
Log Message
Merged r160118. <rdar://problem/15566844>
Modified Paths
Diff
Modified: branches/safari-537.74-branch/Source/WebKit/ChangeLog (160425 => 160426)
--- branches/safari-537.74-branch/Source/WebKit/ChangeLog 2013-12-11 12:22:58 UTC (rev 160425)
+++ branches/safari-537.74-branch/Source/WebKit/ChangeLog 2013-12-11 12:26:15 UTC (rev 160426)
@@ -1,5 +1,18 @@
2013-12-11 Lucas Forschler <[email protected]>
+ Merge r160118
+
+ 2013-12-04 Brent Fulgham <[email protected]>
+
+ [Win] Correct WebKit.make copy command to land resources in proper directory.
+ https://bugs.webkit.org/show_bug.cgi?id=125249
+
+ Reviewed by Tim Horton.
+
+ * WebKit.vcxproj/WebKit.make: Correct the copy command.
+
+2013-12-11 Lucas Forschler <[email protected]>
+
Merge r160017
2013-12-03 Brent Fulgham <[email protected]>
Modified: branches/safari-537.74-branch/Source/WebKit/WebKit.vcxproj/WebKit.make (160425 => 160426)
--- branches/safari-537.74-branch/Source/WebKit/WebKit.vcxproj/WebKit.make 2013-12-11 12:22:58 UTC (rev 160425)
+++ branches/safari-537.74-branch/Source/WebKit/WebKit.vcxproj/WebKit.make 2013-12-11 12:26:15 UTC (rev 160426)
@@ -15,7 +15,7 @@
-xcopy "%ConfigurationBuildDir%\bin32\*.exe" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y
xcopy "%ConfigurationBuildDir%\bin32\*.pdb" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y
-xcopy "%ConfigurationBuildDir%\bin32\*.dll" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y
- xcopy "%ConfigurationBuildDir%\bin32\WebKit.resources" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y
+ xcopy "%ConfigurationBuildDir%\bin32\WebKit.resources\*" "$(DSTROOT)\%ProgramFilesAAS%\WebKit.resources\" /e/v/i/h/y
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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
