diff options
Diffstat (limited to 'linden/indra/newview/viewer_manifest.py')
-rwxr-xr-x | linden/indra/newview/viewer_manifest.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index fd5af9d..bcdf4a9 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py | |||
@@ -472,13 +472,15 @@ class WindowsManifest(ViewerManifest): | |||
472 | sse_string = "-(SSE2-optimized)" | 472 | sse_string = "-(SSE2-optimized)" |
473 | 473 | ||
474 | version = '.'.join(self.args['version']) | 474 | version = '.'.join(self.args['version']) |
475 | base_filename = self.installer_prefix() + version + sse_string | 475 | version_number = version.split('-', 1)[0] |
476 | base_filename = self.installer_prefix() + version + "-Windows-x86" + sse_string | ||
476 | app_name = self.channel() | 477 | app_name = self.channel() |
477 | app_ver_name="%s %s" % (app_name, version) | 478 | app_ver_name="%s %s" % (app_name, version) |
478 | 479 | ||
479 | new_script = base_filename + ".iss" | 480 | new_script = base_filename + ".iss" |
480 | self.replace_in("installers/windows/imprudence_installer_template.iss", new_script, { | 481 | self.replace_in("installers/windows/imprudence_installer_template.iss", new_script, { |
481 | "%%VERSION%%":version, | 482 | "%%VERSION%%":version, |
483 | "%%VERSIONNUMBER%%":version_number, | ||
482 | "%%INSTALLERFILENAME%%":base_filename, | 484 | "%%INSTALLERFILENAME%%":base_filename, |
483 | "%%PACKAGEFILES%%":self.args['dest'], | 485 | "%%PACKAGEFILES%%":self.args['dest'], |
484 | "%%APPNAME%%":app_name, | 486 | "%%APPNAME%%":app_name, |