Skip to content

Commit

Permalink
remove Holmakefile.gen and replace with CakeML style Holmakefile
Browse files Browse the repository at this point in the history
  • Loading branch information
palmskog committed Feb 16, 2024
1 parent d65e127 commit 8044597
Show file tree
Hide file tree
Showing 90 changed files with 224 additions and 761 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
*.exe
*-heap

# Generated Holmake files
Holmakefile

# Makefile related stuff
Makefile.local
holba-tests.log
Expand Down
1 change: 1 addition & 0 deletions .holpath
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
HOLBADIR
16 changes: 0 additions & 16 deletions src/Holmakefile.gen

This file was deleted.

39 changes: 0 additions & 39 deletions src/Holmakefile.inc

This file was deleted.

4 changes: 4 additions & 0 deletions src/aux/Holmakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
INCLUDES =

all: $(DEFAULT_TARGETS)
.PHONY: all
16 changes: 0 additions & 16 deletions src/aux/Holmakefile.gen

This file was deleted.

4 changes: 4 additions & 0 deletions src/shared/HolSmt/Holmakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
INCLUDES =

all: $(DEFAULT_TARGETS)
.PHONY: all
16 changes: 0 additions & 16 deletions src/shared/HolSmt/Holmakefile.gen

This file was deleted.

7 changes: 7 additions & 0 deletions src/shared/Holmakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
INCLUDES = $(HOLBADIR)/src/theory/bir \
$(HOLBADIR)/src/theory/bir-support \
$(HOLBADIR)/src/shared/HolSmt \
$(HOLBADIR)/src/shared/sml-simplejson

all: $(DEFAULT_TARGETS)
.PHONY: all
16 changes: 0 additions & 16 deletions src/shared/Holmakefile.gen

This file was deleted.

4 changes: 4 additions & 0 deletions src/shared/examples/Holmakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
INCLUDES =

all: $(DEFAULT_TARGETS)
.PHONY: all
16 changes: 0 additions & 16 deletions src/shared/examples/Holmakefile.gen

This file was deleted.

16 changes: 0 additions & 16 deletions src/theory/Holmakefile.gen

This file was deleted.

4 changes: 4 additions & 0 deletions src/theory/bir-support/Holmakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
INCLUDES = $(HOLBADIR)/src/theory/bir

all: $(DEFAULT_TARGETS)
.PHONY: all
16 changes: 0 additions & 16 deletions src/theory/bir-support/Holmakefile.gen

This file was deleted.

4 changes: 4 additions & 0 deletions src/theory/bir/Holmakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
INCLUDES = $(HOLBADIR)/src/aux

all: $(DEFAULT_TARGETS)
.PHONY: all
16 changes: 0 additions & 16 deletions src/theory/bir/Holmakefile.gen

This file was deleted.

16 changes: 0 additions & 16 deletions src/theory/models/Holmakefile.gen

This file was deleted.

24 changes: 0 additions & 24 deletions src/theory/models/l3/Holmakefile.gen

This file was deleted.

4 changes: 0 additions & 4 deletions src/theory/models/l3/README

This file was deleted.

6 changes: 6 additions & 0 deletions src/theory/models/l3mod/Holmakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
INCLUDES = $(HOLDIR)/examples/l3-machine-code/common \
$(HOLDIR)/examples/l3-machine-code/m0/model \
$(HOLDIR)/examples/l3-machine-code/m0/step

all: $(DEFAULT_TARGETS)
.PHONY: all
18 changes: 0 additions & 18 deletions src/theory/models/l3mod/Holmakefile.gen

This file was deleted.

3 changes: 3 additions & 0 deletions src/theory/models/l3mod/m0_mod_stepScript.sml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ open arithmeticTheory;
open wordsTheory;
open combinTheory;

open m0Theory m0_stepTheory;
open m0_stepLib;

(* This theory contains the definition of the modified m0 step
(, where clock cycles are counted with word64 instead if num). *)

Expand Down
4 changes: 4 additions & 0 deletions src/theory/program_logic/Holmakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
INCLUDES = $(HOLBADIR)/src/aux

all: $(DEFAULT_TARGETS)
.PHONY: all
16 changes: 0 additions & 16 deletions src/theory/program_logic/Holmakefile.gen

This file was deleted.

16 changes: 0 additions & 16 deletions src/theory/tools/Holmakefile.gen

This file was deleted.

9 changes: 9 additions & 0 deletions src/theory/tools/backlifter/Holmakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
INCLUDES = $(HOLBADIR)/src/theory/bir \
$(HOLBADIR)/src/theory/bir-support \
$(HOLBADIR)/src/theory/program_logic \
$(HOLBADIR)/src/theory/models/l3mod \
$(HOLBADIR)/src/theory/tools/lifter \
$(HOLBADIR)/src/theory/tools/comp

all: $(DEFAULT_TARGETS)
.PHONY: all
16 changes: 0 additions & 16 deletions src/theory/tools/backlifter/Holmakefile.gen

This file was deleted.

2 changes: 2 additions & 0 deletions src/theory/tools/backlifter/bir_backlifterScript.sml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ open program_logicSimps;

open bir_auxiliaryLib;

open m0_mod_stepLib;

val _ = new_theory "bir_backlifter";

(* This part should be generalized *)
Expand Down
7 changes: 7 additions & 0 deletions src/theory/tools/comp/Holmakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
INCLUDES = $(HOLBADIR)/src/theory/bir \
$(HOLBADIR)/src/theory/bir-support \
$(HOLBADIR)/src/theory/program_logic \
$(HOLBADIR)/src/theory/tools/wp

all: $(DEFAULT_TARGETS)
.PHONY: all
Loading

0 comments on commit 8044597

Please sign in to comment.