[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [flashproxy/master] Automatically make a local clone and dist of flashproxy and obfsproxy.

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [flashproxy/master] Automatically make a local clone and dist of flashproxy and obfsproxy.
From: dcf@xxxxxxxxxxxxxx
Date: Sat, 1 Jun 2013 22:25:47 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Sat, 01 Jun 2013 18:26:02 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: David Fifield <david@xxxxxxxxxxxxxxx>
Sender: tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx

commit 1a34cf5ab6ea69d5edba351e1c64817721c903f4
Author: David Fifield <david@xxxxxxxxxxxxxxx>
Date:   Sat Jun 1 11:30:46 2013 -0700

    Automatically make a local clone and dist of flashproxy and obfsproxy.
---
 doc/Makefile            |   41 +++++++++++++++++++++++++----------------
 doc/bundle-gnulinux.txt |   13 +++----------
 doc/bundle-macosx.txt   |   13 +++----------
 doc/bundle-windows.txt  |   17 ++++-------------
 4 files changed, 35 insertions(+), 49 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index 98499c3..4151bbb 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -2,13 +2,14 @@ BUNDLE_VERSION = 2.4.12
 BUNDLE_RELEASE = alpha-2
 PT_BUNDLE_RELEASE = pt1
 
-FLASHPROXY_HOME = $(HOME)/flashproxy
 FLASHPROXY_VERSION = 1.0
-FLASHPROXY_DIST = $(FLASHPROXY_HOME)/dist/flashproxy-client-$(FLASHPROXY_VERSION)
+FLASHPROXY_HOME = $(HOME)/flashproxy
+FLASHPROXY_WORK = $(WORKDIR)/flashproxy
+FLASHPROXY_DIST = $(FLASHPROXY_WORK)/dist/flashproxy-client-$(FLASHPROXY_VERSION)
 FLASHPROXY_DIST_WIN32 = $(FLASHPROXY_HOME)/dist/flashproxy-client-$(FLASHPROXY_VERSION)-win32
 OBFSPROXY_HOME = $(HOME)/obfsproxy
-OBFSPROXY_DIST = $(OBFSPROXY_HOME)
-OBFSPROXY_DIST_WIN32 = $(OBFSPROXY_HOME)/py2exe_bundle/dist
+OBFSPROXY_WORK = $(WORKDIR)/obfsproxy
+OBFSPROXY_DIST_WIN32 = $(OBFSPROXY_WORK)/py2exe_bundle/dist
 PYPTLIB_HOME = $(HOME)/pyptlib
 PYPTLIB_WORK = $(WORKDIR)/pyptlib
 MACOSX_BUNDLE_ROOT = $(HOME)/bundle
@@ -47,11 +48,6 @@ all:
 	@echo $$'\tmake gnulinux-x86_64'
 	@echo
 	@echo "Configure version numbers at the top of this makefile."
-	@echo "Before starting, you need to run:"
-	@echo $$'\t"make dist" in the flashproxy directory'
-	@echo "Or on Windows:"
-	@echo $$'\t"make dist-exe" in the flashproxy directory'
-	@echo $$'\t"/cygdrive/c/Python27/python setup_py2exe.py py2exe" in the obfsproxy directory'
 
 fetch-windows: checksig-$(BUNDLE_WINDOWS)
 fetch-macosx-i686: checksig-$(BUNDLE_MACOSX_I686)
@@ -74,6 +70,7 @@ $(PT_BUNDLE_GNULINUX_X86_64): WORKDIR = work/gnulinux-x86_64-$(PT_BUNDLE_VERSION
 $(PT_BUNDLE_GNULINUX_X86_64): BUNDLE_GNULINUX = $(BUNDLE_GNULINUX_X86_64)
 
 $(PT_BUNDLE_WINDOWS): TBBDIR = $(WORKDIR)/Tor Browser
+$(PT_BUNDLE_WINDOWS): export PYTHONPATH := $(shell cygpath --absolute --windows "$(PYPTLIB_WORK)"/build)
 $(PT_BUNDLE_WINDOWS):
 	@if [ ! -f "$(BUNDLE_WINDOWS)" ]; then \
 		echo "$(BUNDLE_WINDOWS) is missing."; \
@@ -86,13 +83,17 @@ $(PT_BUNDLE_WINDOWS):
 
 	git clone "$(PYPTLIB_HOME)" "$(PYPTLIB_WORK)"
 	cd "$(PYPTLIB_WORK)" && "$(PYTHON)" setup.py clean --all build --build-lib build
+	git clone "$(OBFSPROXY_HOME)" "$(OBFSPROXY_WORK)"
+	cd "$(OBFSPROXY_WORK)" && "$(PYTHON)" setup_py2exe.py clean --all py2exe
+	git clone "$(FLASHPROXY_HOME)" "$(FLASHPROXY_WORK)"
+	cd "$(FLASHPROXY_WORK)" && "$(MAKE)" clean dist-exe
 
 	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
 	cp -nr "$(OBFSPROXY_DIST_WIN32)"/{*.pyd,*.dll,*.exe,*.zip} "$(TBBDIR)"/App
 	mkdir -p "$(TBBDIR)"/Docs/Obfsproxy
-	cp "$(OBFSPROXY_DIST)"/{LICENSE,README} "$(TBBDIR)"/Docs/Obfsproxy
+	cp "$(OBFSPROXY_WORK)"/{LICENSE,README} "$(TBBDIR)"/Docs/Obfsproxy
 
 	cat bundle-torrc-windows >> "$(TBBDIR)"/Data/Tor/torrc
 
@@ -113,18 +114,22 @@ $(PT_BUNDLE_MACOSX_I686):
 
 	git clone "$(PYPTLIB_HOME)" "$(PYPTLIB_WORK)"
 	cd "$(PYPTLIB_WORK)" && "$(PYTHON)" setup.py clean --all build --build-lib build
+	git clone "$(OBFSPROXY_HOME)" "$(OBFSPROXY_WORK)"
+	cd "$(OBFSPROXY_WORK)" && "$(PYTHON)" setup.py clean --all build --build-lib build
+	git clone "$(FLASHPROXY_HOME)" "$(FLASHPROXY_WORK)"
+	cd "$(FLASHPROXY_WORK)" && "$(MAKE)" clean dist
 
 	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 "$(OBFSPROXY_WORK)"/build/obfsproxy "$(TBBDIR)"/Contents/MacOs
+	cp -r "$(OBFSPROXY_WORK)"/bin/obfsproxy "$(TBBDIR)"/Contents/MacOs/obfsproxy.bin
 	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
+	cp "$(OBFSPROXY_WORK)"/{LICENSE,README} "$(TBBDIR)"/Contents/Resources/Docs/Obfsproxy
 	find "$(TBBDIR)"/Contents/MacOS -name '*.pyc' | xargs rm -f
 
 	cat bundle-torrc-macosx >> "$(TBBDIR)"/Library/Vidalia/torrc
@@ -146,18 +151,22 @@ $(PT_BUNDLE_GNULINUX_I686) $(PT_BUNDLE_GNULINUX_X86_64):
 
 	git clone "$(PYPTLIB_HOME)" "$(PYPTLIB_WORK)"
 	cd "$(PYPTLIB_WORK)" && "$(PYTHON)" setup.py clean --all build --build-lib build
+	git clone "$(OBFSPROXY_HOME)" "$(OBFSPROXY_WORK)"
+	cd "$(OBFSPROXY_WORK)" && "$(PYTHON)" setup.py clean --all build --build-lib build
+	git clone "$(FLASHPROXY_HOME)" "$(FLASHPROXY_WORK)"
+	cd "$(FLASHPROXY_WORK)" && "$(MAKE)" clean dist
 
 	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
 	cp "$(FLASHPROXY_DIST)"/{doc/*,README,LICENSE,ChangeLog} "$(TBBDIR)"/Docs/FlashProxy
-	cp -rL "$(OBFSPROXY_DIST)"/obfsproxy "$(TBBDIR)"/App
-	cp -rL "$(OBFSPROXY_DIST)"/bin/obfsproxy "$(TBBDIR)"/App/obfsproxy.bin
+	cp -rL "$(OBFSPROXY_WORK)"/build/obfsproxy "$(TBBDIR)"/App
+	cp -rL "$(OBFSPROXY_WORK)"/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 "$(PYPTLIB_WORK)"/build/pyptlib "$(TBBDIR)"/App
 	mkdir -p "$(TBBDIR)"/Docs/Obfsproxy
-	cp "$(OBFSPROXY_DIST)"/{LICENSE,README} "$(TBBDIR)"/Docs/Obfsproxy
+	cp "$(OBFSPROXY_WORK)"/{LICENSE,README} "$(TBBDIR)"/Docs/Obfsproxy
 	find "$(TBBDIR)"/App -name '*.pyc' | xargs rm -f
 
 	cat bundle-torrc-gnulinux >> "$(TBBDIR)"/Data/Tor/torrc
diff --git a/doc/bundle-gnulinux.txt b/doc/bundle-gnulinux.txt
index 0f39b75..687a21b 100644
--- a/doc/bundle-gnulinux.txt
+++ b/doc/bundle-gnulinux.txt
@@ -67,20 +67,13 @@ Packages to install:
 
 == Browser bundle
 
-Clone the pyptlib source.
+Clone pyptlib, obfsproxy, and flashproxy. Set each one to the branch you
+want to include in the builds; e.g., "git pull" or "git checkout 1.0".
 
 	$ 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
-	$ cd flashproxy
-	$ make dist
-
-Clone obfsproxy.
-
 	$ git clone https://git.torproject.org/pluggable-transports/obfsproxy.git
+	$ git clone https://git.torproject.org/flashproxy.git
 
 Update your Debian.
 
diff --git a/doc/bundle-macosx.txt b/doc/bundle-macosx.txt
index 35ff68c..17e8fa2 100644
--- a/doc/bundle-macosx.txt
+++ b/doc/bundle-macosx.txt
@@ -59,20 +59,13 @@ Extract the tarball into your bundle directory.
 
 == Browser bundle
 
-Clone the pyptlib source.
+Clone pyptlib, obfsproxy, and flashproxy. Set each one to the branch you
+want to include in the builds; e.g., "git pull" or "git checkout 1.0".
 
 	$ 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
-	$ cd flashproxy
-	$ make dist
-
-Clone obfsproxy.
-
 	$ git clone https://git.torproject.org/pluggable-transports/obfsproxy.git
+	$ git clone https://git.torproject.org/flashproxy.git
 
 Enter the doc directory and edit the top of Makefile to set the version
 numbers you want to use.
diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt
index 42870f0..c5327f4 100644
--- a/doc/bundle-windows.txt
+++ b/doc/bundle-windows.txt
@@ -162,22 +162,13 @@ http://twistedmatrix.com/Releases/twisted-12.3.0-md5sums.txt
 
 == Browser bundle
 
-Clone the pyptlib source.
+Clone pyptlib, obfsproxy, and flashproxy. Set each one to the branch you
+want to include in the builds; e.g., "git pull" or "git checkout 1.0".
 
 	$ 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
-	$ cd flashproxy
-	$ make dist-exe PYTHON=/cygdrive/c/Python27/python
-
-Clone obfsproxy and run py2exe on it.
-
 	$ git clone https://git.torproject.org/pluggable-transports/obfsproxy.git
-	$ cd obfsproxy
-	$ /cygdrive/c/Python27/python.exe setup_py2exe.py py2exe
+	$ git clone https://git.torproject.org/flashproxy.git
 
 Enter the doc directory and edit the top of Makefile to set the version
 numbers you want to use.
@@ -190,7 +181,7 @@ PT_BUNDLE_RELEASE release should increment each time you build a new
 bundle with the same BUNDLE_VERSION and BUNDLE_RELEASE, and be reset to
 "pt1" when either of those change.
 
-	$ make windows
+	$ make windows PYTHON=/cygdrive/c/Python27/python
 
 Test running the bundle. Extract into a separate directory, double-click
 the icon and "Start Tor Browser.exe".



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Prev by Author: [tor-commits] [flashproxy/master] Remove unused DOWNLOADDIR.
Next by Author: [tor-commits] [flashproxy/master] Use -R not -r in cp commands.
Previous by thread: [tor-commits] [flashproxy/master] Remove unused DOWNLOADDIR.
Next by thread: [tor-commits] [flashproxy/master] Use -R not -r in cp commands.
Index(es):
- Author
- Thread