X-Git-Url: http://git.megacz.com/?p=coq-hetmet.git;a=blobdiff_plain;f=Makefile;h=9067ab039a2ab11af648afb8cb813cf9b75a8519;hp=9c73d49b49a34d951a5a29a29ffa0e96300e9264;hb=6c06dcf3fee5a4f0c8f72c237de7bd30b7a2379b;hpb=8dc348a407d7a476388401765b24f7815cc801cf

diff --git a/Makefile b/Makefile
index 9c73d49..9067ab0 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@ default: build/CoqPass.hs
 
 build/CoqPass.hs: $(allfiles)
 	make build/Makefile.coq
+	cd build; make -f Makefile.coq OPT=-dont-load-proofs ExtractionMain.vo
 	cd build; make -f Makefile.coq Extraction.vo
 	cat src/Extraction-prefix.hs                                     > build/CoqPass.hs
 	cat build/Extraction.hs | grep -v '^module' | grep -v '^import' >> build/CoqPass.hs
@@ -24,6 +25,21 @@ src/categories/src:
 clean:
 	rm -rf build
 
+merged:
+	mkdir -p .temp
+	cd src; for A in *.v; do cat $$A  | grep -v '^Require Import' > ../.temp/`echo $$A | sed s_\\\\.v_._`; done
+	cd src/categories/src; for A in *.v; do cat $$A  | grep -v '^Require Import' > ../../../.temp/`echo $$A | sed s_\\\\.v_._`; done
+	cp src/Banner.v .temp/GArrows.v
+	cd .temp; grep '^Require Import ' ../src/All.v | sed 's_Require Import _echo;echo;echo;echo;echo;cat _' | bash >> GArrows.v
+	cd .temp; time $(coqc) -dont-load-proofs -verbose GArrows.v
+	echo
+	echo COMPILATION OK
+	echo
+
+pushcheck:
+	ssh megacz.com -- 'rm -rf /tmp/pushcheck; mkdir /tmp/pushcheck; cd /tmp/pushcheck; git clone http://git.megacz.com/ghc-hetmet.git && git clone http://git.megacz.com/coq-hetmet.git ghc-hetmet/compiler/hetmet'
+	rsync -are ssh --progress --verbose --exclude .git --exclude src/categories/build/ --exclude build/ ./ megacz.com:/tmp/pushcheck/ghc-hetmet/compiler/hetmet/
+	ssh megacz.com -- '/vol/megacz/pushcheck2.sh'
 
 
 # this is for Adam's use only!