Skip to content

Commit 9429e98

Browse files
committed
build: improve makefile usage + parallelism
1 parent ac8fe04 commit 9429e98

File tree

1 file changed

+29
-16
lines changed

1 file changed

+29
-16
lines changed

Makefile

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1+
CPUS ?= $(shell sysctl -n hw.ncpu || echo 1)
2+
MAKEFLAGS += --jobs=$(CPUS)
13
NPM_ROOT = ./node_modules
24
STATIC_DIR = src/sentry/static/sentry
35

4-
install-python:
5-
@echo "--> Installing Python dependencies"
6-
pip install "setuptools>=0.9.8"
7-
# order matters here, base package must install first
8-
pip install -e .
9-
pip install ujson
10-
pip install "file://`pwd`#egg=sentry[dev]"
6+
develop: setup-git update-submodules install-python install-yarn
7+
@echo ""
8+
9+
develop-only: develop
1110

1211
install-yarn:
1312
@echo "--> Installing Node dependencies"
@@ -18,13 +17,21 @@ install-yarn:
1817
# See: https://github.com/karma-runner/karma-phantomjs-launcher/issues/120#issuecomment-262634703
1918
node ./node_modules/phantomjs-prebuilt/install.js
2019

21-
install-python-tests:
22-
pip install "file://`pwd`#egg=sentry[dev,tests,dsym]"
20+
install-python:
21+
# must be executed serialially
22+
$(MAKE) install-python-base
23+
$(MAKE) install-python-tests
2324

24-
develop-only: update-submodules install-python install-python-tests install-yarn
25+
install-python-base:
26+
@echo "--> Installing Python dependencies"
27+
pip install "setuptools>=0.9.8"
28+
# order matters here, base package must install first
29+
pip install -e .
30+
pip install ujson
31+
pip install "file://`pwd`#egg=sentry[dev]"
2532

26-
develop: develop-only setup-git
27-
@echo ""
33+
install-python-tests:
34+
pip install "file://`pwd`#egg=sentry[dev,tests,dsym]"
2835

2936
dev-postgres: install-python
3037

@@ -136,7 +143,7 @@ lint-js:
136143
@echo ""
137144

138145
coverage: develop
139-
make test-python-coverage
146+
$(MAKE) test-python-coverage
140147
coverage html
141148

142149
publish:
@@ -160,7 +167,9 @@ travis-upgrade-pip:
160167
travis-setup-cassandra:
161168
echo "create keyspace sentry with replication = {'class' : 'SimpleStrategy', 'replication_factor': 1};" | cqlsh --cqlversion=3.1.7
162169
echo 'create table nodestore (key text primary key, value blob, flags int);' | cqlsh -k sentry --cqlversion=3.1.7
163-
travis-install-python: travis-upgrade-pip install-python install-python-tests
170+
travis-install-python:
171+
$(MAKE) travis-upgrade-pip
172+
$(MAKE) install-python install-python
164173
python -m pip install codecov
165174
travis-noop:
166175
@echo "nothing to do here."
@@ -176,9 +185,13 @@ travis-install-mysql: travis-install-python
176185
pip install mysqlclient
177186
echo 'create database sentry;' | mysql -uroot
178187
travis-install-acceptance: install-yarn travis-install-postgres
179-
travis-install-js: travis-upgrade-pip install-python install-python-tests install-yarn
188+
travis-install-js:
189+
$(MAKE) travis-upgrade-pip
190+
$(MAKE) install-python install-yarn
180191
travis-install-cli: travis-install-postgres
181-
travis-install-dist: travis-upgrade-pip install-python install-python-tests install-yarn
192+
travis-install-dist:
193+
$(MAKE) travis-upgrade-pip
194+
$(MAKE) install-python install-yarn
182195
travis-install-django-18: travis-install-postgres
183196
pip install "Django>=1.8,<1.9"
184197

0 commit comments

Comments
 (0)