Update mingw build instructions due to new mingw and libevent.

svn:r11785

diff --git a/doc/TODO b/doc/TODO
index 12d1aaaca16bf130adcfab2fd78af29ddace7df7..20a4464d909d56f431ff992c969910498ca1b289 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-yes$Id$
+$Id$
 Legend:
 SPEC!!  - Not specified
 SPEC    - Spec not finalized
@@ -212,7 +212,6 @@ N   - Hack up a client that gives out weird/no certificates, so we can
 
   - Documentation
     - HOWTO for DNSPort.
-P   - Tell people about OSX Uninstaller
     - Quietly document NT Service options
     - More prominently, we should have a recommended apps list.
       - recommend pidgin (gaim is renamed)
@@ -552,6 +551,7 @@ P  - put the logo on the website, in source form, so people can put it on
     stickers directly, etc.
 P  - put the source image for the stickers on the website, so people can
     print their own
+P - figure out a license for the logos and docs we publish
 R - make a page with the hidden service diagrams.
 P  - ask Jan/Jens to be the translation coordinator? add to volunteer page.
   - add a page for localizing all tor's components.

diff --git a/doc/tor-win32-mingw-creation.txt b/doc/tor-win32-mingw-creation.txt
index c9ef4068225b98b52c986630ea8bd1ea7247df1e..23179c87e063b4ffe63914b57e62f3e07c765c82 100644 (file)
--- a/doc/tor-win32-mingw-creation.txt
+++ b/doc/tor-win32-mingw-creation.txt
@@ -5,7 +5,7 @@ Stage One:  Download and Install MinGW.
 ---------------------------------------
 
 Download mingw:
-http://prdownloads.sf.net/mingw/MinGW-5.0.3.exe?download
+http://prdownloads.sf.net/mingw/MinGW-5.1.3.exe?download
 
 Download msys:
 http://prdownloads.sf.net/mingw/MSYS-1.0.10.exe?download
@@ -42,7 +42,7 @@ Type "rm -rf ./test"
 Type "cd crypto/"
 Type "find ./ -name "*.h" -exec cp {} ../include/openssl/ \;"
 Type "cd ../ssl/"
-Type "find ./ -name "*.h" -exec cp {} ../include/openssl/ \;
+Type "find ./ -name "*.h" -exec cp {} ../include/openssl/ \;"
 Type "cd .."
 Type "cp *.h include/openssl/"
 # The next steps can take up to 30 minutes to complete.
@@ -83,10 +83,10 @@ Type "make -f win32/Makefile.gcc"
 Done.
 
 
-Stage Four: Download, extract, and patch libevent-1.3b
+Stage Four: Download, extract, and compile libevent-1.3e
 ------------------------------------------------------
 
-Download the libevent 1.3b release:
+Download the libevent 1.3e release:
 http://www.monkey.org/~provos/libevent/
 
 Copy the libevent tarball into the "tor-mingw" directory.
@@ -95,13 +95,6 @@ Type "cd tor-mingw"
 Extract libevent.
 
 Type "./configure --enable-static --disable-shared"
---------------------libevent 1.3b only-------------------------------------
-You need to manually edit the Makefile and remove all references to "sample".
-libevent 1.3b won't compile in mingw currently due to issues in event_test.c.
-Removing the "sample" directory and all references to it in Makefile create a
-completely valid libevent library.  Libevent 1.3e and later should (with
-luck) not have this problem.  Libevent 1.3c and 1.3d won't work at all.
------------------------------------------------------------------------------
 Type "make"
 Type "make install"