diff options
Diffstat (limited to 'linden/indra/lib')
-rw-r--r-- | linden/indra/lib/python/indra/util/llmanifest.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/linden/indra/lib/python/indra/util/llmanifest.py b/linden/indra/lib/python/indra/util/llmanifest.py index 59c84e5..369cc81 100644 --- a/linden/indra/lib/python/indra/util/llmanifest.py +++ b/linden/indra/lib/python/indra/util/llmanifest.py | |||
@@ -81,10 +81,11 @@ def get_default_version(srctree): | |||
81 | for p in paths: | 81 | for p in paths: |
82 | if os.path.exists(p): | 82 | if os.path.exists(p): |
83 | contents = open(p, 'r').read() | 83 | contents = open(p, 'r').read() |
84 | major = re.search("LL_VERSION_MAJOR\s=\s([0-9]+)", contents).group(1) | 84 | major = re.search("IMP_VERSION_MAJOR\s=\s([0-9]+)", contents).group(1) |
85 | minor = re.search("LL_VERSION_MINOR\s=\s([0-9]+)", contents).group(1) | 85 | minor = re.search("IMP_VERSION_MINOR\s=\s([0-9]+)", contents).group(1) |
86 | patch = re.search("LL_VERSION_PATCH\s=\s([0-9]+)", contents).group(1) | 86 | patch = re.search("IMP_VERSION_PATCH\s=\s([0-9]+)", contents).group(1) |
87 | build = re.search("LL_VERSION_BUILD\s=\s([0-9]+)", contents).group(1) | 87 | #build = re.search("LL_VERSION_BUILD\s=\s([0-9]+)", contents).group(1) |
88 | build = re.search('const char \* const IMP_VERSION_TEST = "(.*)";', contents).group(1) | ||
88 | return major, minor, patch, build | 89 | return major, minor, patch, build |
89 | 90 | ||
90 | def get_channel(srctree): | 91 | def get_channel(srctree): |
@@ -98,7 +99,7 @@ def get_channel(srctree): | |||
98 | 99 | ||
99 | 100 | ||
100 | DEFAULT_SRCTREE = os.path.dirname(sys.argv[0]) | 101 | DEFAULT_SRCTREE = os.path.dirname(sys.argv[0]) |
101 | DEFAULT_CHANNEL = 'Second Life Release' | 102 | DEFAULT_CHANNEL = 'Imprudence' |
102 | 103 | ||
103 | ARGUMENTS=[ | 104 | ARGUMENTS=[ |
104 | dict(name='actions', | 105 | dict(name='actions', |
@@ -156,7 +157,7 @@ ARGUMENTS=[ | |||
156 | for use by a .bat file.""", | 157 | for use by a .bat file.""", |
157 | default=None), | 158 | default=None), |
158 | dict(name='version', | 159 | dict(name='version', |
159 | description="""This specifies the version of Second Life that is | 160 | description="""This specifies the version of Imprudence that is |
160 | being packaged up.""", | 161 | being packaged up.""", |
161 | default=get_default_version) | 162 | default=get_default_version) |
162 | ] | 163 | ] |