Permalink
Browse files

Tweak build instructions and readme

Mention version2
  • Loading branch information...
xrchz committed Jul 7, 2017
1 parent 3061453 commit c99d29f46f0befd6163877b9d9d834807bdb9558
Showing with 9 additions and 11 deletions.
  1. +2 −6 README.md
  2. +5 −3 build-instructions.sh
  3. +2 −2 readmePrefix
View
@@ -12,8 +12,8 @@ Example build instructions can be found in
[build-instructions.sh](build-instructions.sh).
The [master](../../tree/master) branch contains the latest development
version of CakeML. See the [version1](../../tree/version1) branch for
the previous version.
version of CakeML. See the [version2](../../tree/version2) or
[version1](../../tree/version1) branch for previous versions.
Directory structure
-------------------
@@ -62,10 +62,6 @@ The start of a set theory formalisation that has net yet been used.
Auxiliary files providing glue between a standard HOL installation
and what we want to use for CakeML development.
[readmePrefix](readmePrefix):
The CakeML project: https://cakeml.org
======================================
[semantics](semantics):
The definition of the CakeML language. The definition is (mostly)
expressed in Lem (http://www.cs.kent.ac.uk/~sao/lem), but the
View
@@ -23,7 +23,9 @@ cd
git clone https://github.com/HOL-Theorem-Prover/HOL
cd HOL
## optionally switch to a released version, e.g., kananaskis-11
# git checkout k11-release-prep # kananaskis-11 when released
# git checkout kananaskis-11
## note: currently, we only aim to ensure that
## CakeML branch master builds on HOL branch master
poly < tools/smart-configure.sml
bin/build
## optionally set HOLDIR to point to the HOL installation
@@ -35,8 +37,8 @@ bin/build
cd
git clone https://github.com/CakeML/cakeml
cd cakeml
## optionally switch to a released version, e.g., version1
# git checkout version1
## optionally switch to a released version, e.g., version2
# git checkout version2
$HOME/HOL/bin/Holmake
## or just Holmake if you set up your PATH as above
# Holmake
View
@@ -12,8 +12,8 @@ Example build instructions can be found in
[build-instructions.sh](build-instructions.sh).
The [master](../../tree/master) branch contains the latest development
version of CakeML. See the [version1](../../tree/version1) branch for
the previous version.
version of CakeML. See the [version2](../../tree/version2) or
[version1](../../tree/version1) branch for previous versions.
Directory structure
-------------------

0 comments on commit c99d29f

Please sign in to comment.