Fixes bug 1120984 create 'make dev' instead of bootstrap

davehunt · Jan 13, 2015 · 41acdb0 · 41acdb0
1 parent 5aded34
commit 41acdb0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -9,6 +9,9 @@ all: test
 test: bootstrap
 	./scripts/test.sh
 
+dev:
+	SOCORRO_DEVELOPMENT_ENV=1 ./scripts/bootstrap.sh
+
 bootstrap:
 	./scripts/bootstrap.sh
 

diff --git a/docs/development/build-from-source.rst b/docs/development/build-from-source.rst
@@ -20,7 +20,7 @@ Socorro can install python dependencies into a virtualenv for you.
 You only need to run this once:
 ::
   export PATH=$PATH:/usr/pgsql-9.3/bin/
-  make bootstrap
+  make dev
 
 Before running any Socorro components, always make sure that the virtualenv 
 is activated:

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
@@ -17,8 +17,10 @@ source "$VIRTUAL_ENV/bin/activate"
 ${VIRTUAL_ENV}/bin/pip install tools/peep-2.0.tar.gz
 ${VIRTUAL_ENV}/bin/peep install --download-cache=./pip-cache -r requirements.txt
 
-# install socorro in local virtualenv
-${VIRTUAL_ENV}/bin/python setup.py install
+if [ ! -n "${SOCORRO_DEVELOPMENT_ENV+1}" ]; then
+    # install socorro in local virtualenv
+    ${VIRTUAL_ENV}/bin/python setup.py install
+fi
 
 if [ "`uname -sm`" == "Linux x86_64" ]; then
   # pull pre-built, known version of breakpad