From 4e2662cdd699684a9a905f8726ade472ea942a5f Mon Sep 17 00:00:00 2001 From: "bfulgham@apple.com" Date: Mon, 2 Dec 2013 18:47:01 +0000 Subject: [PATCH] [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: Correct post-build step to copy WebKit.resources to build target. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@159941 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit/ChangeLog | 10 ++++++++++ .../WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog index b7a8603b85d..025a64ffddd 100644 --- a/Source/WebKit/ChangeLog +++ b/Source/WebKit/ChangeLog @@ -1,3 +1,13 @@ +2013-12-02 Brent Fulgham + + [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: Correct post-build step + to copy WebKit.resources to build target. + 2013-11-28 Thiago de Barros Lacerda Building EFL Webkit again with mediastream enabled diff --git a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd index cbe49e5e2af..91abd8b95f6 100644 --- a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd +++ b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd @@ -1,5 +1,7 @@ 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" @@ -11,6 +13,10 @@ xcopy /y /d "%CONFIGURATIONBUILDDIR%\include\WebCore\npruntime.h" "%CONFIGURATIO 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" -- GitLab