Skip to content

Commit

Permalink
Use git to generate version info instead of bzr.
Browse files Browse the repository at this point in the history
Instead of bzr version-info --python, use git describe --tags. We drop
the build date here because it wasn't current anyway (it was only
updated when the bzr version changed).
  • Loading branch information
tornewuff committed Nov 6, 2012
1 parent a43e6ee commit 90bff62
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
4 changes: 2 additions & 2 deletions seeds/pycorn/Makeppfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ $(phony always):

ifndef USE_BINARIES
stamp-version: always
bzr version-info --custom --template "{date} {revno} {revision_id} {branch_nick}" > stamp-version
git rev-parse HEAD > $(output)

frozen/bootstrap/version.py: stamp-version : signature md5
bzr version-info --python > $(output)
&printf -f -o $(output) "GIT_VERSION = '%s'\\n" $(shell git describe --tags)

frozen.c: freeze.py $(FREEZEDEPS)
$(PYTHON) freeze.py $(output) $(FREEZEDIRS)
Expand Down
5 changes: 2 additions & 3 deletions seeds/pycorn/frozen/bootstrap/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@
from _metalmem import membuf

from bootstrap.mini_zipimport import MiniZipImport
from bootstrap.version import version_info
from bootstrap.version import GIT_VERSION

# Print version info/banner
print 'Pycorn r%s' % version_info['revno'], '(Python %s.%s.%s)' % sys.version_info[0:3],
print '(built %s)' % version_info['build_date']
print 'Pycorn %s' % GIT_VERSION, '(Python %s.%s.%s)' % sys.version_info[0:3]

# Clear existing path, which is useless
del sys.path[:]
Expand Down

0 comments on commit 90bff62

Please sign in to comment.