Skip to content

Commit

Permalink
Merge K9 release preparation into release-masters
Browse files Browse the repository at this point in the history
  • Loading branch information
mn200 committed Dec 9, 2013
2 parents b6a03ed + 94edf49 commit 5545996
Show file tree
Hide file tree
Showing 689 changed files with 219,804 additions and 35,228 deletions.
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
*.hix
*.fdb_latexmk

#Generated Verilog from Iyoda/Gordon hw compilation
*.vl

config-override
tools-poly/poly-includes.ML

Expand Down Expand Up @@ -115,13 +118,20 @@ Manual/Reference/entries.tex
examples/dev/*.vl

examples/machine-code/lisp/*.s
examples/machine-code/just-in-time/*.s

examples/muddy/muddyC/Makefile
examples/muddy/muddyC/buddy/src/libbdd.a
examples/muddy/muddyC/muddy.so

examples/set-theory/hol_sets/ordinalML.*

examples/theorem-prover/lisp-runtime/bin/*.s


examples/computability/lambda/computability-heap

examples/miniML/hol2miniml/*.txt
examples/miniML/hol2miniml/miniml-heap

local-hol-heap
16 changes: 16 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
language: c
compiler:
- gcc
before_script: developers/travis/before_install.sh
script: poly < tools/smart-configure.sml && bin/build $BUILDOPTS -nograph
env:
global:
- PATH=$PATH:$HOME/bin LD_LIBRARY_PATH=$HOME/lib
matrix:
- ROOTPOLY=1 BUILDOPTS="-seq developers/travis/selftestseq"
- ROOTPOLY= BUILDOPTS=
- ROOTPOLY= BUILDOPTS=-expk
- ROOTPOLY= BUILDOPTS="-seq developers/travis/selftestseq -selftest"
- ROOTPOLY= BUILDOPTS="-expk -seq developers/travis/selftestseq -selftest"
- ROOTPOLY= BUILDOPTS="-seq developers/travis/more_examples_seq -selftest"
- ROOTPOLY= BUILDOPTS="-expk -seq developers/travis/more_examples_seq -selftest"
2 changes: 1 addition & 1 deletion COPYRIGHT
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
HOL COPYRIGHT NOTICE, LICENSE AND DISCLAIMER.

Copyright 1998, 1999 by Konrad Slind.
Copyright 2000--2012 by Michael Norrish and Konrad Slind.
Copyright 2000--2013 by Michael Norrish and Konrad Slind.

All rights reserved.

Expand Down
52 changes: 30 additions & 22 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Getting and Building the HOL system
Getting and building the HOL system
-----------------------------------

Get the HOL sources from SourceForge at http://hol.sourceforge.net
Expand All @@ -21,7 +21,7 @@ do this,
2. Run the executable and follow the on-screen instructions.

The instructions that follow are how to build from sources, on any of
the supported operating systems
the supported operating systems.


Building the HOL system
Expand Down Expand Up @@ -52,20 +52,28 @@ A. [Moscow ML:] First, install Moscow ML. This is usually
set for you by the latest self-installing executable available
from the Moscow ML home-page.

[Poly/ML:] Install the latest Poly/ML. Note that you will not be
able to use the HolBddLib example with this implementation.
[Poly/ML:] Install the latest version of Poly/ML. Note that you
will not be able to use the HolBddLib example with this
implementation.

http://www.polyml.org/

You must ensure that your dynamic library loading (typically done
by setting the LD_LIBRARY_PATH environment variable) picks up
libpolyml.so and libpolymain.so. If these files are in /usr/lib,
You must ensure that your dynamic library loading picks up
libpolyml.so and libpolymain.so. If these files are in /usr/lib,
you will not have to change anything, but other locations may
require further system configuration. A sample LD_LIBRARY_PATH
initialisation command (in a file such as .bashrc) might be
require further system configuration (typically done by setting the
LD_LIBRARY_PATH environment variable). A sample LD_LIBRARY_PATH
initialisation command (in a file such as ~/.bashrc) might be

declare -x LD_LIBRARY_PATH=/usr/local/lib:$HOME/lib

If you are using PolyML 5.5.1 or later, you will have to configure
its build with the

--enabled-shared

option. In other words, the first thing to do when building PolyML
will be

./configure --enable-shared

B. Unpack HOL with the commands

Expand All @@ -77,7 +85,6 @@ B. Unpack HOL with the commands
approximately 35M of disk space, so be sure you have enough before
starting.


C. In the HOL directory (<hol-dir>), type

[Moscow ML:] mosml < tools/smart-configure.sml
Expand Down Expand Up @@ -143,15 +150,15 @@ D. Now perform the following shell command:
E. If bin/build completes (it takes a while!), successfully, you are
done. From <hol-dir> you can now access

bin/hol * The standard HOL interactive system;
bin/hol * The standard HOL interactive system
bin/hol.noquote * The interactive system with quote
preprocessing turned off;
bin/hol.bare * A "stripped down" version of hol;
preprocessing turned off
bin/hol.bare * A "stripped down" version of hol
bin/hol.bare.noquote * A "stripped down" version of hol.noquote,
with quote preprocessing turned off;
bin/Holmake * A batch compiler for HOL directories;
src/ * System sources;
examples/ * Examples of the use of the system.
with quote preprocessing turned off
bin/Holmake * A batch compiler for HOL directories
src/ * System sources
examples/ * Examples of the use of the system

On Windows the hol scripts additionally include a .bat extension,
and Holmake has a .exe extension.
Expand All @@ -162,9 +169,10 @@ External tools

The HOL installation currently includes a C library (in HolBddLib),
the C sources for the SMV model-checker (in temporalLib), and for a
SAT solver (minisat) in HolSat. Building these under Unix requires a C
compiler to have been specified in tools/configure.sml. Under Windows,
precompiled binaries are available for the library and for minisat.
SAT solver (minisat) in HolSat. Building these under Unix requires a
C compiler to have been specified in tools/configure.sml. Under
Windows, precompiled binaries are available for the C library and for
minisat.

Loading the BDD libraries muddyLib or HolBddLib will fail unless
MoscowML has been built with dynamic linking enabled.
Expand Down
Loading

0 comments on commit 5545996

Please sign in to comment.