From d744b13b174595be7bd5eab748b2201d54f7d036 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sat, 9 Jan 2010 09:13:14 -0700 Subject: Fixed viewer_manifest.py and default packaging system for Windows (NSIS install script only works manually) --- linden/indra/lib/python/indra/util/llmanifest.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'linden/indra/lib') 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): for p in paths: if os.path.exists(p): contents = open(p, 'r').read() - major = re.search("LL_VERSION_MAJOR\s=\s([0-9]+)", contents).group(1) - minor = re.search("LL_VERSION_MINOR\s=\s([0-9]+)", contents).group(1) - patch = re.search("LL_VERSION_PATCH\s=\s([0-9]+)", contents).group(1) - build = re.search("LL_VERSION_BUILD\s=\s([0-9]+)", contents).group(1) + major = re.search("IMP_VERSION_MAJOR\s=\s([0-9]+)", contents).group(1) + minor = re.search("IMP_VERSION_MINOR\s=\s([0-9]+)", contents).group(1) + patch = re.search("IMP_VERSION_PATCH\s=\s([0-9]+)", contents).group(1) + #build = re.search("LL_VERSION_BUILD\s=\s([0-9]+)", contents).group(1) + build = re.search('const char \* const IMP_VERSION_TEST = "(.*)";', contents).group(1) return major, minor, patch, build def get_channel(srctree): @@ -98,7 +99,7 @@ def get_channel(srctree): DEFAULT_SRCTREE = os.path.dirname(sys.argv[0]) -DEFAULT_CHANNEL = 'Second Life Release' +DEFAULT_CHANNEL = 'Imprudence' ARGUMENTS=[ dict(name='actions', @@ -156,7 +157,7 @@ ARGUMENTS=[ for use by a .bat file.""", default=None), dict(name='version', - description="""This specifies the version of Second Life that is + description="""This specifies the version of Imprudence that is being packaged up.""", default=get_default_version) ] -- cgit v1.1