setup: new install doc -- doesn't require GNU make or a C++ compiler any more!

diff --git a/docs/install.html b/docs/install.html
index 3063c474a26a9e2e7198ce76c1a61dddf1396e20..3ffa1a1355e51caf75cde414f3ab0d231d7ac321 100644 (file)
--- a/docs/install.html
+++ b/docs/install.html
@@ -18,35 +18,32 @@
 
     <p>This procedure has been verified to work on Windows, Cygwin, Mac, Linux, Solaris, and FreeBSD.  It's likely to work on other platforms.  If you have trouble with this install process, please write to <a href="http://allmydata.org/cgi-bin/mailman/listinfo/tahoe-dev">the tahoe-dev mailing list</a>, where friendly hackers will help you out.</p>
 
-    <h2>Satisfy the Dependencies</h2>
+    <h2>Install Python</h2>
 
-    <p>Prior to installing Tahoe ensure that the following are installed:
+    <p>Follow the instructions on <a href="http://python.org/download/releases/2.5.2">the Python v2.5.2 download page</a> to download and install Python v2.5.2.
 
-      <ol>
-       <li><a href="http://gcc.gnu.org/">g++</a> &gt;= v3.3 -- the "Cygwin" version of gcc/g++ works for Cygwin and for Windows; the "Mac Developer Tools" version of gcc/g++ works for Mac</li>
+    <h2>Get Tahoe</h2>
 
-       <li><a href="http://gnu.org/software/make/">GNU make</a></li>
-
-       <li><a href="http://python.org">Python</a> &gt;= v2.4.2 including development headers i.e. "Python.h"</li>
-      </ol>
-
-
-    <h2>Get the Source Code</h2>
-
-      <p>Download a recent release tarball file from:</p>
+      <p>Download a recent zip file from here:</p>
 
       <pre><a
       href="http://allmydata.org/source/tahoe/releases">http://allmydata.org/source/tahoe/releases</a></pre>
 
+      <p>The larger <tt>-SUMO</tt> tarballs include all the
+      automatically-installable dependencies; use the smaller regular tarball
+      if you don't mind the build process downloading the things it needs, or
+      if you've downloaded and unpacked the <tt><a
+      href="http://allmydata.org/source/tahoe/deps/tahoe-deps.tar.gz">http://allmydata.org/source/tahoe/deps/tahoe-deps.tar.gz</a></tt>
+      bundle.</p>
 
 
     <h2>Build Tahoe</h2>
 
-    <p>Unpack the tarball and cd into the top-level directory.</p>
+    <p>Unpack the zip file and cd into the top-level directory.</p>
 
-    <p>Run <cite>make</cite> to build and to install the <cite>tahoe</cite> executable into a subdirectory of the current directory named <cite>bin</cite>.</p>
+    <p>Run <cite>python setup.py build_tahoe</cite> to build and to install the <cite>tahoe</cite> executable into a subdirectory of the current directory named <cite>bin</cite>.</p>
 
-    <p>Run <cite>make test</cite> to verify that it built correctly and passes all tests.</p>
+    <p>Run <cite>python trial</cite> to verify that it built correctly and passes all tests.</p>
 
     <p>Run <cite>bin/tahoe --version</cite> to verify that the executable tool runs and prints out the right version number (the "allmydata" version number is the version number of the Tahoe package).</p>