Merge pull request #517 from mitmproxy/virtualenv-win

simplify virtualenv

3 files changed, 19 insertions, 13 deletions

diff --git a/README.mkd b/README.mkd
index ce276764..ca412e6f 100644
--- a/README.mkd
+++ b/README.mkd
@@ -64,8 +64,8 @@ checkouts will be reflected live in the virtualenv.
 To confirm that you're up and running, activate the virtualenv, and run the
 mitmproxy test suite:
 
-```
-$ source ../venv.mitmproxy/bin/activate
+```shell
+$ source ../venv.mitmproxy/bin/activate # ..\venv.mitmproxy\Scripts\activate.bat on Windows
 $ nosetests ./test
 ```
 Note that the main executables for the project - **mitmdump**, **mitmproxy** and
diff --git a/dev b/dev
index c8346af1..9f66cbaf 100755
--- a/dev
+++ b/dev
@@ -1,16 +1,11 @@
 #!/bin/sh
 VENV=../venv.mitmproxy
-PIP="$VENV/bin/pip --cache-dir ~/.pipcache"
-
-echo "This script sets up the following:"
-echo "\t~/.pipcache - A pip cache directory"
-echo "\t$VENV - A development virtualenv"
-
-mkdir -p ~/.pipcache
 
 virtualenv $VENV
 source $VENV/bin/activate
-$PIP install -r ./requirements.txt
-# Re-install these to make them editable
-$PIP install --editable ../netlib
-$PIP install --editable ../pathod
+pip install --src .. -r requirements.txt
+
+echo ""
+echo "* Created virtualenv environment in $VENV."
+echo "* Installed all dependencies into the virtualenv."
+echo "* Activated virtualenv environment."
\ No newline at end of file
diff --git a/dev.bat b/dev.bat
new file mode 100644
index 00000000..303c804e
--- /dev/null
+++ b/dev.bat
@@ -0,0 +1,11 @@
+@echo off
+set VENV=..\venv.mitmproxy
+
+virtualenv %VENV%
+call %VENV%\Scripts\activate.bat
+pip install --src .. -r requirements.txt
+
+echo.
+echo * Created virtualenv environment in %VENV%.
+echo * Installed all dependencies into the virtualenv.
+echo * Activated virtualenv environment.
\ No newline at end of file