X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=inline;f=Makefile;h=c1d66853f318db52f2472e294dc14f72a20e7723;hb=832318cab6ea2c0875a956efd67731b165aee5a1;hp=36e5a7c2f56231997306ecac348a3df361317fbe;hpb=37f48d7da8e959ff6e0baeffb2425e13e260ad3d;p=super-star-trek.git

diff --git a/Makefile b/Makefile
index 36e5a7c..c1d6685 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,25 +20,21 @@ 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
 
 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
+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,R1706,R1710,W0110,W0123,W0141,W0312,W0603,W0611
 pylint:
 	@pylint --output-format=parseable $(PYLINTOPTS) sst.py
 
@@ -46,10 +42,10 @@ clean:
 	rm -f sst.6 sst.html
 	rm -f *.6 MANIFEST index.html
 
-release: sst-$(VERS).tar.gz sst.html
-	shipper version=$(VERS) | sh -e -x
-	cd www; upload
+SHIPPER = version=$(VERS) bkgimage=lpt.jpg
+
+release: super-star-trek-$(VERS).tar.gz sst.html sst-doc.html
+	shipper $(SHIPPER) | sh -e -x
 
 refresh: sst.html
-	shipper -N -w version=$(VERS) | sh -e -x
-	cd www; upload
+	shipper -N -w $(SHIPPER)  | sh -e -x