diff options
| author | serpilliere <serpilliere@users.noreply.github.com> | 2016-07-11 15:17:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-11 15:17:21 +0200 |
| commit | 78705dee3fe8ee6de46f32faef40ff7ac86d2bf3 (patch) | |
| tree | aa77f8ed4f8c74697b0d7e53787ac43442fb35ad | |
| parent | 634926db3ebf03ca4be81d564144270a97c489b0 (diff) | |
| parent | 793d4b82702d64faf476efb1582973e06934d3d1 (diff) | |
| download | miasm-78705dee3fe8ee6de46f32faef40ff7ac86d2bf3.tar.gz miasm-78705dee3fe8ee6de46f32faef40ff7ac86d2bf3.zip | |
Merge pull request #394 from commial/update-z3
Update z3 requirement
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | README.md | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index c021d97f..2115abf9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,9 +25,9 @@ before_script: - "git clone https://github.com/serpilliere/elfesteem elfesteem && cd elfesteem && python setup.py install && cd ..;" # install pyparsing - "pip install pyparsing" -# install z3 -- "mkdir z3 && cd z3 && wget -O z3.zip 'http://download-codeplex.sec.s-msft.com/Download/SourceControlFileDownload.ashx?ProjectName=z3&changeSetId=cee7dd39444c9060186df79c2a2c7f8845de415b'" -- "unzip -q z3.zip && rm z3.zip && python scripts/mk_make.py --prefix=$(pwd)/../ && cd build && make -j 32 && make install && cd ../.." +# install z3 with a known to working version +- "git clone https://github.com/Z3Prover/z3 && cd z3 && git checkout f96cfea" +- "python scripts/mk_make.py --python && cd build && make -j 32 && make install && cd ../.." # install miasm - "cd ..;" - "cd miasm;" diff --git a/README.md b/README.md index 4ce234cf..09a5d44e 100644 --- a/README.md +++ b/README.md @@ -456,6 +456,9 @@ To enable code JIT, one of the following module is mandatory: * LLVM v3.2 with python-llvm, see below * LibTCC [tinycc (ONLY version 0.9.26)](http://repo.or.cz/w/tinycc.git) +'optional' Miasm can also use: +* Z3, the [Theorem Prover](https://github.com/Z3Prover/z3) + Configuration ------------- |