doc: update `ChangeLog.md`

[haskell/symantic-document.git] / Makefile

diff --git a/Makefile b/Makefile
index 554eb659b12c1fa961c7d9c617c5ffbee82c9852..fb3d72405ba72e8e5b9322de8cd378521ccd51d3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-override GHCID_OPTIONS += --no-height-limit --reverse-errors 
+override GHCID_OPTIONS += --no-height-limit --reverse-errors --color=always
 override REPL_OPTIONS += -ignore-dot-ghci
 
 cabal := $(wildcard *.cabal)
@@ -21,15 +21,15 @@ ghcid:
 t tests:
        cabal test $(CABAL_TEST_FLAGS) \
         --test-show-details always --test-options "$(TEST_OPTIONS)"
-tests/prof-time: $(project)-test.eventlog.json
-tests/prof-heap: $(project)-test.eventlog.html
+tests/prof-time: $(project)-tests.eventlog.json
+tests/prof-heap: $(project)-tests.eventlog.html
 .PHONY: $(project)-test.eventlog
 $(project)-test.eventlog $(project)-test.prof:
        cabal test $(CABAL_TEST_FLAGS) \
         --test-show-details always --test-options "$(TEST_OPTIONS) +RTS $(RTS_OPTIONS)" \
         --enable-profiling $(addprefix --ghc-options ,$(GHC_PROF_OPTIONS)) || true
 t/repl tests/repl:
-       cabal repl $(CABAL_REPL_FLAGS) $(CABAL_TEST_FLAGS) --enable-tests $(project)-test
+       cabal repl $(CABAL_REPL_FLAGS) $(CABAL_TEST_FLAGS) --enable-tests $(project)-tests
 t/ghcid tests/ghcid:
        ghcid $(GHCID_OPTIONS) --command 'cabal repl $(CABAL_REPL_FLAGS) $(CABAL_TEST_FLAGS) $(project):tests' --test ":main $(TEST_OPTIONS)"
 
@@ -54,7 +54,7 @@ ChangeLog.md:
        ! git tag --merged | grep -Fqx $(package)-$(version)
        git diff --exit-code
        git tag -f $(package)-$(version)
-       git-chglog --output $@.new $(package)-$(version)
+       git-chglog --output $@.new --tag-filter-pattern '$(package)-.*' $(package)-$(version)
        touch $@
        cat $@ >>$@.new
        mv -f $@.new $@
@@ -70,7 +70,8 @@ tar:
        cabal sdist
        cabal haddock --haddock-for-hackage --enable-doc
 upload: LANG=C
-upload: tar tag
+upload: tar
+       git tag --merged | grep -Fqx $(package)-$(version)
        git push --follow-tags $(GIT_PUSH_FLAGS)
        cabal upload $(CABAL_UPLOAD_FLAGS) "$(cabal_builddir)"/sdist/$(package)-$(version).tar.gz
        cabal upload $(CABAL_UPLOAD_FLAGS) --documentation "$(cabal_builddir)"/$(package)-$(version)-docs.tar.gz
@@ -79,15 +80,6 @@ upload: tar tag
        
 publish: upload/publish
 
-nix-build:
-       nix -L build
-nix-relock:
-       nix flake update --recreate-lock-file
-nix-repl:
-       nix -L develop --command cabal repl $(CABAL_REPL_FLAGS)
-nix-shell:
-       nix -L develop
-
 .PHONY: .hlint.yaml
 .hlint.yaml: $(shell find src -name '*.hs' -not -name 'HLint.hs')
        sed -i -e '/^# BEGIN: generated hints/,/^# END: generated hints/d' $@