diff --git a/.travis.yml b/.travis.yml index 72e7664..06a02d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,9 +17,7 @@ python: - 2.7 install: - travis_retry pip install -U pip -- travis_retry pip install --no-binary keystone-engine keystone-engine -- travis_retry pip install coverage -- travis_retry pip install --no-binary capstone . +- travis_retry pip install --no-binary capstone --no-binary keystone-engine .[dev] # cs/ks can have pip install issues (cs issues #445) - scripts/travis_install_z3.sh - scripts/travis_install_unicorn.sh script: diff --git a/README.md b/README.md index bf756c6..e3118c1 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ enclosed `z3` binary in your `$PATH`. > Note: Due to a known [issue](https://github.com/aquynh/capstone/issues/445), Capstone may not install correctly. If you get this error message, "ImportError: ERROR: fail to load the dynamic library.", or another related - to Capstone, try reinstalling via `pip install -I --no-binary capstone` + to Capstone, try reinstalling via `pip install -I --no-binary capstone capstone` ### for developers @@ -83,9 +83,9 @@ After installing Manticore, here is some basic usage you can try. ``` cd examples/linux make -manticore basic # a pse_* directory is created -cat pse_*/*1.stdin | ./basic -cat pse_*/*2.stdin | ./basic +manticore basic # a mcore_* directory is created +cat mcore_*/*1.stdin | ./basic +cat mcore_*/*2.stdin | ./basic cd ../script python count_instructions.py ../linux/helloworld diff --git a/setup.py b/setup.py index aceab22..cb5af00 100644 --- a/setup.py +++ b/setup.py @@ -7,8 +7,15 @@ setup( install_requires=[ 'capstone', 'pyelftools', - 'unicorn' + 'unicorn', ], + extras_require={ + 'dev': [ + 'keystone-engine', + 'coverage', + 'nose', + ] + }, entry_points={ 'console_scripts': [ 'manticore = manticore.__main__:main'