Update webkit.org build instructions for Apple Windows port.
authorroger_fong@apple.com <roger_fong@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 13 Jun 2013 01:15:58 +0000 (01:15 +0000)
committerroger_fong@apple.com <roger_fong@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 13 Jun 2013 01:15:58 +0000 (01:15 +0000)
https://bugs.webkit.org/show_bug.cgi?id=117563.

Reviewed by Brent Fulgham.

* building/build.html:
* building/debug.html:
* building/launch-debugger-vs2005.png: Removed.
* building/launch-debugger-vs2010.png: Copied from webkit.org/building/launch-debugger-vs2005.png.
* building/set-as-startup-project-vs2005.png: Removed.
* building/set-as-startup-project-vs2010.png: Copied from webkit.org/building/set-as-startup-project-vs2005.png.
* building/set-debugging-properties-vs2005.png: Removed.
* building/set-debugging-properties-vs2010.png: Copied from webkit.org/building/set-debugging-properties-vs2005.png.
* building/tools.html:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@151534 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Websites/webkit.org/ChangeLog
Websites/webkit.org/building/build.html
Websites/webkit.org/building/debug.html
Websites/webkit.org/building/launch-debugger-vs2005.png [deleted file]
Websites/webkit.org/building/launch-debugger-vs2010.png [new file with mode: 0644]
Websites/webkit.org/building/set-as-startup-project-vs2005.png [deleted file]
Websites/webkit.org/building/set-as-startup-project-vs2010.png [new file with mode: 0644]
Websites/webkit.org/building/set-debugging-properties-vs2005.png [deleted file]
Websites/webkit.org/building/set-debugging-properties-vs2010.png [new file with mode: 0644]
Websites/webkit.org/building/tools.html

index 04e7abe..f0ea9d2 100644 (file)
@@ -1,3 +1,20 @@
+2013-06-12  Roger Fong  <roger_fong@apple.com>
+
+        Update webkit.org build instructions for Apple Windows port.
+        https://bugs.webkit.org/show_bug.cgi?id=117563.
+
+        Reviewed by Brent Fulgham.
+
+        * building/build.html:
+        * building/debug.html:
+        * building/launch-debugger-vs2005.png: Removed.
+        * building/launch-debugger-vs2010.png: Copied from webkit.org/building/launch-debugger-vs2005.png.
+        * building/set-as-startup-project-vs2005.png: Removed.
+        * building/set-as-startup-project-vs2010.png: Copied from webkit.org/building/set-as-startup-project-vs2005.png.
+        * building/set-debugging-properties-vs2005.png: Removed.
+        * building/set-debugging-properties-vs2010.png: Copied from webkit.org/building/set-debugging-properties-vs2005.png.
+        * building/tools.html:
+
 2013-06-12  Timothy Hatcher  <timothy@apple.com>
 
         Add new Web Inspector images for a blog post.
index f91c6f3..d1a162e 100644 (file)
@@ -26,7 +26,7 @@ debugging symbols and assertions:</p>
 </ol>
 
 <p>By default, <code>build-webkit</code> places build products in <code>WebKitBuild</code>.  You can specify a different build
-location on Mac in your Xcode preferences.  On other platforms, the <code>WEBKITOUTPUTDIR</code> environment variable can be used to
+location on Mac in your Xcode preferences.  On other platforms, the <code>WEBKIT_OUTPUTDIR</code> environment variable can be used to
 set a different build products location. If you have set up a custom build location, then <code>build-webkit</code> will
 place the build products there.</p>
 
@@ -35,6 +35,7 @@ place the build products there.</p>
 <p>A common source of build errors on Windows is Visual C++ Express forgetting the Platform SDK paths.  If you have trouble building WebKit,
 double check that the paths you set during <a href="http://msdn.microsoft.com/en-us/library/ms235626(VS.80).aspx">step 2 of the Platform SDK Installation</a>
 are still there and add them again if necessary.</p>
+<p>Building on Windows requires a few more steps, you should look at: http://trac.webkit.org/wiki/BuildingOnWindows</p>
 <p>Don't forget that if you have any questions or problems building WebKit, feel free to <a href="/contact.html">get in touch!</a></p>
 </div>
 
index 3d1e7de..4332bbb 100644 (file)
 <div class="windows-instructions">
 <h2>Debugging on Windows</h2>
 <ol>
-<li><p>Open <code>WebKit/WebKit/win/WebKit.vcproj/WebKit.sln</code></p>
-<p>You can open it in either Visual Studio 2005, or Visual C++ Express 2005.
-If you get errors about not being able to find <code>.vsprops</code> files, run
+<li><p>Open <code>Source/WebKit/WebKit.vcxproj/WebKit.sln</code></p>
+<p>You can open it in either Visual Studio 2010, or Visual C++ Express 2010.
+If you get errors about not being able to find <code>.props</code> files, run
 update-webkit, then close and relaunch Cygwin and Visual Studio or Visual C++
 Express.</p>
 </li>
