fix makefile

Author: vaind

CONTRIBUTING.md

@@ -1,11 +1,11 @@
 Contributing
 ------------------
-Anyone can contribute, be it by coding, improving docs or just proposing a new feature. 
+Anyone can contribute, be it by coding, improving docs or just proposing a new feature.
 As a new contributor, you may want to have a look at some of the following issues:
-* [**good first issue**](https://github.com/objectbox/objectbox-python/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) tag 
+* [**good first issue**](https://github.com/objectbox/objectbox-python/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) tag
 * [**help wanted**](https://github.com/objectbox/objectbox-python/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) tag
 
-When picking up an existing issue, please let others know in the issue comment. 
+When picking up an existing issue, please let others know in the issue comment.
 Don't hesitate to reach out for guidance or to discuss a solution proposal!
 
 ### Code contributions
@@ -16,20 +16,20 @@ When creating a Pull Request for code changes, please check that you cover the f
 ### Basic technical approach
 ObjectBox offers a [C API](https://github.com/objectbox/objectbox-c) which can be integrated into python using
 [ctypes](https://docs.python.org/dev/library/ctypes.html).
-The C API is is also used by the ObjectBox language bindings for [Go](https://github.com/objectbox/objectbox-go), 
+The C API is is also used by the ObjectBox language bindings for [Go](https://github.com/objectbox/objectbox-go),
 [Swift](https://github.com/objectbox/objectbox-swift), and [Dart/Flutter](https://github.com/objectbox/objectbox-dart).
 These language bindings currently serve as an example for this Python implementation.
 Internally, ObjectBox uses [FlatBuffers](https://google.github.io/flatbuffers/) to store objects.
 
-The main prerequisite to using the Python APIs is the ObjectBox binary library (.so, .dylib, .dll depending on your 
-platform) which actually implements the database functionality. The library should be placed in the 
-`objectbox/lib/[architecture]/` folder of the checked out repository. You can get/update it by running `make get-lib`.
+The main prerequisite to using the Python APIs is the ObjectBox binary library (.so, .dylib, .dll depending on your
+platform) which actually implements the database functionality. The library should be placed in the
+`objectbox/lib/[architecture]/` folder of the checked out repository. You can get/update it by running `make depend`.
 
 ### Getting started as a contributor
 #### Initial setup
 If you're just getting started, run the following simple steps to set up the repository on your machine
 * clone this repository
-* `pip install virtualenv` install [virtualenv](https://pypi.org/project/virtualenv/) if you don't have it yet
+* `python3 -m pip install --user virtualenv` install [virtualenv](https://pypi.org/project/virtualenv/) if you don't have it yet
 * `make depend` to initialize `virtualenv` and get dependencies (objectbox-c shared library)
 * `make` to build and test
 

Makefile

@@ -1,5 +1,8 @@
+SHELL := /bin/bash
 VENV = .venv
 VENVBIN = ${VENV}/bin
+PYTHON = python3
+PIP = ${PYTHON} -m pip
 
 # Detect windows - works on both 32 & 64-bit windows
 ifeq ($(OS),Windows_NT)
@@ -9,7 +12,7 @@ endif
 export PATH := $(abspath ${VENVBIN}):${PATH}
 
 
-.PHONY: init test build benchmark publish
+.PHONY: init test build benchmark publish ${VENV}-init
 
 # Default target executed when no arguments are given to make.
 default_target: build test
@@ -22,33 +25,36 @@ help:				## Show this help
 all: depend build test	## Get dependencies, clean, build and test
 
 build: ${VENV} clean	## Clean and build
-	python setup.py bdist_wheel
+	${PYTHON} setup.py bdist_wheel
 	ls -lh dist
 
 ${VENV}: ${VENVBIN}/activate
 
-${VENVBIN}/activate: requirements.txt
-	virtualenv ${VENV}
+${VENV}-init:
+	if [ ! -d "${VENV}" ] ; then ${PYTHON} -m virtualenv ${VENV} ; fi
+
 # 	remove packages not in the requirements.txt
-	pip3 freeze | grep -v -f requirements.txt - | grep -v '^#' | grep -v '^-e ' | xargs pip3 uninstall -y || echo "never mind"
 # 	install and upgrade based on the requirements.txt
-	python -m pip install --upgrade -r requirements.txt
 # 	let make know this is the last time requirements changed
+${VENVBIN}/activate: ${VENV}-init requirements.txt
+	set -e ; \
+	${PIP} freeze | grep -v -f requirements.txt - | grep -v '^#' | grep -v '^-e ' | xargs ${PIP} uninstall -y || echo "never mind" ; \
+	${PIP} install --upgrade -r requirements.txt ; \
 	touch ${VENVBIN}/activate
 
 depend:	${VENV}			## Prepare dependencies
-	python download-c-lib.py
+	${PYTHON} download-c-lib.py
 
 test: ${VENV}			## Test all targets
-	python -m pytest --capture=no --verbose
+	${PYTHON} -m pytest --capture=no --verbose
 
 benchmark: ${VENV}		## Run CRUD benchmarks
-	python -m benchmark
+	${PYTHON} -m benchmark
 
 clean:					## Clean build artifacts
 	rm -rf build/
 	rm -rf dist/
 	rm -rf *.egg-info
 
 publish:				## Publish the package built by `make build`
-	python -m twine upload --verbose dist/objectbox*.whl
+	${PYTHON} -m twine upload --verbose dist/objectbox*.whl