diff --git a/.gitignore b/.gitignore index b053649..7b9da97 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,4 @@ Changelog.patool* /doc/README.md /testresults.txt /tests/__pycache__ -/_Patool_configdata.py +/_patool_configdata.py diff --git a/Makefile b/Makefile index 58b3df2..1a010de 100644 --- a/Makefile +++ b/Makefile @@ -4,16 +4,15 @@ VERSION:=$(shell $(PYTHON) setup.py --version) MAINTAINER:=$(shell $(PYTHON) setup.py --maintainer) AUTHOR:=$(shell $(PYTHON) setup.py --author) APPNAME:=$(shell $(PYTHON) setup.py --name) -LAPPNAME:=$(shell echo $(APPNAME)|tr "[A-Z]" "[a-z]") -ARCHIVE_SOURCE:=$(LAPPNAME)-$(VERSION).tar.gz -ARCHIVE_WIN32:=$(LAPPNAME)-$(VERSION).exe +ARCHIVE_SOURCE:=$(APPNAME)-$(VERSION).tar.gz +ARCHIVE_WIN32:=$(APPNAME)-$(VERSION).exe GITUSER:=wummel -GITREPO:=$(LAPPNAME) +GITREPO:=$(APPNAME) HOMEPAGE:=$(HOME)/public_html/patool-webpage.git WEBMETA:=doc/web/app.yaml DEBUILDDIR:=$(HOME)/projects/debian/official -DEBORIGFILE:=$(DEBUILDDIR)/$(LAPPNAME)_$(VERSION).orig.tar.gz -DEBPACKAGEDIR:=$(DEBUILDDIR)/$(LAPPNAME)-$(VERSION) +DEBORIGFILE:=$(DEBUILDDIR)/$(APPNAME)_$(VERSION).orig.tar.gz +DEBPACKAGEDIR:=$(DEBUILDDIR)/$(APPNAME)-$(VERSION) # Pytest options: # --resultlog: write test results in file # -s: do not capture stdout/stderr (some tests fail otherwise) @@ -28,7 +27,8 @@ all: dist: [ -d dist ] || mkdir dist - git archive --format=tar --prefix=$(LAPPNAME)-$(VERSION)/ HEAD | gzip -9 > dist/$(ARCHIVE_SOURCE) + $(PYTHON) setup.py sdist --formats=tar + gzip --best dist/$(APPNAME)-$(VERSION).tar [ ! -f ../$(ARCHIVE_WIN32) ] || cp ../$(ARCHIVE_WIN32) dist sign: @@ -44,15 +44,16 @@ upload_binary: cp dist/$(ARCHIVE_WIN32) dist/$(ARCHIVE_WIN32).asc \ $(HOMEPAGE)/dist -homepage: +update_webmeta: # update metadata @echo "version: \"$(VERSION)\"" > $(WEBMETA) @echo "name: \"$(APPNAME)\"" >> $(WEBMETA) - @echo "lname: \"$(LAPPNAME)\"" >> $(WEBMETA) @echo "maintainer: \"$(MAINTAINER)\"" >> $(WEBMETA) @echo "author: \"$(AUTHOR)\"" >> $(WEBMETA) git add $(WEBMETA) git cm "Updated web meta data." + +homepage: update_webmeta # relase website $(MAKE) -C doc/web release @@ -71,7 +72,7 @@ register: @echo "Register at Python Package Index..." $(PYTHON) setup.py register @echo "Submitting to freecode.org..." - freecode-submit < $(LAPPNAME).freecode + freecode-submit < $(APPNAME).freecode releasecheck: test check @if egrep -i "xx\.|xxxx|\.xx" doc/changelog.txt > /dev/null; then \ @@ -81,8 +82,8 @@ releasecheck: test check echo "Missing WIN32 distribution archive at ../$(ARCHIVE_WIN32)"; \ false; \ fi - @if ! grep "Version: $(VERSION)" $(LAPPNAME).freecode > /dev/null; then \ - echo "Could not release: edit $(LAPPNAME).freecode version"; false; \ + @if ! grep "Version: $(VERSION)" $(APPNAME).freecode > /dev/null; then \ + echo "Could not release: edit $(APPNAME).freecode version"; false; \ fi $(PYTHON) setup.py check --restructuredtext @@ -119,14 +120,14 @@ localbuild: test: localbuild $(PYTHON) -m pytest $(PYTESTOPTS) $(TESTOPTS) $(TESTS) -doc/$(LAPPNAME).txt: doc/$(LAPPNAME).1 +doc/$(APPNAME).txt: doc/$(APPNAME).1 # make text file from man page for Windows builds cols=`stty size | cut -d" " -f2`; stty cols 72; man -l $< | sed -e 's/.\cH//g' > $@; stty cols $$cols deb: # build a debian package [ -f $(DEBORIGFILE) ] || cp dist/$(ARCHIVE_SOURCE) $(DEBORIGFILE) - sed -i -e 's/VERSION_$(LAPPNAME):=.*/VERSION_$(LAPPNAME):=$(VERSION)/' $(DEBUILDDIR)/$(LAPPNAME).mak + sed -i -e 's/VERSION_$(APPNAME):=.*/VERSION_$(LAPPNAME):=$(VERSION)/' $(DEBUILDDIR)/$(LAPPNAME).mak [ -d $(DEBPACKAGEDIR) ] || (cd $(DEBUILDDIR); \ patool extract $(DEBORIGFILE); \ cd $(CURDIR); \ @@ -134,7 +135,7 @@ deb: cp -r debian $(DEBPACKAGEDIR); \ rm -f $(DEBPACKAGEDIR)/debian/.gitignore; \ git checkout master) - $(MAKE) -C $(DEBUILDDIR) $(LAPPNAME)_clean $(LAPPNAME) + $(MAKE) -C $(DEBUILDDIR) $(APPNAME)_clean $(APPNAME) update-copyright: # update-copyright is a local tool which updates the copyright year for each diff --git a/doc/web/app.yaml b/doc/web/app.yaml index 9551d96..375bc6f 100644 --- a/doc/web/app.yaml +++ b/doc/web/app.yaml @@ -1,5 +1,4 @@ version: "1.6" -name: "Patool" -lname: "patool" +name: "patool" maintainer: "Bastian Kleineidam" author: "Bastian Kleineidam" diff --git a/doc/web/templates/default.html b/doc/web/templates/default.html index 2c0289c..cdad7f8 100644 --- a/doc/web/templates/default.html +++ b/doc/web/templates/default.html @@ -7,12 +7,12 @@
- {{site.app.lname}}-{{site.app.version}}.tar.gz - {{site.app.name}}-{{site.app.version}}.tar.gz + {{site.app.lname}}-{{site.app.version}}.exe + id="download-exe" class="button">{{site.app.name}}-{{site.app.version}}.exe View on GitHub