X-Git-Url: http://git.megacz.com/?p=coq-hetmet.git;a=blobdiff_plain;f=Makefile;h=9067ab039a2ab11af648afb8cb813cf9b75a8519;hp=06d038247acaf863a0c3d01853ccdfa4de934ef1;hb=6c06dcf3fee5a4f0c8f72c237de7bd30b7a2379b;hpb=695db0ba4a767d5bb0ceb3cb802dbcacba482b0e

diff --git a/Makefile b/Makefile
index 06d0382..9067ab0 100644
--- a/Makefile
+++ b/Makefile
@@ -6,20 +6,40 @@ 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!
@@ -29,9 +49,6 @@ push: 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^)
-	make publish
-
-publish:
 	rm -rf .temp
 	mkdir .temp
 	cd .temp; ln -s ../src/*.v .