Skip to content

Commit

Permalink
Converge bootstrap, bootstrap-webapp make targets
Browse files Browse the repository at this point in the history
  • Loading branch information
bramwelt committed Jul 14, 2014
1 parent b8fe23d commit 5c168e2
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,11 @@ bootstrap:
# install dev + prod dependencies
$(VIRTUALENV)/bin/pip install tools/peep-1.2.tar.gz
$(VIRTUALENV)/bin/peep install --download-cache=./pip-cache -r requirements.txt
# bootstrap webapp
cd webapp-django; ./bin/bootstrap.sh


install: bootstrap bootstrap-webapp
install: bootstrap
# package up the tarball in $(PREFIX)
# create base directories
mkdir -p $(PREFIX)/application
Expand Down Expand Up @@ -88,9 +91,6 @@ json_enhancements_pg_extension: bootstrap
# every time Socorro is built
if [ ! -f `pg_config --pkglibdir`/json_enhancements.so ]; then sudo env PATH=$$PATH $(VIRTUALENV)/bin/python -c "from pgxnclient import cli; cli.main(['install', 'json_enhancements'])"; fi

bootstrap-webapp: bootstrap
cd webapp-django; ./bin/bootstrap.sh

stackwalker:
# Build JSON stackwalker
PREFIX=`pwd`/stackwalk/ SKIP_TAR=1 ./scripts/build-breakpad.sh
Expand Down

0 comments on commit 5c168e2

Please sign in to comment.