-<li><p>Set WebKit.vcproj as the solution's StartUp project</p>
-<p>Select the WebKit project in the Solution Explorer, then choose Project >
+<li><p>Set WinLauncher as the solution's StartUp project</p>
+<p>Select the WinLauncher project in the Solution Explorer, then choose Project >
 Set as StartUp Project. This will cause the project to turn bold in the
 Solution Explorer.</p>
-<img src="set-as-startup-project-vs2005.png">
-</li>
-<li><p>Set WebKit.vcproj's Debugging properties</p>
-<p>With the WebKit project selected, choose Project > Properties, then navigate
-to Configuration Properties > Debugging. Set the following options:</p>
-<dl>
-    <dt>Command</dt>
-    <dd><code>$(PROGRAMFILES)\Safari\Safari.exe</code></dd>
-    <dt>Environment</dt>
-    <dd><code>WEBKITNIGHTLY=$(OutDir)</code></dd>
-</dl>
-<p>Then click <code>OK</code> to close the properties dialog.</p>
-<img src="set-debugging-properties-vs2005.png">
+<img src="set-as-startup-project-vs2010.png">
 </li>
 <li><p>Launch the debugger</p>
 <p>Choose Debug > Start Debugging.</p>
-<img src="launch-debugger-vs2005.png">
+<img src="launch-debugger-vs2010.png">
+<li><p>Alternatively, you can debug layout tests with DumpRenderTree</p>
+<p>Set DumpRenderTreeLauncher as your startup project, set the layout test as a command argument, and launch the debugger.</p>
+<p>In DumpRenderTreeLauncher's properties, go to Configuration Properties->Debugging and set the Command Arguments field to the full path of the layout test you want to debug, see below: </p>
+<img src="set-debugging-properties-vs2010.png">
+</li>
 </ol>
-<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>
 
 <?php
diff --git a/Websites/webkit.org/building/launch-debugger-vs2005.png b/Websites/webkit.org/building/launch-debugger-vs2005.png
deleted file mode 100644 (file)
index aefc82e..0000000
Binary files a/Websites/webkit.org/building/launch-debugger-vs2005.png and /dev/null differ
diff --git a/Websites/webkit.org/building/launch-debugger-vs2010.png b/Websites/webkit.org/building/launch-debugger-vs2010.png
new file mode 100644 (file)
index 0000000..ea0e59d
Binary files /dev/null and b/Websites/webkit.org/building/launch-debugger-vs2010.png differ
diff --git a/Websites/webkit.org/building/set-as-startup-project-vs2005.png b/Websites/webkit.org/building/set-as-startup-project-vs2005.png
deleted file mode 100644 (file)
index 9016f83..0000000
Binary files a/Websites/webkit.org/building/set-as-startup-project-vs2005.png and /dev/null differ
diff --git a/Websites/webkit.org/building/set-as-startup-project-vs2010.png b/Websites/webkit.org/building/set-as-startup-project-vs2010.png
new file mode 100644 (file)
index 0000000..4667982
Binary files /dev/null and b/Websites/webkit.org/building/set-as-startup-project-vs2010.png differ
diff --git a/Websites/webkit.org/building/set-debugging-properties-vs2005.png b/Websites/webkit.org/building/set-debugging-properties-vs2005.png
deleted file mode 100644 (file)
index 79990f3..0000000
Binary files a/Websites/webkit.org/building/set-debugging-properties-vs2005.png and /dev/null differ
diff --git a/Websites/webkit.org/building/set-debugging-properties-vs2010.png b/Websites/webkit.org/building/set-debugging-properties-vs2010.png
new file mode 100644 (file)
index 0000000..2b8d8cf
Binary files /dev/null and b/Websites/webkit.org/building/set-debugging-properties-vs2010.png differ
index 398ab0d..69a1220 100644 (file)
@@ -20,27 +20,10 @@ set the environment variable DEVELOPER_DIR to <code>/Applications/Xcode.app/Cont
 <div class="windows-instructions">
 <h4>Windows</h4>
 <ol>
