Title: [160019] branches/safari-537.60-branch/Source/WebKit
- Revision
- 160019
- Author
- [email protected]
- Date
- 2013-12-03 11:34:44 -0800 (Tue, 03 Dec 2013)
Log Message
Merge r160017.
2013-12-03 Brent Fulgham <[email protected]>
[Win] WebKit.make Makefile doesn't copy resource bundle to DSTROOT
https://bugs.webkit.org/show_bug.cgi?id=125160
Reviewed by Tim Horton.
* WebKit.vcxproj/WebKit.make: Add copy command for resource bundle.
Modified Paths
Diff
Modified: branches/safari-537.60-branch/Source/WebKit/ChangeLog (160018 => 160019)
--- branches/safari-537.60-branch/Source/WebKit/ChangeLog 2013-12-03 19:31:21 UTC (rev 160018)
+++ branches/safari-537.60-branch/Source/WebKit/ChangeLog 2013-12-03 19:34:44 UTC (rev 160019)
@@ -1,3 +1,16 @@
+2013-12-03 Brent Fulgham <[email protected]>
+
+ Merge r160017.
+
+ 2013-12-03 Brent Fulgham <[email protected]>
+
+ [Win] WebKit.make Makefile doesn't copy resource bundle to DSTROOT
+ https://bugs.webkit.org/show_bug.cgi?id=125160
+
+ Reviewed by Tim Horton.
+
+ * WebKit.vcxproj/WebKit.make: Add copy command for resource bundle.
+
2013-12-02 Brent Fulgham <[email protected]>
Merge r159941.
Modified: branches/safari-537.60-branch/Source/WebKit/WebKit.vcxproj/WebKit.make (160018 => 160019)
--- branches/safari-537.60-branch/Source/WebKit/WebKit.vcxproj/WebKit.make 2013-12-03 19:31:21 UTC (rev 160018)
+++ branches/safari-537.60-branch/Source/WebKit/WebKit.vcxproj/WebKit.make 2013-12-03 19:34:44 UTC (rev 160019)
@@ -14,5 +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%\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
