<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,27 +1,21 @@
 = Introduction =
 
-This document describes how to build e, including its dependencies.
+This document describes how to build e &amp; its dependencies.
 
 To build e you will need:
 
 * A copy of Visual C++ 2008
 ** You can get the free express edition at http://www.microsoft.com/express/vc/
 ** Full Visual Studio versions also work fine.
-** Note that opening a 2008 .sln file created with the Express version may still
-   prompt you to &quot;upgrade&quot; the .sln if you open it with a full Visual Studio SKU.
 
 * A set of GNU tools for Windows (including bash, patch, wget, etc.)
 ** Cygwin and Msys both support these tools.
 ** You'll probably end up with both anyway, Cygwin for e support and Msys for git support.
 
-To build e you will need a copy of Visual C++ 2008.
-* Any version of Visual Studio 2008 will also work, of course.
-* Note that opening a 2008 .sln file created with the Express version may still
-  prompt you to upgrade the .sln if you open it with a full Visual Studio SKU.
 
 = Building the Dependencies =
 
-e's code dependencies are:
+e's dependencies are:
 * wxWidgets
 * Metakit
 * PCRE
@@ -34,13 +28,14 @@ e's code dependencies are:
 To download, patch and compile these dependencies:
 * Run &quot;get_externals_win.sh&quot; in a cygwin shell.
 * Run &quot;build_externals_win.cmd&quot; in a VS2008 Command Prompt.
+** If you do not have the full Visual Studio, you will have to compile the
+** dependencies separately in the GUI, for now.
 
 Later versions of these projects may work with e, but have not been tested.
-Consult the &quot;get_externals_win.sh&quot; script to see what the expected version of a dependency is.
+Consult the &quot;get_externals_win.sh&quot; script to see what the expected versions are.
 
 
 = Building e Itself =
 * After building all the dependencies, open &quot;e.sln&quot; and build the Debug target.
-* Note that the resulting e.exe in &quot;Debug&quot; has no idea where Themes/Bundles/Support/etc. are.
-* If you want to run the new &quot;e.exe&quot;, you'll need to provide it with the support files.
-** One way to do this is to copy over the support folders from your licensed copy in &quot;C:\Program Files\e&quot;.
+* The newly build &quot;e&quot; will use configuration in the registry from an installed
+  license or trial version.</diff>
      <filename>building.txt</filename>
    </modified>
    <modified>
      <diff>@@ -23,15 +23,18 @@ goto :EOF
 
 REM **** Subroutines start here ****
 
+REM  Usage: call :BUILD path_to_sln [, config_to_build=DEBUG]
 :BUILD
 setlocal
-REM Args are: path_to_sln, [config_to_build=DEBUG]
 set CONFIG=%2
 if {%CONFIG%}=={} set CONFIG=&quot;DEBUG&quot;
 
 echo Building %1...
 devenv %1 /Build %CONFIG% &gt; build_logs\%~n1.log
 set RET=%ERRORLEVEL%
+REM &quot;mspdbsrv.exe&quot; can hang, which prevents new .pdb's from
+REM being created and causes subsequent command-line builds to fail.
+REM Explicitly try to kill it after a command-line build.
 taskkill.exe /f /t /im mspdbsrv.exe &gt; nul 2&gt; nul
 endlocal &amp; set RET=%RET%
 goto :EOF</diff>
      <filename>external/build_externals_win.cmd</filename>
    </modified>
    <modified>
      <diff>@@ -81,18 +81,18 @@ _extract_and_patch()
 
 _next_steps()
 {
-  echo &quot;** The libraries have been installed. **&quot;
-  echo &quot;Now you just need to build the following projects in msvc:&quot;
+  echo &quot;** The libraries have been downloaded and patched. **&quot;
+  echo &quot;Now build the following projects in Visual Studio:&quot;
   echo
-  echo &quot;curl\lib\curllib.sln (curllib)&quot;
-  echo &quot;libtomcrypt\libtomcrypt.sln (libtomcrypt)&quot;
-  echo &quot;libtommath\libtommath.sln (libtommath)&quot;
-  echo &quot;metakit\win\msvc90\mksrc.sln (mklib)&quot;
-  echo &quot;pcre\pcre.sln (pcre)&quot;
-  echo &quot;tinyxml\tinyxml.sln (tinyxml)&quot;
-  echo &quot;wxwidgets\build\msw\wx.dsw (wx)&quot;
+  echo &quot;curl\lib\curllib.sln&quot;
+  echo &quot;libtomcrypt\libtomcrypt.sln&quot;
+  echo &quot;libtommath\libtommath.sln&quot;
+  echo &quot;metakit\win\msvc90\mksrc.sln&quot;
+  echo &quot;pcre\pcre.sln&quot;
+  echo &quot;tinyxml\tinyxml.sln&quot;
+  echo &quot;wxwidgets\build\msw\wx.dsw&quot;
   echo
-  echo &quot;Run build_externals_win.cmd in a Visual Studio 2008 Command Prompt to compile from the command-line.&quot;
+  echo &quot;For an automated build, run build_externals_win.cmd in a Visual Studio 2008 Command Prompt.&quot;
 }
 
 </diff>
      <filename>external/get_externals_win.sh</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,3 @@
 To-do:
-* Revamp build instructions (the easy way vs. the hard way)
-* Get a working build; build currently succeeds but menus paint incorrectly.
+* Linux builds.
 * Unit/regression test suites.
-* Allow wget or curl to get dependencies.</diff>
      <filename>todo.txt</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>230dee019764985d2d4add61a6540fbc49f1fae7</id>
    </parent>
  </parents>
  <author>
    <name>Adam Vandenberg</name>
    <email>flangy@gmail.com</email>
  </author>
  <url>http://github.com/tea/e/commit/86b1c2b42e67c4ec0ba7276691126b00ef1dbe7a</url>
  <id>86b1c2b42e67c4ec0ba7276691126b00ef1dbe7a</id>
  <committed-date>2009-04-07T09:16:59-07:00</committed-date>
  <authored-date>2009-04-07T09:16:59-07:00</authored-date>
  <message>Edits to build instructions.</message>
  <tree>9a95e32158e9a52659e7c0848f9909ba00521400</tree>
  <committer>
    <name>Adam Vandenberg</name>
    <email>flangy@gmail.com</email>
  </committer>
</commit>
