From 3c6e976827fe382661c2d3682caa597e695bef5c Mon Sep 17 00:00:00 2001 From: Aaron LI Date: Mon, 3 Oct 2016 22:56:49 +0800 Subject: Makefile: Add variable "VENV" to control virtualenv * The variable "VENV" (default: "venv") defines the virtualenv name and can be override by the environment. * Add "devbuild" target to menu. * Remove the "--user" argument to fix the pip install problem. --- Makefile | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index c0b35ef..90fe952 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,12 @@ +# Copyright (c) 2016 Weitian LI +# MIT license +# # Makefile for "fg21sim" +# + +# The name (also the directory) of the virtualenv +VENV ?= "venv" + default: @echo "+-------------------------------------------------------------+" @@ -6,21 +14,23 @@ default: @echo "+-------------------------------------------------------------+" @echo "Available targets:" @echo " + venv" - @echo " create virtualenv 'venv' and install the dependencies" + @echo " create virtualenv '${VENV}' and install the dependencies" + @echo " + devbuild" + @echo " (build and) install the package to the virtualenv" @echo " + test" @echo " run the test cases" # Create virtualenv and install/update the dependencies -venv: venv/bin/activate -venv/bin/activate: requirements.txt - test -d "venv" || virtualenv -p python3 venv - ./venv/bin/pip3 install --user -r requirements.txt - touch venv/bin/activate +venv: ${VENV}/bin/activate +${VENV}/bin/activate: requirements.txt + test -d "${VENV}" || virtualenv --python=python3 ${VENV} + ./${VENV}/bin/pip3 install -r requirements.txt + touch ${VENV}/bin/activate # Install this package to the virtualenv devbuild: venv - ./venv/bin/python3 setup.py install + ./${VENV}/bin/python3 setup.py install # Run the test cases test: devbuild - ./venv/bin/python3 tests/runtests.py + ./${VENV}/bin/python3 tests/runtests.py -- cgit v1.2.2