diff options
-rw-r--r-- | ChangeLog.txt | 5 | ||||
-rwxr-xr-x | linden/scripts/build_version.py | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 4c601cf..724a49c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,5 +1,10 @@ | |||
1 | 2008-12-13 Jacek Antonelli <jacek.antonelli@gmail.com> | 1 | 2008-12-13 Jacek Antonelli <jacek.antonelli@gmail.com> |
2 | 2 | ||
3 | * linden/scripts/build_version.py: | ||
4 | Version string generator now includes test label. | ||
5 | This is used for naming packages on Linux, among other things. | ||
6 | |||
7 | |||
3 | * linden/indra/llcommon/llversionviewer.h: | 8 | * linden/indra/llcommon/llversionviewer.h: |
4 | Bumped version to 1.1.0 alpha. | 9 | Bumped version to 1.1.0 alpha. |
5 | 10 | ||
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): | |||
26 | vals['minor'] = m.group(1) | 26 | vals['minor'] = m.group(1) |
27 | m = re.search('const S32 IMP_VERSION_PATCH = (\d+);', data) | 27 | m = re.search('const S32 IMP_VERSION_PATCH = (\d+);', data) |
28 | vals['patch'] = m.group(1) | 28 | vals['patch'] = m.group(1) |
29 | m = re.search('const char \* const IMP_VERSION_TEST = "(.+)";', data) | ||
30 | vals['test'] = m.group(1) | ||
29 | 31 | ||
30 | return "%(major)s.%(minor)s.%(patch)s" % vals | 32 | return "%(major)s.%(minor)s.%(patch)s-%(test)s" % vals |
31 | 33 | ||
32 | if __name__ == '__main__': | 34 | if __name__ == '__main__': |
33 | import sys | 35 | import sys |