Skip to content

Commit e4ae345

Browse files
committed
Improve root directory organisation
Closes #164
1 parent 0bed474 commit e4ae345

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+117
-88
lines changed

Holmakefile

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,13 @@
1-
INCLUDES = developers $(HOLDIR)/examples/formal-languages/context-free $(HOLDIR)/examples/fun-op-sem/lprefix_lub lem_lib_stub $(HOLDIR)/examples/machine-code/hoare-triple
1+
INCLUDES = developers compiler/bootstrap/evaluation/x64
22
OPTIONS = QUIT_ON_FAILURE
33

4-
README_SOURCES = miscScript.sml COPYING developers build-instructions.sh lib.lem libScript.sml
4+
README_SOURCES = COPYING developers build-instructions.sh
55

6-
THYFILES = $(patsubst %Script.sml,%Theory.uo,$(wildcard *.sml))
7-
TARGETS0 = $(patsubst %Theory.sml,,$(THYFILES))
8-
TARGETS = README.md $(patsubst %.sml,%.uo,$(TARGETS0))
9-
all: $(TARGETS)
6+
all: README.md cake
107
.PHONY: all
118

12-
LEMSRC = lib
13-
LEMS = $(patsubst %,%.lem,$(LEMSRC))
14-
GENS = $(patsubst %,%Script.sml,$(LEMSRC))
15-
16-
README.md: $(README_SOURCES) readmePrefix
9+
README.md: $(README_SOURCES) readmePrefix developers/readme_gen
1710
developers/readme_gen $(README_SOURCES)
1811

19-
$(GENS): $(LEMS)
20-
if type lem;\
21-
then lem $(LEM_OPT) -suppress_renaming -auxiliary_level none -hol $(LEMS);\
22-
else touch $(GENS); fi
12+
cake: compiler/bootstrap/evaluation/x64/cake
13+
$(CP) $< $@

README.md

Lines changed: 6 additions & 9 deletions

basis/Holmakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
INCLUDES = .. pure ../translator ../characteristic ../semantics
1+
INCLUDES = ../misc pure ../translator ../characteristic ../semantics
22
OPTIONS = QUIT_ON_FAILURE
33
THYFILES = $(patsubst %Script.sml,%Theory.uo,$(wildcard *.sml))
44
TARGETS = $(patsubst %.sml,%.uo,$(THYFILES))

basis/pure/Holmakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
INCLUDES = ../.. $(HOLDIR)/examples/fun-op-sem/lprefix_lub $(HOLDIR)/examples/formal-languages/regular
1+
INCLUDES = ../../misc $(HOLDIR)/examples/formal-languages/regular
22
OPTIONS = QUIT_ON_FAILURE

candle/set-theory/Holmakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
INCLUDES = ../.. $(HOLDIR)/examples/set-theory/hol_sets
1+
INCLUDES = ../../misc $(HOLDIR)/examples/set-theory/hol_sets
22
OPTIONS = QUIT_ON_FAILURE
33

44
ifdef POLY
@@ -10,7 +10,7 @@ TARGETS = $(patsubst %.sml,%.uo,$(THYFILES))
1010
all: $(TARGETS) $(HOLHEAP)
1111
.PHONY: all
1212

13-
BARE_THYS = $(HOLDIR)/examples/set-theory/hol_sets/cardinalTheory ../../miscTheory
13+
BARE_THYS = $(HOLDIR)/examples/set-theory/hol_sets/cardinalTheory ../../misc/miscTheory
1414

1515
DEPS = $(patsubst %,%.uo,$(BARE_THYS))
1616

candle/standard/ml_kernel/Holmakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
INCLUDES = ../../.. ../../../semantics ../../../semantics/alt_semantics ../../../translator ../monadic ../../../explorer/pp/astPP ../../../characteristic ../../../basis ../../../translator/monadic
1+
INCLUDES = ../../../misc ../../../semantics ../../../semantics/alt_semantics ../../../translator ../monadic ../../../explorer/pp/astPP ../../../characteristic ../../../basis ../../../translator/monadic
22
OPTIONS = QUIT_ON_FAILURE
33

44
ifdef POLY
@@ -11,7 +11,7 @@ TARGETS = $(patsubst %.sml,%.uo,$(THYFILES))
1111
all: $(TARGETS) $(HOLHEAP)
1212
.PHONY: all
1313

14-
BARE_THYS = ../../../preamble ../monadic/holKernelTheory
14+
BARE_THYS = ../../../misc/preamble ../monadic/holKernelTheory
1515

1616
DEPS = $(patsubst %,%.uo,$(BARE_THYS))
1717

candle/standard/monadic/Holmakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
INCLUDES = ../../.. ../../syntax-lib ../syntax ../../../translator/monadic/
1+
INCLUDES = ../../../misc ../../syntax-lib ../syntax ../../../translator/monadic/
22
OPTIONS = QUIT_ON_FAILURE
33

44
ifdef POLY
@@ -11,7 +11,7 @@ TARGETS = $(patsubst %.sml,%.uo,$(THYFILES))
1111
all: $(TARGETS) $(HOLHEAP)
1212
.PHONY: all
1313

14-
BARE_THYS = ../../../preamble ../../syntax-lib/holSyntaxLibTheory ../syntax/holAxiomsSyntaxTheory
14+
BARE_THYS = ../../../misc/preamble ../../syntax-lib/holSyntaxLibTheory ../syntax/holAxiomsSyntaxTheory
1515

1616
DEPS = $(patsubst %,%.uo,$(BARE_THYS))
1717

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
INCLUDES = ../../.. ../monadic
1+
INCLUDES = ../../../misc ../monadic

candle/standard/semantics/Holmakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
INCLUDES = ../../.. ../../../basis/pure ../../syntax-lib ../../set-theory ../syntax
1+
INCLUDES = ../../../misc ../../../basis/pure ../../syntax-lib ../../set-theory ../syntax
22
OPTIONS = QUIT_ON_FAILURE
33

44
ifdef POLY
@@ -11,7 +11,7 @@ TARGETS = $(patsubst %.sml,%.uo,$(THYFILES))
1111
all: $(TARGETS) $(HOLHEAP)
1212
.PHONY: all
1313

14-
BARE_THYS = ../../../preamble ../../syntax-lib/holSyntaxLibTheory ../../set-theory/setSpecTheory ../syntax/holAxiomsSyntaxTheory
14+
BARE_THYS = ../../../misc/preamble ../../syntax-lib/holSyntaxLibTheory ../../set-theory/setSpecTheory ../syntax/holAxiomsSyntaxTheory
1515

1616
DEPS = $(patsubst %,%.uo,$(BARE_THYS))
1717

candle/standard/syntax/Holmakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
INCLUDES = ../../.. ../../syntax-lib
1+
INCLUDES = ../../../misc ../../syntax-lib
22
OPTIONS = QUIT_ON_FAILURE
33

44
ifdef POLY
@@ -10,7 +10,7 @@ TARGETS = $(patsubst %.sml,%.uo,$(THYFILES))
1010
all: $(TARGETS) $(HOLHEAP)
1111
.PHONY: all
1212

13-
BARE_THYS = ../../../preamble ../../syntax-lib/holSyntaxLibTheory
13+
BARE_THYS = ../../../misc/preamble ../../syntax-lib/holSyntaxLibTheory
1414

1515
DEPS = $(patsubst %,%.uo,$(BARE_THYS))
1616

0 commit comments

Comments
 (0)