Merge branch 'master' of github.com:plclub/metalib

plclub · May 27, 2020 · 597fd7d · 597fd7d
2 parents e99acf4 + 04b7aea
commit 597fd7d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -16,13 +16,13 @@ defaults: &defaults
       command: opam install .
   - run:
       name: Fsub
-      command: make -C Fsub
+      command: make -k -C Fsub
   - run:
       name: Tutorial
-      command: make -C Tutorial
+      command: make -k -C Tutorial
   - run:
       name: Stlc
-      command: make -C Stlc
+      command: make -k -C Stlc -B
 
 jobs:
   coq.8.10:

diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 *.v.d
 .coqdeps.d
 *.vo*
+*.v-e
 *.glob
 .*.aux
 *.v.d

diff --git a/Stlc/Connect.v b/Stlc/Connect.v
@@ -28,10 +28,9 @@
 
 Require Import String.
 Require Import Metalib.Metatheory.
-Require Import Stlc.Definitions.
-Require Import Stlc.Lemmas.
 
 Require Import Stlc.Nominal.
+Require Import Stlc.Lemmas.
 
 Import StlcNotations.
 

diff --git a/Stlc/Makefile b/Stlc/Makefile
@@ -34,8 +34,8 @@ zipclean:
 
 clean: Stlc.mk paperclean zipclean
 	make -f Stlc.mk clean
-	rm -f Stlc.mk
-	rm -f *.cmi *.cmo coqsplit
+	rm -f Stlc.mk*
+	rm -f *.cmi *.cmo coqsplit *_full* *_sol* *.v-e
 
 
 coq: $(GENCOQ) Stlc.mk
-Original file line number
+Diff line change
@@ -1,6 +1,7 @@
     *.v.d
     .coqdeps.d
     *.vo*
+    *.v-e
     *.glob
     .*.aux
     *.v.d
@@ Expand Down @@