From a6a2efa340b0d4c8e071e9be7fc4a375d55c5c27 Mon Sep 17 00:00:00 2001
From: Steven Walter <stevenrwalter@gmail.com>
Date: Sat, 9 Aug 2008 12:41:11 -0400
Subject: [PATCH] cmd_version: use an autogenerated version

---
 .gitignore | 1 +
 Makefile   | 2 +-
 setup.py   | 9 ++++++++-
 yap.py     | 6 +++++-
 yap/yap.py | 2 +-
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index c3ba1b2..cb206c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .*.swp
 *.pyc
+yap.bin
 build
diff --git a/Makefile b/Makefile
index c63ae67..68c19a8 100644
--- a/Makefile
+++ b/Makefile
@@ -7,4 +7,4 @@ all:
 install:
 	python setup.py install --prefix=$(PREFIX) --install-lib=$(PREFIX)/lib/yap
 	mkdir -p $(PREFIX)/bin
-	install -m755 yap.py $(PREFIX)/bin/yap
+	install -m755 yap.bin $(PREFIX)/bin/yap
diff --git a/setup.py b/setup.py
index ab1e79d..32888ae 100644
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,15 @@
 #!/usr/bin/env python
 
 from distutils.core import setup
+import os
+import sys
 
-vers = '0.1'
+if sys.version[0] < 2 or sys.version[1] < 3:
+    print >> sys.stderr, "Python 2.3 or better required"
+    os.exit(1)
+
+vers = os.popen("git describe --tags HEAD").readline().strip()
+os.system("cat yap.py | sed -e 's/__VERSION__/%s/' > yap.bin" % vers)
 
 setup(name='Yap',
       version=vers,
diff --git a/yap.py b/yap.py
index 4b8d6c7..95d68f6 100644
--- a/yap.py
+++ b/yap.py
@@ -3,6 +3,8 @@
 import sys
 import os
 
+version = '__VERSION__'
+
 if sys.version[0] < 2 or sys.version[1] < 3:
     print >> sys.stderr, "Python 2.3 or better required"
     os.exit(1)
@@ -11,4 +13,6 @@ dir = os.path.dirname(os.path.dirname(sys.argv[0]))
 sys.path.insert(0, os.path.join(dir, 'lib', 'yap'))
 
 import yap
-yap.yap.Yap().main(sys.argv[1:])
+x = yap.yap.Yap()
+x.version = version
+x.main(sys.argv[1:])
diff --git a/yap/yap.py b/yap/yap.py
index 26d8457..5d2422d 100644
--- a/yap/yap.py
+++ b/yap/yap.py
@@ -575,7 +575,7 @@ operation.
 
     @short_help("report the current version of yap")
     def cmd_version(self):
-        print "Yap version 0.1"
+        print "Yap version %s" % self.version
 
     @short_help("show the changelog for particular versions or files")
     @long_help("""
-- 
2.11.4.GIT