[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[jberlin at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 7f0be5278cf90daef1664683cd5ba8e45dbae0fe
Author: jberlin at webkit.org <jberlin at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 23 22:03:55 2010 +0000

    2010-02-23  Jessie Berlin  <jberlin at webkit.org>
    
            Reviewed by Eric Seidel and Adam Roben.
    
            Debugging WebKit on Windows should mention WebKit.sln as an alternative to running debug-safari.
            https://bugs.webkit.org/show_bug.cgi?id=35098
    
            * building/debug.html:
            Add instructions on how to build and run WebKit from within Visual Studio.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55170 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitSite/ChangeLog b/WebKitSite/ChangeLog
index 586cbe7..8246b4d 100644
--- a/WebKitSite/ChangeLog
+++ b/WebKitSite/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-23  Jessie Berlin  <jberlin at webkit.org>
+
+        Reviewed by Eric Seidel and Adam Roben.
+
+        Debugging WebKit on Windows should mention WebKit.sln as an alternative to running debug-safari.
+        https://bugs.webkit.org/show_bug.cgi?id=35098
+
+        * building/debug.html:
+        Add instructions on how to build and run WebKit from within Visual Studio.
+
 2010-02-20  Maciej Stachowiak  <mjs at apple.com>
 
         Rubber stamped by Adam Barth.
diff --git a/WebKitSite/building/debug.html b/WebKitSite/building/debug.html
index 3ab1b0b..a1542ba 100644
--- a/WebKitSite/building/debug.html
+++ b/WebKitSite/building/debug.html
@@ -48,6 +48,15 @@
 <p>You should consider including the command-line switch '<span class="code">/console</span>'.  This causes Safari to run with an open DOS shell in which output messages, created with the <span class="code">LOG</span> macro, appear.</p>
 <img src="console_vs2005.jpg"></li>
 </ul></p>
+<p>Alternatively, you can build, run, and debug WebKit from inside Visual Studio by opening the solution file:
+<ol>
+<li>Launch Visual Studio.</li>
+<li>Select the 'File' menu, then 'Open' > 'Project / Solution...'. Select the WebKit/win/WebKit.vcproj/WebKit.sln file and click 'Open'.</li>
+<li>Right-click on 'Solution "WebKit"' in the Solution Explorer and select 'Properties'. Under 'Common Properties' > 'Startup Project', 'Single Startup Project' should be set to 'WebKit'.</li>
+<li>Right-click on the 'WebKit' project in the Solution Explorer and select 'Properties'. Under 'Configuration Properties' > 'Debugging', make sure 'Command' and 'Working Directory' are set as shown above.</li>
+<li>To build, select the 'Build' menu, then 'Build Solution'. To run, select the 'Debug' menu, then 'Start Debugging'.</li>
+</ol>
+</p>
 <p>It is also recommended that you follow <a href="http://developer.apple.com/internet/safari/windows_symbols_agree.html">the instructions to configure Visual Studio to use Apple's Safari for Windows symbol server</a>. This will give Visual Studio the information it needs to provide reliable backtraces when pausing in the debugger or when a crash occurs.</p>
 </div>
 

-- 
WebKit Debian packaging