From 859b505afa1ea78b16c1d558ae59784dde3eb036 Mon Sep 17 00:00:00 2001 From: Aaron LI Date: Tue, 16 May 2017 10:29:03 +0800 Subject: Makefile: Improve venv (can locate at other directory) Also update copyright information. --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 0416565..bf87eea 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Weitian LI +# Copyright (c) 2016-2017 Weitian LI # MIT license # # Makefile for "fg21sim" @@ -6,7 +6,7 @@ # Credit: http://blog.bottlepy.org/2012/07/16/virtualenv-and-makefiles.html # -# The name (also the directory) of the virtualenv +# Path to the virtualenv VENV ?= venv @@ -15,7 +15,7 @@ default: @echo "| Make Utility for fg21sim |" @echo "+-------------------------------------------------------------+" @echo "Available targets:" - @echo " + venv" + @echo " + venv [VENV=]" @echo " create virtualenv '${VENV}' and install the dependencies" @echo " + devbuild" @echo " (build and) install the package to the virtualenv" @@ -27,17 +27,17 @@ default: # Create virtualenv and install/update the dependencies venv: ${VENV}/bin/activate ${VENV}/bin/activate: requirements.txt - test -d ./${VENV} || python3 -m venv ${VENV} - ./${VENV}/bin/pip3 install -r requirements.txt + test -d ${VENV} || python3 -m venv ${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 tests test: devbuild - ./${VENV}/bin/python3 setup.py test + ${VENV}/bin/python3 setup.py test # One liner to get the value of any makefile variable -- cgit v1.2.2