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

diff --git a/Makefile b/Makefile
index 8abce1b..9067ab0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,29 +1,54 @@
 coqc     := coqc -noglob
-coqfiles := $(shell find src -name \*.v)
-allfiles := $(coqfiles) $(shell find src -name \*.hs)
+coqfiles := $(shell find src -name \*.v  | grep -v \\\#)
+allfiles := $(coqfiles) $(shell find src -name \*.hs | grep -v \\\#)
 
 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
 
-build/Makefile.coq: $(coqfiles)
+build/Makefile.coq: $(coqfiles) src/categories/src
 	mkdir -p build
 	rm -f build/*.v
 	rm -f build/*.d
-	cd build; ln -s ../src/*.v .
+	cd build; ln -fs `find ../src -name \*.v` .
 	cd build; coq_makefile *.v > Makefile.coq
 
+src/categories/src:
+	git submodule update --init src/categories
+	cd compiler/categories; git checkout master
+
 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!
-publish:
+push: build/CoqPass.hs
+	git push http://git.megacz.com/coq-hetmet.git master
+	git add -f build/CoqPass.hs; \
+	  git commit -m 'update baked-in CoqPass.hs' && \
+	  (git push -f http://git.megacz.com/coq-hetmet.git master:coq-extraction-baked-in; \
+	   git reset HEAD^)
 	rm -rf .temp
 	mkdir .temp
 	cd .temp; ln -s ../src/*.v .
@@ -47,10 +72,3 @@ publish:
 	ssh login.eecs.berkeley.edu -- 'rm public_html/coq-in-ghc/pdfs/*.pdf' ; true
 	scp .temp/*.pdf login.eecs.berkeley.edu:public_html/coq-in-ghc/pdfs/
 	rm -rf .temp
-
-push: build/CoqPass.hs
-	git push http://git.megacz.com/coq-garrows.git master
-	git add -f build/CoqPass.hs
-	git commit -m 'update baked-in CoqPass.hs'
-	git push http://git.megacz.com/coq-garrows.git master:coq-extraction-baked-in
-	git reset HEAD^