dmoonfire/dosage
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity

Build fixes

Browse source
This commit is contained in:
Bastian Kleineidam 2012-12-18 18:54:24 +01:00
parent fcb71717f6
commit f84444b27d
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Makefile
View file

@ -63,7 +63,8 @@ homepage:
cp doc/$(LAPPNAME).1.html $(HOMEPAGE)/content cp doc/$(LAPPNAME).1.html $(HOMEPAGE)/content
make -C $(HOMEPAGE) gen make -C $(HOMEPAGE) gen
release: distclean releasecheck dist sign upload homepage tag register release: distclean releasecheck
$(MAKE) dist sign upload homepage tag register deb
tag: tag:
git tag upstream/$(VERSION) git tag upstream/$(VERSION)
@ -79,9 +80,14 @@ releasecheck: check
@if egrep -i "xx\.|xxxx|\.xx" doc/changelog.txt > /dev/null; then \ @if egrep -i "xx\.|xxxx|\.xx" doc/changelog.txt > /dev/null; then \
echo "Could not release: edit doc/changelog.txt release date"; false; \ echo "Could not release: edit doc/changelog.txt release date"; false; \
fi fi
@if [ ! -f ../$(ARCHIVE_WIN32) ]; then \
echo "Missing WIN32 distribution archive at ../$(ARCHIVE_WIN32)"; \
false; \
fi
@if ! grep "Version: $(VERSION)" $(LAPPNAME).freecode > /dev/null; then \ @if ! grep "Version: $(VERSION)" $(LAPPNAME).freecode > /dev/null; then \
echo "Could not release: edit $(LAPPNAME).freecode version"; false; \ echo "Could not release: edit $(LAPPNAME).freecode version"; false; \
fi fi
$(PYTHON) setup.py check --restructuredtext
# The check programs used here are mostly local scripts on my private system. # The check programs used here are mostly local scripts on my private system.
# So for other developers there is no need to execute this target. # So for other developers there is no need to execute this target.
@ -111,7 +117,7 @@ clean:
rm -rf build dist rm -rf build dist
distclean: clean distclean: clean
rm -rf build dist $(APPNAME).egg-info dosage.prof test.sh testresults.txt rm -rf build dist $(APPNAME).egg-info $(LAPPNAME).prof test.sh
rm -f _$(APPNAME)_configdata.py MANIFEST rm -f _$(APPNAME)_configdata.py MANIFEST
localbuild: localbuild:
@ -120,22 +126,17 @@ localbuild:
test: localbuild test: localbuild
env LANG=en_US.utf-8 http_proxy="" $(PYTHON) -m pytest $(PYTESTOPTS) $(TESTOPTS) $(TESTS) env LANG=en_US.utf-8 http_proxy="" $(PYTHON) -m pytest $(PYTESTOPTS) $(TESTOPTS) $(TESTS)
doc/$(LAPPNAME).txt: doc/$(LAPPNAME).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: deb:
# build a debian package # build a debian package
[ -f $(DEBORIGFILE) ] || cp dist/$(ARCHIVE_SOURCE) $(DEBORIGFILE) $(DEBUILDDIR)/$(LAPPNAME)_$(VERSION).orig.tar.gz [ -f $(DEBORIGFILE) ] || cp dist/$(ARCHIVE_SOURCE) $(DEBORIGFILE)
sed -i 's/VERSION:=.*/VERSION:=$(VERSION)/' $(DEBUILDDIR)/$(LAPPNAME).mak sed -i -e 's/VERSION_$(LAPPNAME):=.*/VERSION_$(LAPPNAME):=$(VERSION)/' $(DEBUILDDIR)/$(LAPPNAME).mak
[ -d $(DEBPACKAGEDIR) ] || (cd $(DEBUILDDIR); \ [ -d $(DEBPACKAGEDIR) ] || (cd $(DEBUILDDIR); \
patool extract $(DEBORIGFILE); \ patool extract $(DEBORIGFILE); \
cd $(CURDIR); \ cd $(CURDIR); \
git checkout debian; \ git checkout debian; \
cp -r debian $(DEBPACKAGEDIR); \ cp -r debian $(DEBPACKAGEDIR); \
git checkout master) git checkout master)
rm -f $(DEBUILDDIR)/$(LAPPNAME) $(MAKE) -C $(DEBUILDDIR) $(LAPPNAME)_clean $(LAPPNAME)
$(MAKE) -C $(DEBUILDDIR) $(LAPPNAME)
update-copyright: update-copyright:
# update-copyright is a local tool which updates the copyright year for each # update-copyright is a local tool which updates the copyright year for each

2
doc/changelog.txt
View file

@ -1,4 +1,4 @@
Dosage 1.7 (released xx.xx.2012) Dosage 1.7 (released 18.12.2012)
Features: Features:
- cmdline: Added proper return codes for error conditions. - cmdline: Added proper return codes for error conditions.

3
setup.py
View file

@ -355,8 +355,9 @@ args = dict(
version = AppVersion, version = AppVersion,
description = 'a commandline webcomic downloader and archiver', description = 'a commandline webcomic downloader and archiver',
author = 'Tristan Seligmann, Jonathan Jacobs, Bastian Kleineidam', author = 'Tristan Seligmann, Jonathan Jacobs, Bastian Kleineidam',
author_email = 'bastian.kleineidam@web.de',
maintainer = 'Bastian Kleineidam', maintainer = 'Bastian Kleineidam',
maintainer_email = 'calvin@users.sourceforge.net', maintainer_email = 'bastian.kleineidam@web.de',
license = 'MIT', license = 'MIT',
url = 'https://github.com/wummel/dosage', url = 'https://github.com/wummel/dosage',
packages = ( packages = (