[tor-commits] [flashproxy/master] Break out the Window bundle instructions to a separate file.

[dcf at torproject.org]

commit a47a7bb22b62cda5b662dfd09da0eaedfec6d7a6
Author: David Fifield <david at bamsoftware.com>
Date:   Wed Dec 12 12:26:02 2012 -0800

    Break out the Window bundle instructions to a separate file.
---
 doc/bundle-windows.txt           |   63 ++++++++++++++++++++++++++++++++++++++
 doc/windows-deployment-howto.txt |   62 -------------------------------------
 2 files changed, 63 insertions(+), 62 deletions(-)

diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt
new file mode 100644
index 0000000..f64eef7
--- /dev/null
+++ b/doc/bundle-windows.txt
@@ -0,0 +1,63 @@
+== Dependencies
+
+=== 7-Zip
+
+This is used to build a self-extracting bundle executable. The p7zip
+package from Cywin doesn't work because the self-extracting executables
+it produces requrie cygwin1.dll.
+
+http://7-zip.org/download.html
+http://downloads.sourceforge.net/project/sevenzip/7-Zip/9.20/7z920.msi
+
+The sha256sum of the package I used was
+
+fe4807b4698ec89f82de7d85d32deaa4c772fc871537e31fb0fccf4473455cb8 7z920.msi
+
+== Browser bundle
+
+Download the obfsproxy bundle from
+https://www.torproject.org/projects/obfsproxy.
+
+https://www.torproject.org/dist/torbrowser/tor-obfsproxy-browser-2.4.6-alpha-2_en-US.exe
+https://www.torproject.org/dist/torbrowser/tor-obfsproxy-browser-2.4.6-alpha-2_en-US.exe.asc
+
+Extract the bundle.
+
+	$ gpg --verify tor-obfsproxy-browser-2.4.6-alpha-2_en-US.exe.asc
+	$ "/cygdrive/c/Program Files (x86)/7-Zip/7z" x tor-obfsproxy-browser-2.4.6-alpha-2_en-US.exe
+	$ cd "Tor Browser"
+
+Copy files into the bundle. We could remove obfsproxy here but don't.
+The -n option to cp prevents the existing LIBEAY32.dll and SSLEAY32.dll
+from being overwritten.
+
+	$ cp -n ~/flashproxy/dist/flashproxy-client-0.9-win32/{*.pyd,*.dll,*.exe,*.manifest} App
+	$ mkdir -p Docs/FlashProxy
+	$ cp ~/flashproxy/dist/flashproxy-client-0.9-win32/{doc/*,README,LICENSE} Docs/FlashProxy
+
+Make the second half of Data/Tor/torrc look like this (i.e., keep
+the generic configuration, but change the obfsproxy-specific stuff).
+Basically you are concatenating the normal flashproxy-client torrc, but
+changing "./flashproxy-client" to "flashproxy-client".
+
+UseBridges 1
+# The address and port are ignored by the client transport plugin.
+Bridge websocket 0.0.1.0:1
+LearnCircuitBuildTimeout 0
+CircuitBuildTimeout 60
+# Change the second number here (9000) to the number of a port that can
+# receive connections from the Internet (the port for which you
+# configured port forwarding).
+ClientTransportPlugin websocket exec flashproxy-client --register :0 :9000
+
+Re-zip the bundle. The "alpha" number should be independent of the
+obfsproxy bundle's alpha.
+
+	$ cd ..
+	$ "/cygdrive/c/Program Files (x86)/7-Zip/7z" a -sfx tor-flashproxy-browser-2.4.6-alpha-1_en-US.exe "Tor Browser"
+
+Test running the bundle. Extract into a separate directory, double-click
+the icon and "Start Tor Browser.exe".
+
+	$ mkdir tmp
+	$ cp tor-flashproxy-browser-2.4.6-alpha-1_en-US.exe tmp
diff --git a/doc/windows-deployment-howto.txt b/doc/windows-deployment-howto.txt
index f3f8852..2514a1a 100644
--- a/doc/windows-deployment-howto.txt
+++ b/doc/windows-deployment-howto.txt
@@ -132,65 +132,3 @@ Build the package.
 	$ python setup.py bdist_wininst
 This will leave an MSI installer in the dist directory. Double-click it
 to install M2Crypto amid the other Python files.
-
-=== 7-Zip
-
-This is used to build a self-extracting bundle executable. The p7zip
-package from Cywin doesn't work because the self-extracting executables
-it produces requrie cygwin1.dll.
-
-http://7-zip.org/download.html
-http://downloads.sourceforge.net/project/sevenzip/7-Zip/9.20/7z920.msi
-
-The sha256sum of the package I used was
-
-fe4807b4698ec89f82de7d85d32deaa4c772fc871537e31fb0fccf4473455cb8 7z920.msi
-
-== Browser bundle
-
-Download the obfsproxy bundle from
-https://www.torproject.org/projects/obfsproxy.
-
-https://www.torproject.org/dist/torbrowser/tor-obfsproxy-browser-2.4.6-alpha-2_en-US.exe
-https://www.torproject.org/dist/torbrowser/tor-obfsproxy-browser-2.4.6-alpha-2_en-US.exe.asc
-
-Extract the bundle.
-
-	$ gpg --verify tor-obfsproxy-browser-2.4.6-alpha-2_en-US.exe.asc
-	$ "/cygdrive/c/Program Files (x86)/7-Zip/7z" x tor-obfsproxy-browser-2.4.6-alpha-2_en-US.exe
-	$ cd "Tor Browser"
-
-Copy files into the bundle. We could remove obfsproxy here but don't.
-The -n option to cp prevents the existing LIBEAY32.dll and SSLEAY32.dll
-from being overwritten.
-
-	$ cp -n ~/flashproxy/dist/flashproxy-client-0.9-win32/{*.pyd,*.dll,*.exe,*.manifest} App
-	$ mkdir -p Docs/FlashProxy
-	$ cp ~/flashproxy/dist/flashproxy-client-0.9-win32/{doc/*,README,LICENSE} Docs/FlashProxy
-
-Make the second half of Data/Tor/torrc look like this (i.e., keep
-the generic configuration, but change the obfsproxy-specific stuff).
-Basically you are concatenating the normal flashproxy-client torrc, but
-changing "./flashproxy-client" to "flashproxy-client".
-
-UseBridges 1
-# The address and port are ignored by the client transport plugin.
-Bridge websocket 0.0.1.0:1
-LearnCircuitBuildTimeout 0
-CircuitBuildTimeout 60
-# Change the second number here (9000) to the number of a port that can
-# receive connections from the Internet (the port for which you
-# configured port forwarding).
-ClientTransportPlugin websocket exec flashproxy-client --register :0 :9000
-
-Re-zip the bundle. The "alpha" number should be independent of the
-obfsproxy bundle's alpha.
-
-	$ cd ..
-	$ "/cygdrive/c/Program Files (x86)/7-Zip/7z" a -sfx tor-flashproxy-browser-2.4.6-alpha-1_en-US.exe "Tor Browser"
-
-Test running the bundle. Extract into a separate directory, double-click
-the icon and "Start Tor Browser.exe".
-
-	$ mkdir tmp
-	$ cp tor-flashproxy-browser-2.4.6-alpha-1_en-US.exe tmp