From abeaf736d06c57f28f19360f3be202bae75f1da2 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 13 Dec 2008 22:53:52 -0600 Subject: Version string generator now includes test label. This is used for naming packages on Linux, among other things. --- ChangeLog.txt | 5 +++++ linden/scripts/build_version.py | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 4c601cf..724a49c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,10 @@ 2008-12-13 Jacek Antonelli + * linden/scripts/build_version.py: + Version string generator now includes test label. + This is used for naming packages on Linux, among other things. + + * linden/indra/llcommon/llversionviewer.h: Bumped version to 1.1.0 alpha. diff --git a/linden/scripts/build_version.py b/linden/scripts/build_version.py index 46587e8..3d66a65 100755 --- a/linden/scripts/build_version.py +++ b/linden/scripts/build_version.py @@ -26,8 +26,10 @@ def get_version(filename): vals['minor'] = m.group(1) m = re.search('const S32 IMP_VERSION_PATCH = (\d+);', data) vals['patch'] = m.group(1) + m = re.search('const char \* const IMP_VERSION_TEST = "(.+)";', data) + vals['test'] = m.group(1) - return "%(major)s.%(minor)s.%(patch)s" % vals + return "%(major)s.%(minor)s.%(patch)s-%(test)s" % vals if __name__ == '__main__': import sys -- cgit v1.1