From 4fb29753ca1da2942377a47a61689194c96d78fd Mon Sep 17 00:00:00 2001 From: Tim 'mithro' Ansell Date: Mon, 17 Dec 2018 18:49:18 -0800 Subject: [PATCH 1/2] Check yaml *inside* the environment. Signed-off-by: Tim 'mithro' Ansell --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 437336e4..81038d84 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ env: virtualenv --python=python3 --system-site-packages env . env/bin/activate; pip install -r requirements.txt ln -sf $(PWD)/prjxray env/lib/python3.*/site-packages/ - python -c "import yaml" || (echo "Unable to find python-yaml" && exit 1) + . env/bin/activate; python -c "import yaml" || (echo "Unable to find python-yaml" && exit 1) build: git submodule update --init --recursive From c04ca0dc3619dd0975d45c2ca6171d75c7524691 Mon Sep 17 00:00:00 2001 From: Tim 'mithro' Ansell Date: Mon, 17 Dec 2018 18:53:58 -0800 Subject: [PATCH 2/2] Adding better instructions for Python to README. Signed-off-by: Tim 'mithro' Ansell --- README.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1e0dcff8..e56d4b31 100644 --- a/README.md +++ b/README.md @@ -49,9 +49,19 @@ Creating HTML documentation: cd htmlgen python3 htmlgen.py + +(Option 1) - Install the Python environment locally + + apt-get install virtualenv python3-virtualenv python3-yaml + make env + +(Option 2) - Install the Python environment globally + + apt-get install python3-yaml + sudo pip3 install -r requirements.txt + (Re-)creating the database: - sudo pip3 install -r requirements.txt cd fuzzers make -j$(nproc)