diff options
author | David Walter Seikel | 2013-04-17 18:59:49 +1000 |
---|---|---|
committer | David Walter Seikel | 2013-04-17 18:59:49 +1000 |
commit | 36d8bf7016074981ba0efc5ab4767840cc96e8b1 (patch) | |
tree | ea538a8a87f39331a26bf49334e771a0da3dc577 | |
parent | Random white space clean ups. In Python! Yes, be scared. B-) (diff) | |
download | meta-impy-36d8bf7016074981ba0efc5ab4767840cc96e8b1.zip meta-impy-36d8bf7016074981ba0efc5ab4767840cc96e8b1.tar.gz meta-impy-36d8bf7016074981ba0efc5ab4767840cc96e8b1.tar.bz2 meta-impy-36d8bf7016074981ba0efc5ab4767840cc96e8b1.tar.xz |
Fix up Windows installer, and make it more consistant with other OSes.
-rw-r--r-- | linden/indra/newview/installers/windows/imprudence_installer_template.iss | 20 | ||||
-rwxr-xr-x | linden/indra/newview/viewer_manifest.py | 4 |
2 files changed, 13 insertions, 11 deletions
diff --git a/linden/indra/newview/installers/windows/imprudence_installer_template.iss b/linden/indra/newview/installers/windows/imprudence_installer_template.iss index 558b7ec..7113368 100644 --- a/linden/indra/newview/installers/windows/imprudence_installer_template.iss +++ b/linden/indra/newview/installers/windows/imprudence_installer_template.iss | |||
@@ -15,9 +15,9 @@ DefaultDirName={pf}\Imprudence | |||
15 | DefaultGroupName=Imprudence Viewer | 15 | DefaultGroupName=Imprudence Viewer |
16 | VersionInfoProductName=%%APPNAME%% | 16 | VersionInfoProductName=%%APPNAME%% |
17 | OutputBaseFilename=%%INSTALLERFILENAME%% | 17 | OutputBaseFilename=%%INSTALLERFILENAME%% |
18 | VersionInfoVersion=%%VERSION%% | 18 | VersionInfoVersion=%%VERSIONNUMBER%% |
19 | VersionInfoTextVersion=%%VERSION%% | 19 | VersionInfoTextVersion=%%VERSION%% |
20 | VersionInfoProductVersion=%%VERSION%% | 20 | VersionInfoProductVersion=%%VERSIONNUMBER%% |
21 | AppVersion=%%VERSION%% | 21 | AppVersion=%%VERSION%% |
22 | VersionInfoCopyright=2011 | 22 | VersionInfoCopyright=2011 |
23 | 23 | ||
@@ -27,16 +27,16 @@ AppPublisher=The Imprudence Project | |||
27 | AppPublisherURL=http://kokuaviewer.org | 27 | AppPublisherURL=http://kokuaviewer.org |
28 | AppSupportURL=http://kokuaviewer.org | 28 | AppSupportURL=http://kokuaviewer.org |
29 | AllowNoIcons=true | 29 | AllowNoIcons=true |
30 | InfoAfterFile=..\..\..\..\..\..\README.txt | 30 | InfoAfterFile=..\..\..\..\..\README.txt |
31 | OutputDir=. | 31 | OutputDir=. |
32 | SetupIconFile=..\..\..\..\newview\installers\windows\imp_icon.ico | 32 | SetupIconFile=..\..\..\newview\installers\windows\imp_icon.ico |
33 | Compression=lzma2/ultra64 | 33 | Compression=lzma2/ultra64 |
34 | InternalCompressLevel=ultra64 | 34 | InternalCompressLevel=ultra64 |
35 | SolidCompression=true | 35 | SolidCompression=true |
36 | PrivilegesRequired=poweruser | 36 | PrivilegesRequired=poweruser |
37 | AllowRootDirectory=true | 37 | AllowRootDirectory=true |
38 | WizardImageFile=..\..\..\..\newview\installers\windows\imprudence_installer_icon_left.bmp | 38 | WizardImageFile=..\..\..\newview\installers\windows\imprudence_installer_icon_left.bmp |
39 | WizardSmallImageFile=..\..\..\..\newview\installers\windows\imprudence_installer_icon_right.bmp | 39 | WizardSmallImageFile=..\..\..\newview\installers\windows\imprudence_installer_icon_right.bmp |
40 | SetupLogging=true | 40 | SetupLogging=true |
41 | RestartIfNeededByRun=false | 41 | RestartIfNeededByRun=false |
42 | AlwaysRestart=false | 42 | AlwaysRestart=false |
@@ -145,9 +145,9 @@ Source: %%PACKAGEFILES%%\vivoxsdk.dll; DestDir: {app}; Flags: ignoreversion | |||
145 | Source: %%PACKAGEFILES%%\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion | 145 | Source: %%PACKAGEFILES%%\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion |
146 | 146 | ||
147 | ; VC++ 2005 SP1 x86, VC++ 2008 SP1 x86, and VC++ 2010 SP1 x86 redist | 147 | ; VC++ 2005 SP1 x86, VC++ 2008 SP1 x86, and VC++ 2010 SP1 x86 redist |
148 | Source: ..\..\..\..\newview\installers\windows\vcredist_x86_VS2005_SP1_MFC_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2005_SP1_MFC_SEC.exe | 148 | Source: ..\..\..\newview\installers\windows\vcredist_x86_VS2005_SP1_MFC_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2005_SP1_MFC_SEC.exe |
149 | ;Source: ..\..\..\..\newview\installers\windows\vcredist_x86_VS2008_SP1_ATL_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2008_SP1_ATL_SEC.exe | 149 | ;Source: ..\..\..\newview\installers\windows\vcredist_x86_VS2008_SP1_ATL_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2008_SP1_ATL_SEC.exe |
150 | Source: ..\..\..\..\newview\installers\windows\vcredist_x86_VS2010_SP1.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2010_SP1.exe | 150 | Source: ..\..\..\newview\installers\windows\vcredist_x86_VS2010_SP1.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2010_SP1.exe |
151 | 151 | ||
152 | ; Old files we don't use anymore: | 152 | ; Old files we don't use anymore: |
153 | ; Source: %%PACKAGEFILES%%\dronesettings.xml; DestDir: {app}; Flags: ignoreversion | 153 | ; Source: %%PACKAGEFILES%%\dronesettings.xml; DestDir: {app}; Flags: ignoreversion |
@@ -307,7 +307,7 @@ begin | |||
307 | Success := RegQueryDWordValue(HKLM64, 'SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86', 'Installed', V); | 307 | Success := RegQueryDWordValue(HKLM64, 'SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86', 'Installed', V); |
308 | end else begin | 308 | end else begin |
309 | Success := RegQueryDWordValue(HKLM, 'SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86', 'Installed', V); | 309 | Success := RegQueryDWordValue(HKLM, 'SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86', 'Installed', V); |
310 | end | 310 | end; |
311 | 311 | ||
312 | if Success = TRUE then begin | 312 | if Success = TRUE then begin |
313 | if V = 1 then begin | 313 | if V = 1 then begin |
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, |