mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2024-12-19 04:57:54 +00:00
grand unified version numbers
Now the allmydata python package, the setup.py script, and the debian packages all get their tahoe version number from the same place.
This commit is contained in:
parent
7802fa96c9
commit
40e1c4be71
@ -175,13 +175,13 @@ create_dirs:
|
|||||||
mkdir -p client-basedir/storage
|
mkdir -p client-basedir/storage
|
||||||
mkdir -p client-basedir2/storage
|
mkdir -p client-basedir2/storage
|
||||||
|
|
||||||
DEBVER=`head -1 debian/changelog | sed -e 's/^[^(]*(\([^)]*\)).*$$/\1/' | sed -e 's/^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*$$/\1/'`
|
VER=$(shell python -c "import os,re;print re.search(\"verstr=['\\\"](.*?)['\\\"]\", open(os.path.join('src', 'allmydata', '__init__.py')).readline()).group(1)")
|
||||||
DEBSTRING=$(DEBVER)-T`date +%s`
|
DEBSTRING=$(VER)-T`date +%s`
|
||||||
DEBCOMMENTS="'make deb' build"
|
DEBCOMMENTS="'make deb' build"
|
||||||
|
|
||||||
show:
|
show:
|
||||||
echo $(DEBVER)
|
@echo $(VER)
|
||||||
echo $(DEBSTRING)
|
@echo $(DEBSTRING)
|
||||||
|
|
||||||
.PHONY: setup-dapper setup-sid setup-edgy setup-feisty
|
.PHONY: setup-dapper setup-sid setup-edgy setup-feisty
|
||||||
.PHONY: deb-dapper deb-sid deb-edgy deb-feisty
|
.PHONY: deb-dapper deb-sid deb-edgy deb-feisty
|
||||||
|
8
setup.py
8
setup.py
@ -55,8 +55,14 @@ trove_classifiers=[
|
|||||||
"Topic :: System :: Archiving",
|
"Topic :: System :: Archiving",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
import re
|
||||||
|
VSRE=re.compile("verstr=['\"]([^'\"]*)['\"]")
|
||||||
|
verstrline=open("src/allmydata/__init__.py").readline()
|
||||||
|
mo = VSRE.search(verstrline)
|
||||||
|
verstr = mo.group(1)
|
||||||
|
|
||||||
setup(name='allmydata-tahoe',
|
setup(name='allmydata-tahoe',
|
||||||
version='0.2.0b1',
|
version=verstr,
|
||||||
description='secure, distributed storage grid',
|
description='secure, distributed storage grid',
|
||||||
long_description="""Welcome to the AllMyData "tahoe" project. This project implements a
|
long_description="""Welcome to the AllMyData "tahoe" project. This project implements a
|
||||||
secure, distributed, fault-tolerant storage grid.
|
secure, distributed, fault-tolerant storage grid.
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
|
verstr="0.2.0b1-0-UNSTABLE"
|
||||||
|
# The line is placed above so that it can be easily read by build scripts.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
Decentralized storage grid.
|
Decentralized storage grid.
|
||||||
|
|
||||||
@ -10,7 +13,7 @@ from util.version import Version
|
|||||||
|
|
||||||
# For an explanation of what the parts of the version string mean,
|
# For an explanation of what the parts of the version string mean,
|
||||||
# please see pyutil.version.
|
# please see pyutil.version.
|
||||||
__version__ = Version("0.2.0b1-0-UNSTABLE")
|
__version__ = Version(verstr)
|
||||||
|
|
||||||
# Please put a URL or other note here which shows where to get the branch of
|
# Please put a URL or other note here which shows where to get the branch of
|
||||||
# development from which this version grew.
|
# development from which this version grew.
|
||||||
|
Loading…
Reference in New Issue
Block a user