[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[jberlin at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 0288fb6108a93acf59f3cb5833d00e2f6200b076
Author: jberlin at webkit.org <jberlin at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 31 19:25:46 2011 +0000

    WebKit2: the cookies used by the WebKit2 Web Process should not go in a top-level
    directory.
    https://bugs.webkit.org/show_bug.cgi?id=53278
    
    Reviewed by Steve Falkenburg.
    
    Use the name WebKit2WebProcess since the default location for the cookies is determined
    based on the process name (which is WebKit2WebProcess.exe on Windows).
    
    * win/WebKit2.make:
    Copy the WebKit2WebProcess.resources directory into the AppleInternal bin.
    
    * win/WebKit2WebProcess.resources: Added.
    * win/WebKit2WebProcess.resources/Info.plist: Added.
    Copied from the WebKit version of Info.plist.
    
    * win/WebKit2WebProcessPostBuild.cmd:
    Copy the WebKit2WebProcess.resources directory into the WebKitOutPutDir's bin.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77147 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 776377c..401ef85 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,24 @@
+2011-01-31  Jessie Berlin  <jberlin at apple.com>
+
+        Reviewed by Steve Falkenburg.
+
+        WebKit2: the cookies used by the WebKit2 Web Process should not go in a top-level
+        directory.
+        https://bugs.webkit.org/show_bug.cgi?id=53278
+
+        Use the name WebKit2WebProcess since the default location for the cookies is determined
+        based on the process name (which is WebKit2WebProcess.exe on Windows).
+
+        * win/WebKit2.make:
+        Copy the WebKit2WebProcess.resources directory into the AppleInternal bin.
+
+        * win/WebKit2WebProcess.resources: Added.
+        * win/WebKit2WebProcess.resources/Info.plist: Added.
+        Copied from the WebKit version of Info.plist.
+
+        * win/WebKit2WebProcessPostBuild.cmd:
+        Copy the WebKit2WebProcess.resources directory into the WebKitOutPutDir's bin.
+
 2011-01-31  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/Source/WebKit2/win/WebKit2.make b/Source/WebKit2/win/WebKit2.make
index 69be2e3..111d113 100755
--- a/Source/WebKit2/win/WebKit2.make
+++ b/Source/WebKit2/win/WebKit2.make
@@ -17,5 +17,6 @@ install:
 	xcopy "%ConfigurationBuildDir%\include\*" "$(DSTROOT)\AppleInternal\include\" /e/v/i/h/y	
 	xcopy "%ConfigurationBuildDir%\lib\*" "$(DSTROOT)\AppleInternal\lib\" /e/v/i/h/y
 	-xcopy "%ConfigurationBuildDir%\bin\WebKit2.resources\*" "$(DSTROOT)\AppleInternal\bin\WebKit2.resources" /e/v/i/h/y
+	-xcopy "%ConfigurationBuildDir%\bin\WebKit2WebProcess.resources\*" "$(DSTROOT)\AppleInternal\bin\WebKit2WebProcess.resources" /e/v/i/h/y
 	-mkdir "$(DSTROOT)\AppleInternal\Sources\WebKit2"
 	xcopy "%ConfigurationBuildDir%\obj\WebKit\DerivedSources\*" "$(DSTROOT)\AppleInternal\Sources\WebKit2" /e/v/i/h/y
diff --git a/Source/WebKit2/win/WebKit2WebProcess.resources/Info.plist b/Source/WebKit2/win/WebKit2WebProcess.resources/Info.plist
new file mode 100644
index 0000000..2b8f801
--- /dev/null
+++ b/Source/WebKit2/win/WebKit2WebProcess.resources/Info.plist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>WebKit2WebProcess</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Copyright 2011 Apple Inc.</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.apple.WebKit2WebProcess</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>WebKit2WebProcess</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+</dict>
+</plist>
diff --git a/Source/WebKit2/win/WebKit2WebProcessPostBuild.cmd b/Source/WebKit2/win/WebKit2WebProcessPostBuild.cmd
index 26707ca..609f325 100644
--- a/Source/WebKit2/win/WebKit2WebProcessPostBuild.cmd
+++ b/Source/WebKit2/win/WebKit2WebProcessPostBuild.cmd
@@ -1 +1,4 @@
+mkdir 2>NUL "%OUTDIR%\..\bin\WebKit2WebProcess.resources"
+xcopy /y /d "%PROJECTDIR%\WebKit2WebProcess.resources\*" "%OUTDIR%\..\bin\WebKit2WebProcess.resources"
+
 if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"

-- 
WebKit Debian packaging