Merge pull request #617 from mithro/non_canonical_sorting

Install FASM into environment correctly
This commit is contained in:
Tim Ansell 2019-02-07 14:02:14 +11:00 committed by GitHub
commit 4794fe574d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 1 deletions

View File

@ -4,8 +4,19 @@ ALL_EXCLUDE = third_party .git env build
IN_ENV = if [ -e env/bin/activate ]; then . env/bin/activate; fi;
env:
virtualenv --python=python3 --system-site-packages env
# Install prjxray
ln -sf $(PWD)/prjxray env/lib/python3.*/site-packages/
$(IN_ENV) python -c "import prjxray"
# Install fasm from third_party
$(IN_ENV) pip install --upgrade -e third_party/fasm
# Install project dependencies
$(IN_ENV) pip install -r requirements.txt
# Install project's documentation dependencies
$(IN_ENV) pip install -r docs/requirements.txt
# Check fasm library was installed
$(IN_ENV) python -c "import fasm"
$(IN_ENV) python -c "import fasm.output"
# Check YAML is installed
$(IN_ENV) python -c "import yaml" || (echo "Unable to find python-yaml" && exit 1)
build:

View File

@ -1,3 +1,4 @@
fasm
futures
intervaltree
numpy

2
third_party/fasm vendored

@ -1 +1 @@
Subproject commit ece57149c96cea82ab155af3bba04e76eee4ab6a
Subproject commit ddc281a41662bff3efb4a66c5b22307e31e5df44