Bump versions.

[haskell/symantic.git] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index b29029b2fdc23a29e7b531ab230e6923d5af1d79..af54341aa8d296804f57a49574279f0906947ebc 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,34 +1,56 @@
-PKGS := symantic-grammar symantic-document symantic symantic-lib
-HS := $(shell find $(PKGS) -name '*.hs')
+PKGS := \
+ symantic-grammar \
+ symantic \
+ symantic-lib
+HS = $(shell find $(PKGS) -name '*.hs' -not -name 'HLint.hs')
 
 all: build
 
 build: $(PKGS:=/build)
 %/build:
-       cd $*; stack $(STACK_FLAGS) build $(STACK_BUILD_FLAGS)
+       cd $* && stack $(STACK_FLAGS) build $(STACK_BUILD_FLAGS)
 .PHONY: $(PKGS) $(foreach p,$(PKGS),$(eval $p: $p/build))
 
+.PHONY: $(PKGS:=/test)
 test: $(PKGS:=/test)
-%/test:
-       ! grep -q '^Test-Suite\>' $*/$*.cabal || \
-       { cd $*; stack $(STACK_FLAGS) test $(STACK_TEST_FLAGS); }
+define test
+$p/test:
+       ! grep -q '^Test-Suite\>' $p/$p.cabal || \
+       { cd $p && stack $$(STACK_FLAGS) test $$(STACK_TEST_FLAGS); }
+endef
+$(foreach p,$(PKGS),$(eval $(call test)))
+
+GHCID_TEST_ARGS ?=
+GHCID_TEST ?= ":main $(GHCID_TEST_ARGS)"
+ghcid: $(PKGS:=/ghcid)
+%/ghcid:
+       cd $* && ghcid \
+        --warnings \
+        --command "stack $(STACK_FLAGS) $(GHCID_STACK_FLAGS) ghci $(GHCID_GHCI_FLAGS) \
+          $$(2>&1 stack ide targets | grep -v :test:) \
+          --ghci-options=-fobject-code" \
+        --test $(GHCID_TEST) \
+        $(GHCID_FLAGS)
 
 clean:   $(PKGS:=/clean)
 cleaner: $(PKGS:=/cleaner)
 %/clean:
-       cd $*; stack $(STACK_FLAGS) clean $(STACK_CLEAN_FLAGS)
+       cd $* && stack $(STACK_FLAGS) clean $(STACK_CLEAN_FLAGS)
 %/cleaner:
-       cd $*; stack $(STACK_FLAGS) clean --full $(STACK_CLEAN_FLAGS)
+       cd $* && stack $(STACK_FLAGS) clean --full $(STACK_CLEAN_FLAGS)
 
 %/fast: override STACK_BUILD_FLAGS+=--fast
 %/fast: override STACK_HADDOCK_FLAGS+=--fast
 %/fast: override STACK_TEST_FLAGS+=--fast
 %/fast: %
        
+%/accept: override STACK_TEST_ARGS+=--accept
+%/accept: %
+       
 
 doc: $(PKGS:=/doc)
 %/doc:
-       cd $*; stack $(STACK_FLAGS) haddock $(STACK_HADDOCK_FLAGS)
+       cd $* && stack $(STACK_FLAGS) haddock $(STACK_HADDOCK_FLAGS)
 %.html: %.md
        markdown $*.md >$*.html
 %.html/view: %.html
@@ -37,15 +59,15 @@ doc: $(PKGS:=/doc)
 HLint.hs: $(HS)
        sed -i -e '/^-- BEGIN: generated hints/,/^-- END: Generated by hlint/d' HLint.hs
        echo '-- BEGIN: generated hints' >> HLint.hs
-       hlint $(foreach p,$(PKGS),--find $p) | grep '^'infix | sort -u >> HLint.hs
+       hlint -XTypeApplications $(foreach p,$(PKGS),--find $p) | sed -ne 's/^- infix: "\([^"]*\)"/\1/p' | sort -u >>HLint.hs
        echo '-- END: generated hints' >> HLint.hs
 
 lint: $(PKGS:=/lint) $(HS)
 %/lint: HLint.hs
-       cd $*; if hlint --quiet --report=hlint.html -XNoCPP \
+       cd $* && if hlint --quiet --report=hlint.html -XNoCPP \
         $(shell cabal-cargs --format=ghc --only=default_extensions --sourcefile=$*) $(HLINT_FLAGS) .; \
        then rm -f hlint.html; \
-       else sensible-browser hlint.html & fi
+       else sensible-browser ./hlint.html & fi
 
 tag: $(PKGS:=/tag)
 %/tag:
@@ -57,10 +79,10 @@ tag: $(PKGS:=/tag)
 
 tar: $(PKGS:=/tar)
 %/tar:
-       cd $*; stack $(STACK_FLAGS) sdist $(STACK_SDIST_FLAGS)
+       cd $* && stack $(STACK_FLAGS) sdist $(STACK_SDIST_FLAGS)
 upload: $(PKGS:=/upload)
 %/upload:
-       cd $*; LANG=C stack $(STACK_FLAGS) upload $(STACK_UPLOAD_FLAGS) .
+       cd $* && LANG=C stack $(STACK_FLAGS) upload $(STACK_UPLOAD_FLAGS) .
 
 .PHONY: stats
 stats: