X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=Makefile;h=cf1212608ac6c1b29a3cff552023be87391c32ef;hb=bd629247950923bbf189c76acff59671649dd5f2;hp=e52aae3da6e0559edf75b9ceb48b7e498c750e42;hpb=dd4040fc21aee8390ec32ac59029962d0678a9d7;p=super-star-trek.git

diff --git a/Makefile b/Makefile
index e52aae3..cf12126 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,17 @@
 # Makefile for the SST2K project
 
-VERS=$(shell sed <sst.py -n -e '/version *= \"*\(.*\)\"/s//\1/p')
+VERS=$(shell sed <sst -n -e '/version *= \"*\(.*\)\"/s//\1/p')
 
 MANDIR=/usr/share/man/man1
 BINDIR=/usr/bin
 
 DOCS    = README COPYING NEWS doc/HACKING doc/sst-doc.xml doc/sst-layer.xsl doc/sst.xml
-SOURCES = sst.py Makefile replay doc/makehelp.py control $(DOCS)
+SOURCES = sst Makefile replay doc/makehelp.py control $(DOCS)
 
-all: sst-$(VERS).tar.gz
+all: super-star-trek-$(VERS).tar.gz
 
 install: sst.6
-	cp sst.py $(BINDIR)
+	cp sst $(BINDIR)
 	gzip <sst.6 >$(MANDIR)/sst.6.gz
 
 sst.6: doc/sst.xml
@@ -28,27 +28,27 @@ super-star-trek-$(VERS).tar.gz: $(SOURCES) sst.6
 
 dist: sst-$(VERS).tar.gz
 
-check: #pylint
-	cd test; make --quiet
+check: pylint
+	@cd test >/dev/null; $(MAKE) --quiet
 
-pychecker:
-	@-pychecker --quiet --only --limit 50 sst.py
+reflow:
+	@black sst
 
-COMMON_PYLINT = --rcfile=/dev/null --reports=n \
-	--msg-template="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}" \
-	--dummy-variables-rgx='^_'
-PYLINTOPTS = $(COMMON_PYLINT) --disable=C0103,C0111,C0113,C1001,C0301,C0302,C0321,C0325,C0326,C0410,E1120,R0101,R0902,R0903,R0911,R0912,R0914,R0915,R0916,W0110,W0123,W0141,W0312,W0603,W0611
 pylint:
-	@pylint --output-format=parseable $(PYLINTOPTS) sst.py
+	@pylint --score=n sst
 
 clean:
-	rm -f sst.6 sst.html
+	rm -f sst.6 sst.html sst-doc.html
 	rm -f *.6 MANIFEST index.html
 
-SHIPPER = version=$(VERS) bkimage=lpt.jpg
+NEWSVERSION=$(shell sed -n <NEWS '/^[0-9]/s/:.*//p' | head -1)
+
+SHIPPER = version=$(VERS) bkgimage=lpt.jpg
 
 release: super-star-trek-$(VERS).tar.gz sst.html sst-doc.html
+	@[ $(VERS) = $(NEWSVERSION) ] || { echo "Version mismatch!"; exit 1; }
 	shipper $(SHIPPER) | sh -e -x
 
 refresh: sst.html
+	@[ $(VERS) = $(NEWSVERSION) ] || { echo "Version mismatch!"; exit 1; }
 	shipper -N -w $(SHIPPER)  | sh -e -x