Skip to content

Commit

Permalink
Merge b046b1c into c094bf5
Browse files Browse the repository at this point in the history
  • Loading branch information
snim2 committed Aug 12, 2016
2 parents c094bf5 + b046b1c commit 528ecd3
Show file tree
Hide file tree
Showing 9 changed files with 308 additions and 398 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ script:
--cov=revelation revelation/test/
- python -m doctest scripts/diff_trace.py
- python -m doctest scripts/get_instructions_used.py
- cd docs
- make html
- make linkcheck
- cd ..
- PYTHONPATH=${HOME}/pydgin/:. ${HOME}/pypy/rpython/bin/rpython --no-pdb --opt=jit revelation/sim.py
- if [ "${TRAVIS_PULL_REQUEST}" == "false" ] && [ "${TRAVIS_BRANCH}" == "master" ] ;
then PYTHONPATH=${HOME}/pydgin/:. ${HOME}/pypy/rpython/bin/rpython --no-pdb --opt=jit revelation/sim.py --debug ;
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ If you want your compiled Revelation simulator to be able to write out a trace o

Please report any problems you have with Revelation on the [Issues page](https://github.com/futurecore/revelation/issues).

To contribute to Revelation itself, please raise a Pull Request, and if it is relevant to your changes please include unit tests.
To contribute to Revelation itself, please fork this repository and raise a Pull Request, and if it is relevant to your changes please include unit tests.
Translating Revelation will be relatively slow, so it is easiest to run and test the simulator un-translated, until your changes are stable, e.g.:

```bash
Expand Down Expand Up @@ -151,7 +151,7 @@ More information about this license can be found here:
* http://choosealicense.com/licenses/bsd-3-clause
* http://opensource.org/licenses/BSD-3-Clause

Some test programs within this repository were previously published by other authors, and come with their own license agreements.
Some test programs and benchmarks within this repository were previously published by other authors, and come with their own license agreements.


## Acknowledgements
Expand Down
65 changes: 0 additions & 65 deletions docs/ambiguities.rst

This file was deleted.

6 changes: 3 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,16 @@

# General information about the project.
project = u'Revelation'
copyright = u'2015, Sarah Mount, Carl Friedrich Bolz'
copyright = u'2015-2016, Sarah Mount, Carl Friedrich Bolz'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = '0.1'
# version = '0.1'
# The full version, including alpha/beta/rc tags.
release = '0.1'
# release = '0.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down

0 comments on commit 528ecd3

Please sign in to comment.