Title: [160120] branches/safari-537.60-branch/Source/WebKit
- Revision
- 160120
- Author
- [email protected]
- Date
- 2013-12-04 13:29:45 -0800 (Wed, 04 Dec 2013)
Log Message
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.
Modified Paths
Diff
Modified: branches/safari-537.60-branch/Source/WebKit/ChangeLog (160119 => 160120)
--- branches/safari-537.60-branch/Source/WebKit/ChangeLog 2013-12-04 21:25:50 UTC (rev 160119)
+++ branches/safari-537.60-branch/Source/WebKit/ChangeLog 2013-12-04 21:29:45 UTC (rev 160120)
@@ -1,3 +1,16 @@
+2013-12-04 Brent Fulgham <[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-03 Brent Fulgham <[email protected]>
Merge r160017.
Modified: branches/safari-537.60-branch/Source/WebKit/WebKit.vcxproj/WebKit.make (160119 => 160120)
--- branches/safari-537.60-branch/Source/WebKit/WebKit.vcxproj/WebKit.make 2013-12-04 21:25:50 UTC (rev 160119)
+++ branches/safari-537.60-branch/Source/WebKit/WebKit.vcxproj/WebKit.make 2013-12-04 21:29:45 UTC (rev 160120)
@@ -14,6 +14,6 @@
devenv "WebKit.submit.sln" /rebuild $(BUILDSTYLE)
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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
