diff options
| author | Jacek Antonelli | 2008-12-17 01:24:37 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2008-12-17 01:24:37 -0600 |
| commit | a3b0b6c299f791b3d8132d36a3d4c1790aea86b1 (patch) | |
| tree | 07d9080e0f71845fdf07f666907422b2fe6c4a3f /linden/scripts/build_version.py | |
| parent | Use NType to find inventory icon name (part 2 of 2). (diff) | |
| parent | VWR-1582: Local ruler mode wrong for linked objects. (diff) | |
| download | meta-impy-a3b0b6c299f791b3d8132d36a3d4c1790aea86b1.zip meta-impy-a3b0b6c299f791b3d8132d36a3d4c1790aea86b1.tar.gz meta-impy-a3b0b6c299f791b3d8132d36a3d4c1790aea86b1.tar.bz2 meta-impy-a3b0b6c299f791b3d8132d36a3d4c1790aea86b1.tar.xz | |
Merge 1.1.0 alpha into quickfilter
Diffstat (limited to 'linden/scripts/build_version.py')
| -rwxr-xr-x | linden/scripts/build_version.py | 4 |
1 files changed, 3 insertions, 1 deletions
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 |