Title: [159953] branches/safari-537.60-branch/Source/WebKit
- Revision
- 159953
- Author
- [email protected]
- Date
- 2013-12-02 12:44:17 -0800 (Mon, 02 Dec 2013)
Log Message
Merge r159941.
2013-12-02 Brent Fulgham <[email protected]>
[Win] WebKit Project doesn't copy resource bundle
https://bugs.webkit.org/show_bug.cgi?id=125078
Reviewed by Jer Noble.
* WebKit.vcxproj/WebKit/WebKitPostBuild.cmd:
Modified Paths
Diff
Modified: branches/safari-537.60-branch/Source/WebKit/ChangeLog (159952 => 159953)
--- branches/safari-537.60-branch/Source/WebKit/ChangeLog 2013-12-02 20:40:58 UTC (rev 159952)
+++ branches/safari-537.60-branch/Source/WebKit/ChangeLog 2013-12-02 20:44:17 UTC (rev 159953)
@@ -1,3 +1,16 @@
+2013-12-02 Brent Fulgham <[email protected]>
+
+ Merge r159941.
+
+ 2013-12-02 Brent Fulgham <[email protected]>
+
+ [Win] WebKit Project doesn't copy resource bundle
+ https://bugs.webkit.org/show_bug.cgi?id=125078
+
+ Reviewed by Jer Noble.
+
+ * WebKit.vcxproj/WebKit/WebKitPostBuild.cmd:
+
2013-11-07 Roger Fong <[email protected]>
Unreviewed. Windows WebKit makefile fixes.
Modified: branches/safari-537.60-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd (159952 => 159953)
--- branches/safari-537.60-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd 2013-12-02 20:40:58 UTC (rev 159952)
+++ branches/safari-537.60-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd 2013-12-02 20:44:17 UTC (rev 159953)
@@ -1,16 +1,22 @@
-mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebKit"
-
-xcopy /y /d "%PROJECTDIR%\..\..\win\WebLocalizableStrings.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
-xcopy /y /d "%PROJECTDIR%\..\..\win\WebKitGraphics.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
-xcopy /y /d "%PROJECTDIR%\..\..\win\WebKitCOMAPI.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
-xcopy /y /d "%PROJECTDIR%\..\..\win\WebPreferenceKeysPrivate.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
-
-xcopy /y /d "%CONFIGURATIONBUILDDIR%\include\WebCore\npapi.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
-xcopy /y /d "%CONFIGURATIONBUILDDIR%\include\WebCore\npfunctions.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
-xcopy /y /d "%CONFIGURATIONBUILDDIR%\include\WebCore\npruntime.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
-xcopy /y /d "%CONFIGURATIONBUILDDIR%\include\WebCore\npruntime_internal.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
-xcopy /y /d "%CONFIGURATIONBUILDDIR%\include\WebCore\nptypes.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
-
-if exist "%WEBKIT_LIBRARIES%\tools\VersionStamper\VersionStamper.exe" "%WEBKIT_LIBRARIES%\tools\VersionStamper\VersionStamper.exe" --verbose "%TARGETPATH%"
-
-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
+mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebKit"
+
+set ResourcesDirectory=%CONFIGURATIONBUILDDIR%\bin32\WebKit.resources
+
+xcopy /y /d "%PROJECTDIR%\..\..\win\WebLocalizableStrings.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
+xcopy /y /d "%PROJECTDIR%\..\..\win\WebKitGraphics.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
+xcopy /y /d "%PROJECTDIR%\..\..\win\WebKitCOMAPI.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
+xcopy /y /d "%PROJECTDIR%\..\..\win\WebPreferenceKeysPrivate.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
+
+xcopy /y /d "%CONFIGURATIONBUILDDIR%\include\WebCore\npapi.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
+xcopy /y /d "%CONFIGURATIONBUILDDIR%\include\WebCore\npfunctions.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
+xcopy /y /d "%CONFIGURATIONBUILDDIR%\include\WebCore\npruntime.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
+xcopy /y /d "%CONFIGURATIONBUILDDIR%\include\WebCore\npruntime_internal.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
+xcopy /y /d "%CONFIGURATIONBUILDDIR%\include\WebCore\nptypes.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
+
+echo Copying resources...
+mkdir "%ResourcesDirectory%" 2>NUL
+xcopy /y /d "%PROJECTDIR%\..\..\win\WebKit.resources\*" "%ResourcesDirectory%" >NUL
+
+if exist "%WEBKIT_LIBRARIES%\tools\VersionStamper\VersionStamper.exe" "%WEBKIT_LIBRARIES%\tools\VersionStamper\VersionStamper.exe" --verbose "%TARGETPATH%"
+
+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
