Permalink
Browse files

Add readable version to header of breeder output

1 parent 463706e commit d68449c9ba8808371078189a95dd713cb8aeeb17 Bjarni R. Einarsson committed May 9, 2012
Showing with 12 additions and 9 deletions.
  1. +11 −8 Makefile
  2. +1 −1 doc/header.txt
View
@@ -20,8 +20,8 @@ BREED_PAGEKITE = pagekite/__init__.py \
pagekite/pk.py \
-combined: pagekite tools dev
- @./scripts/breeder.py --compress --header doc/header.txt \
+combined: pagekite tools dev .header
+ @./scripts/breeder.py --compress --header .header \
sockschain $(BREED_PAGEKITE) \
pagekite/__main__.py \
>pagekite-tmp.py
@@ -33,17 +33,17 @@ combined: pagekite tools dev
@mv pagekite-tmp.py dist/pagekite-`python setup.py --version`.py
@ls -l dist/pagekite-*.py
-gtk: pagekite tools dev
- @./scripts/breeder.py --gtk-images --compress --header doc/header.txt \
+gtk: pagekite tools dev .header
+ @./scripts/breeder.py --gtk-images --compress --header .header \
sockschain $(BREED_PAGEKITE) gui \
pagekite_gtk.py \
>pagekite-tmp.py
@chmod +x pagekite-tmp.py
@mv pagekite-tmp.py dist/pagekite-gtk-`python setup.py --version`.py
@ls -l dist/pagekite-*.py
-android: pagekite tools
- @./scripts/breeder.py --compress --header doc/header.txt \
+android: pagekite tools .header
+ @./scripts/breeder.py --compress --header .header \
sockschain $(BREED_PAGEKITE) \
pagekite/android.py \
>pagekite-tmp.py
@@ -79,7 +79,6 @@ rpm_el6-fc13:
--pre-uninstall=rpm/rpm-preun.sh \
--requires=python-SocksipyChain
-
VERSION=`python setup.py --version`
.debprep:
@rm -f setup.cfg
@@ -104,6 +103,10 @@ VERSION=`python setup.py --version`
@mv ../pagekite_*.deb dist/
@rm ../pagekite-$(VERSION)*
+.header: pagekite doc/header.txt
+ @sed -e "s/@VERSION@/$(VERSION)/g" \
+ < doc/header.txt >.header
+
test: dev
@./scripts/blackbox-test.sh ./pk
@./scripts/blackbox-test.sh ./pk --nopyopenssl
@@ -133,7 +136,7 @@ distclean: clean
clean:
@rm -vf sockschain *.pyc */*.pyc */*/*.pyc scripts/breeder.py .SELF
@rm -vf .appver pagekite-tmp.py MANIFEST setup.cfg pagekite_gtk.py
- @rm -vrf *.egg-info build/
+ @rm -vrf *.egg-info .header build/
@rm -vf debian/files debian/control debian/copyright debian/changelog
@rm -vrf debian/pagekite* debian/python* debian/init.d
View
@@ -1,7 +1,7 @@
# WARNING: This file is a combination of multiple Python files.
# The source code lives here: http://pagekite.org/
#
-# This file is part of pagekite.py.
+# This file is part of pagekite.py (version @VERSION@)
# Copyright 2010-2012, the Beanstalks Project ehf. and Bjarni Runar Einarsson
#
# This program is free software: you can redistribute it and/or modify it under

0 comments on commit d68449c

Please sign in to comment.