X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=27f0ad022452f877dbb83e81a641acdebf496d60;hb=1e017ab4b7503ad5d8c8b40161ede483cf1ec07c;hp=f85b3376950fcf6a5479cd84a83c0257f4d0ef3e;hpb=0e91d76d5d2dd36b5c650e25ccd4fa806de3a55b;p=super-star-trek.git

diff --git a/Makefile b/Makefile
index f85b337..27f0ad0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Makefile for the SST2K project
 
-VERS=$(shell sed <sst.py -n -e '/version=\(.*\)/s//\1/p')
+VERS=$(shell sed <sst.py -n -e '/version *= \"*\(.*\)\"/s//\1/p')
 
 MANDIR=/usr/share/man/man1
 BINDIR=/usr/bin
@@ -8,7 +8,7 @@ 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)
 
-all: sst-$(VERS).tar.gz
+all: super-star-trek-$(VERS).tar.gz
 
 install: sst.6
 	cp sst.py $(BINDIR)
@@ -20,29 +20,32 @@ sst.6: doc/sst.xml
 sst.html: doc/sst.xml
 	cd doc; xmlto html-nochunks sst.xml; mv sst.html ..
 
-sst-$(VERS).tar.gz: $(SOURCES) sst.6
-	mkdir sst-$(VERS)
-	cp $(SOURCES) sst-$(VERS)
-	tar -czf sst-$(VERS).tar.gz sst-$(VERS)
-	rm -fr sst-$(VERS)
-	ls -l sst-$(VERS).tar.gz
+sst-doc.html: doc/sst-doc.xml
+	xmlto xhtml-nochunks doc/sst-doc.xml
+
+super-star-trek-$(VERS).tar.gz: $(SOURCES) sst.6
+	tar --transform='s:^:super-star-trek-$(VERS)/:' --show-transformed-names -cvzf super-star-trek-$(VERS).tar.gz $(SOURCES) sst.6
 
 dist: sst-$(VERS).tar.gz
 
 check: #pylint
-	cd test; make --quiet
-
-pychecker:
-	@-pychecker --quiet --only --limit 50 sst.py
+	cd test; $(MAKE) --quiet
 
-PYLINTOPTS = --rcfile=/dev/null --reports=n --include-ids=y --disable=C0103,C0111,C0301,C0302,C0321,R0902,R0903,R0911,R0912,R0914,R0915,W0312,W0603
+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,C1801,E1120,R0101,R0902,R0903,R0911,R0912,R0914,R0915,R0916,R1705,R1711,R1714,R1716,R1723,R1724,R1706,R1710,W0110,W0123,W0141,W0232,W0312,W0603,W0611
 pylint:
 	@pylint --output-format=parseable $(PYLINTOPTS) sst.py
 
 clean:
 	rm -f sst.6 sst.html
-	rm -f *.6 MANIFEST index.html SHIPPER.*
+	rm -f *.6 MANIFEST index.html
+
+SHIPPER = version=$(VERS) bkgimage=lpt.jpg
+
+release: super-star-trek-$(VERS).tar.gz sst.html sst-doc.html
+	shipper $(SHIPPER) | sh -e -x
 
-release: sst-$(VERS).tar.gz sst.html
-	shipper -u -t; make clean
-	cd www; upload
+refresh: sst.html
+	shipper -N -w $(SHIPPER)  | sh -e -x