commit 67e4c8c3d0a4f74ad450d7bffb584cc88b8a5631 Author: David Fifield david@bamsoftware.com Date: Sat Jun 1 10:36:32 2013 -0700
Use a local clone of pyptlib.
Don't require it to be installed. --- doc/Makefile | 17 +++++++++++++++-- doc/bundle-gnulinux.txt | 9 +++------ doc/bundle-macosx.txt | 11 +++++------ doc/bundle-windows.txt | 9 ++++----- 4 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/doc/Makefile b/doc/Makefile index 5caae73..98499c3 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -9,8 +9,11 @@ FLASHPROXY_DIST_WIN32 = $(FLASHPROXY_HOME)/dist/flashproxy-client-$(FLASHPROXY_V OBFSPROXY_HOME = $(HOME)/obfsproxy OBFSPROXY_DIST = $(OBFSPROXY_HOME) OBFSPROXY_DIST_WIN32 = $(OBFSPROXY_HOME)/py2exe_bundle/dist +PYPTLIB_HOME = $(HOME)/pyptlib +PYPTLIB_WORK = $(WORKDIR)/pyptlib MACOSX_BUNDLE_ROOT = $(HOME)/bundle
+PYTHON = python P7Z = /cygdrive/c/Program Files (x86)/7-Zip/7z P7ZG = /cygdrive/c/Program Files (x86)/7-Zip/7zg
@@ -81,6 +84,9 @@ $(PT_BUNDLE_WINDOWS): mkdir -p "$(WORKDIR)" "$(P7Z)" x -o"$(WORKDIR)" "$(BUNDLE_WINDOWS)"
+ git clone "$(PYPTLIB_HOME)" "$(PYPTLIB_WORK)" + cd "$(PYPTLIB_WORK)" && "$(PYTHON)" setup.py clean --all build --build-lib build + cp -nr "$(FLASHPROXY_DIST_WIN32)"/{*.pyd,*.dll,*.exe,*.zip} "$(TBBDIR)"/App mkdir -p "$(TBBDIR)"/Docs/FlashProxy cp "$(FLASHPROXY_DIST_WIN32)"/{doc/*,README,LICENSE,ChangeLog} "$(TBBDIR)"/Docs/FlashProxy @@ -105,14 +111,18 @@ $(PT_BUNDLE_MACOSX_I686): mkdir -p "$(WORKDIR)" unzip "$(BUNDLE_MACOSX_I686)" -d "$(WORKDIR)"
+ git clone "$(PYPTLIB_HOME)" "$(PYPTLIB_WORK)" + cd "$(PYPTLIB_WORK)" && "$(PYTHON)" setup.py clean --all build --build-lib build + cp "$(FLASHPROXY_DIST)"/{flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} "$(TBBDIR)"/Contents/MacOS cp -r "$(MACOSX_BUNDLE_ROOT)"/usr/lib/python2.7/site-packages/M2Crypto "$(TBBDIR)"/Contents/MacOS mkdir -p "$(TBBDIR)"/Contents/Resources/Docs/FlashProxy cp "$(FLASHPROXY_DIST)"/{doc/*,README,LICENSE,ChangeLog} "$(TBBDIR)"/Contents/Resources/Docs/FlashProxy cp -r "$(OBFSPROXY_DIST)"/obfsproxy "$(TBBDIR)"/Contents/MacOs cp -r "$(OBFSPROXY_DIST)"/bin/obfsproxy "$(TBBDIR)"/Contents/MacOs/obfsproxy.bin - cp -r "$(MACOSX_BUNDLE_ROOT)"/usr/lib/python2.7/site-packages/{Crypto,pyptlib} "$(TBBDIR)"/Contents/MacOS + cp -r "$(MACOSX_BUNDLE_ROOT)"/usr/lib/python2.7/site-packages/Crypto "$(TBBDIR)"/Contents/MacOS cp "$(MACOSX_BUNDLE_ROOT)"/argparse-1.2.1/argparse.py "$(TBBDIR)"/Contents/MacOS + cp -r "$(PYPTLIB_WORK)"/build/pyptlib "$(TBBDIR)"/Contents/MacOS mkdir -p "$(TBBDIR)"/Contents/Resources/Docs/Obfsproxy cp "$(OBFSPROXY_DIST)"/{LICENSE,README} "$(TBBDIR)"/Contents/Resources/Docs/Obfsproxy find "$(TBBDIR)"/Contents/MacOS -name '*.pyc' | xargs rm -f @@ -134,6 +144,9 @@ $(PT_BUNDLE_GNULINUX_I686) $(PT_BUNDLE_GNULINUX_X86_64): mkdir -p "$(WORKDIR)" tar zxf "$(BUNDLE_GNULINUX)" -C "$(WORKDIR)"
+ git clone "$(PYPTLIB_HOME)" "$(PYPTLIB_WORK)" + cd "$(PYPTLIB_WORK)" && "$(PYTHON)" setup.py clean --all build --build-lib build + cp "$(FLASHPROXY_DIST)"/{flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} "$(TBBDIR)"/App cp -rL /usr/lib/pymodules/python2.6/M2Crypto "$(TBBDIR)"/App mkdir -p "$(TBBDIR)"/Docs/FlashProxy @@ -142,7 +155,7 @@ $(PT_BUNDLE_GNULINUX_I686) $(PT_BUNDLE_GNULINUX_X86_64): cp -rL "$(OBFSPROXY_DIST)"/bin/obfsproxy "$(TBBDIR)"/App/obfsproxy.bin cp -rL /usr/lib/python2.6/dist-packages/{Crypto,twisted,zope} "$(TBBDIR)"/App cp -rL /usr/lib/pymodules/python2.6/argparse.py "$(TBBDIR)"/App - cp -rL /usr/local/lib/python2.6/dist-packages/pyptlib "$(TBBDIR)"/App + cp -rL "$(PYPTLIB_WORK)"/build/pyptlib "$(TBBDIR)"/App mkdir -p "$(TBBDIR)"/Docs/Obfsproxy cp "$(OBFSPROXY_DIST)"/{LICENSE,README} "$(TBBDIR)"/Docs/Obfsproxy find "$(TBBDIR)"/App -name '*.pyc' | xargs rm -f diff --git a/doc/bundle-gnulinux.txt b/doc/bundle-gnulinux.txt index 818e7aa..0f39b75 100644 --- a/doc/bundle-gnulinux.txt +++ b/doc/bundle-gnulinux.txt @@ -65,15 +65,12 @@ Packages to install: $ sudo apt-get install --no-install-recommends git make python-m2crypto zip $ sudo apt-get install --no-install-recommends python-setuptools python-crypto python-twisted python-argparse
-== Dependencies +== Browser bundle
-=== pyptlib +Clone the pyptlib source.
+ $ cd $ git clone https://git.torproject.org/pluggable-transports/pyptlib.git - $ cd pyptlib - $ sudo python setup.py install --single-version-externally-managed --root=/ - -== Browser bundle
Clone and build the flashproxy source.
diff --git a/doc/bundle-macosx.txt b/doc/bundle-macosx.txt index 0051542..35ff68c 100644 --- a/doc/bundle-macosx.txt +++ b/doc/bundle-macosx.txt @@ -44,12 +44,6 @@ Extract and verify the tarball. Then run
$ python setup.py install --root=~/bundle --prefix=/usr
-=== pyptlib - - $ git clone https://git.torproject.org/pluggable-transports/pyptlib.git - $ cd pyptlib - $ python setup.py install --root=~/bundle --prefix=/usr - === argparse
This is included for compatibility with older versions of python. @@ -65,6 +59,11 @@ Extract the tarball into your bundle directory.
== Browser bundle
+Clone the pyptlib source. + + $ cd + $ git clone https://git.torproject.org/pluggable-transports/pyptlib.git + Clone and build the flashproxy source.
$ git clone https://git.torproject.org/flashproxy.git diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt index 4859769..42870f0 100644 --- a/doc/bundle-windows.txt +++ b/doc/bundle-windows.txt @@ -160,13 +160,12 @@ http://twistedmatrix.com/Releases/twisted-12.3.0-md5sums.txt $ grep win32-py2\.7\.msi twisted-12.3.0-md5sums.txt $ md5sum Twisted-12.3.0.win32-py2.7.msi
-=== pyptlib +== Browser bundle
- $ git clone https://git.torproject.org/pluggable-transports/pyptlib.git - $ cd pyptlib - $ /cygdrive/c/Python27/python.exe setup.py install --single-version-externally-managed --root=/ +Clone the pyptlib source.
-== Browser bundle + $ cd + $ git clone https://git.torproject.org/pluggable-transports/pyptlib.git
Clone and build the flashproxy source.