-<li><p>If you own Visual Studio 2005 (newer versions of Visual Studio are currently unsupported):</p>
-<p>Install <a target="installtools" href="http://www.microsoft.com/downloads/details.aspx?familyid=BB4A75AB-E2D4-4C96-B39D-37BAF6B5B1DC&amp;displaylang=en">Microsoft Visual Studio 2005 Team Suite Service Pack 1</a>.</p>
+<li><p>You can build with either Visual Studio 2010 or Visual Studio 2010 express. (Newer versions currently unsupported)</p>
+<p>Install <a target="installtools" href="http://www.microsoft.com/en-us/download/details.aspx?id=23691">Microsoft Visual Studio 2010 Service Pack 1</a>.</p>
 <p>If you are building from Vista, install <a target="installtools" href="http://www.microsoft.com/downloads/details.aspx?FamilyID=90e2942d-3ad1-4873-a2ee-4acc0aace5b6&amp;displaylang=en">Service Pack 1 Update for Windows Vista</a>.</p>
-<p>Install <a target="installtools" href="http://www.microsoft.com/downloads/details.aspx?FamilyID=7c8729dc-06a2-4538-a90d-ff9464dc0197&amp;displaylang=en">Visual Studio 2005 Service Pack 1 ATL Security Update</a>.</p>
-<p>Install the following hotfixes to improve Visual Studio's performance and responsiveness:</p>
-<ol style="list-style-type: lower-alpha">
-<li><a target="installtools" href="http://code.msdn.microsoft.com/KB918559">KB918559</a></li>
-<li><a target="installtools" href="http://code.msdn.microsoft.com/KB935225">KB935225</a></li>
-<li><a target="installtools" href="http://code.msdn.microsoft.com/KB943969">KB943969</a></li>
-<li><a target="installtools" href="http://code.msdn.microsoft.com/KB947315">KB947315</a></li>
-</ol>
 <p>Use the default options for these installations.</p>
-<li><p>If not, you can use Visual C++ Express 2005 (newer versions of Visual C++ Express Edition are currently unsupported):</p>
-<p>Install <a target="installtools" href="http://go.microsoft.com/fwlink/?LinkId=51410">Visual C++ 2005 Express</a>.</p>
-<p>Install <a target="installtools" href="http://download.microsoft.com/download/7/7/3/7737290f-98e8-45bf-9075-85cc6ae34bf1/VS80sp1-KB926748-X86-INTL.exe">Microsoft Visual C++ Express 2005 Service Pack 1</a>.</p>
-<p>If you are building from Vista, install <a target="installtools" href="http://www.microsoft.com/downloads/details.aspx?FamilyID=90e2942d-3ad1-4873-a2ee-4acc0aace5b6&amp;displaylang=en">Service Pack 1 Update for Windows Vista</a>.</p>
-<p>Install <a target="installtools" href="http://www.microsoft.com/downloads/details.aspx?FamilyID=7c8729dc-06a2-4538-a90d-ff9464dc0197&amp;displaylang=en">Visual Studio 2005 Service Pack 1 ATL Security Update</a>.</p>
-<p>Install the <a target="installtools" href="http://www.microsoft.com/downloads/details.aspx?familyid=0baf2b35-c656-4969-ace8-e4c0c0716adb&amp;displaylang=en">Windows Server 2003 R2 Platform SDK</a>, then follow steps 2 and 3 of &ldquo;<a target="installtools" href="http://msdn.microsoft.com/en-us/library/ms235626(VS.80).aspx">How to: Use Visual C++ Express Edition with the Microsoft Platform SDK</a>.&rdquo;</p>
-<p>Use the default options for all installations.</p>
-<p>In addition to the paths specified in step 3 of the Platform SDK installation instructions, you must also add the following include path. Update the Visual C++ directories in the Projects and Solutions section in the Options dialog box:</p>
-<p style="font-size:10px">C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Include\mfc</p>
 
 <li><p>Install Cygwin</p>
 <p>Cygwin is a collection of utilities for Windows that includes not only a Subversion
@@ -85,7 +68,7 @@ Those lines would prevent picking up the Windows TMP and TEMP environment variab
 <p>Download QuickTime SDK for Windows from <a href="http://developer.apple.com/quicktime/download/">http://developer.apple.com/quicktime/download/</a> and install it to the default location (\Program Files\QuickTime SDK). This is needed for media support.
 
 <li><p>Install DirectX SDK</p>
-<p>Download the <a href="http://www.microsoft.com/downloads/en/details.aspx?displaylang=en&FamilyID=2c7da5fb-ffbb-4af6-8c66-651cbd28ca15">February 2010 DirectX SDK</a> (newer versions do not support Visual Studio 2005).  This is needed for accelerated compositing.</p>
+<p>Download the <a href="http://www.microsoft.com/en-us/download/details.aspx?id=6812">June 2010 DirectX SDK</a>  This is needed for accelerated compositing.</p>
 </p>
 
 <li><p>Optional: Install the 32-bit version of Debugging Tools for Windows</p>