From 31176813d3f18db6c7f76257be416b7b8b60b92d Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Mon, 17 Feb 2020 19:31:49 +0000 Subject: Fix makefile and add travis build --- .travis.yml | 4 ++++ Makefile | 13 +++++++------ default.nix | 2 -- 3 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..dd99ef4 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,4 @@ +language: nix # automatically runs nix-build + +git: + depth: 3 # not 1 to build commits in the queue diff --git a/Makefile b/Makefile index 415f6ee..3f656e2 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,15 @@ -COMPCERTRECDIRS=lib common $(ARCHDIRS) backend cfrontend driver flocq exportclight \ +COMPCERTRECDIRS := lib common $(ARCHDIRS) backend cfrontend driver flocq exportclight \ MenhirLib cparser -COMPCERTCOQINCLUDES=$(foreach d, $(RECDIRS), -R lib/CompCert/$(d) compcert.$(d)) +COMPCERTCOQINCLUDES := $(foreach d, $(RECDIRS), -R lib/CompCert/$(d) compcert.$(d)) -COQINCLUDES=-R src/Common CoqUp.Common -R src/Verilog CoqUp.Verilog -R src/Driver CoqUp.Driver -R src/Extraction CoqUp.Extraction $(COMPCERTCOQINCLUDES) +COQINCLUDES := -R src/Common CoqUp.Common -R src/Verilog CoqUp.Verilog -R src/Driver CoqUp.Driver -R src/Extraction CoqUp.Extraction $(COMPCERTCOQINCLUDES) -COQEXEC=$(COQBIN)coqtop $(COQINCLUDES) -batch -load-vernac-source -COQMAKE="$(COQBIN)coq_makefile" +COQEXEC := $(COQBIN)coqtop $(COQINCLUDES) -batch -load-vernac-source +COQMAKE := "$(COQBIN)coq_makefile" -VS=$(wildcard src/CoqUp/*.v) +COQUPDIRS := Common Driver Verilog +VS := $(foreach d, $(COQUPDIRS), src/$(d)/*.v) .PHONY: all install coq clean diff --git a/default.nix b/default.nix index d0bb746..4569d22 100644 --- a/default.nix +++ b/default.nix @@ -6,6 +6,4 @@ stdenv.mkDerivation { buildInputs = [ coq_8_10 ocamlPackages.menhir dune ocaml ocamlPackages.findlib ]; - - buildPhase = "make"; } -- cgit