From 8eb1ead62d856cae04d69ca09affe17c470eb45f Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Fri, 24 Jun 2011 21:54:25 -0700 Subject: Fixed windows installer files missing from the repo and added the VS2010 redist (needed for the new openal libs and upcoming VS2010 support) --- .../indra/newview/installers/windows/imp_icon.ico | Bin 0 -> 533678 bytes .../windows/imprudence_installer_icon_left.bmp | Bin 0 -> 154542 bytes .../windows/imprudence_installer_icon_right.bmp | Bin 0 -> 8534 bytes .../windows/imprudence_installer_script.iss | 45 ++++++++++++++++++--- .../installers/windows/vcredist_x86_VS2005_SP1.exe | Bin 0 -> 2686232 bytes .../installers/windows/vcredist_x86_VS2010_SP1.exe | Bin 0 -> 4995416 bytes 6 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 linden/indra/newview/installers/windows/imp_icon.ico create mode 100644 linden/indra/newview/installers/windows/imprudence_installer_icon_left.bmp create mode 100644 linden/indra/newview/installers/windows/imprudence_installer_icon_right.bmp create mode 100644 linden/indra/newview/installers/windows/vcredist_x86_VS2005_SP1.exe create mode 100644 linden/indra/newview/installers/windows/vcredist_x86_VS2010_SP1.exe (limited to 'linden/indra/newview/installers') diff --git a/linden/indra/newview/installers/windows/imp_icon.ico b/linden/indra/newview/installers/windows/imp_icon.ico new file mode 100644 index 0000000..3b1250a Binary files /dev/null and b/linden/indra/newview/installers/windows/imp_icon.ico differ diff --git a/linden/indra/newview/installers/windows/imprudence_installer_icon_left.bmp b/linden/indra/newview/installers/windows/imprudence_installer_icon_left.bmp new file mode 100644 index 0000000..79fd407 Binary files /dev/null and b/linden/indra/newview/installers/windows/imprudence_installer_icon_left.bmp differ diff --git a/linden/indra/newview/installers/windows/imprudence_installer_icon_right.bmp b/linden/indra/newview/installers/windows/imprudence_installer_icon_right.bmp new file mode 100644 index 0000000..1c1d5dc Binary files /dev/null and b/linden/indra/newview/installers/windows/imprudence_installer_icon_right.bmp differ diff --git a/linden/indra/newview/installers/windows/imprudence_installer_script.iss b/linden/indra/newview/installers/windows/imprudence_installer_script.iss index 3282c48..c23fbf4 100644 --- a/linden/indra/newview/installers/windows/imprudence_installer_script.iss +++ b/linden/indra/newview/installers/windows/imprudence_installer_script.iss @@ -17,15 +17,14 @@ OutputBaseFilename=Imprudence-1.4.0-beta1-(SSE2-optimized) VersionInfoVersion=1.4.0 VersionInfoTextVersion=1.4.0 VersionInfoProductVersion=1.4.0 +AppVersion=1.4.0 VersionInfoCopyright=2011 -AppCopyright=2011 ; These won't change VersionInfoCompany=Imprudence AppPublisher=The Imprudence Project AppPublisherURL=http://kokuaviewer.org AppSupportURL=http://kokuaviewer.org -AppUpdatesURL=http://kokuaviewer.org AllowNoIcons=true InfoAfterFile=..\..\..\..\..\README.txt OutputDir=C:\imprudence_installers @@ -38,6 +37,8 @@ AllowRootDirectory=true WizardImageFile=..\windows\imprudence_installer_icon_left.bmp WizardSmallImageFile=..\windows\imprudence_installer_icon_right.bmp SetupLogging=true +RestartIfNeededByRun=false +AlwaysRestart=false [Languages] Name: english; MessagesFile: compiler:Default.isl @@ -141,8 +142,10 @@ Source: ..\..\..\build-vc80\newview\release\package\SLVoice.exe; DestDir: {app}; Source: ..\..\..\build-vc80\newview\release\package\vivoxsdk.dll; DestDir: {app}; Flags: ignoreversion Source: ..\..\..\build-vc80\newview\release\package\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion -; VC++ 2005 x86 redist -Source: ..\windows\vcredist_x86_VS2005.exe; DestDir: {tmp}; DestName: vcredist_x86_2005.exe +; VC++ 2005 SP1 x86 and VC++ 2010 SP1 x86 redist +; TODO: add checking for VS2005. See http://blogs.msdn.com/b/astebner/archive/2007/01/16/mailbag-how-to-detect-the-presence-of-the-vc-8-0-runtime-redistributable-package.aspx and +Source: ..\windows\vcredist_x86_VS2005_SP1.exe; DestDir: {tmp}; DestName: vcredist_x86_VS2005_SP1.exe +Source: ..\windows\vcredist_x86_VS2010_SP1.exe; DestDir: {tmp}; DestName: vcredist_x86_VS2010_SP1.exe ; Old files we don't use anymore: ; Source: ..\..\..\build-vc80\newview\release\package\dronesettings.xml; DestDir: {app}; Flags: ignoreversion @@ -173,7 +176,8 @@ Name: {group}\Imprudence; Filename: {app}\imprudence.exe; WorkingDir: {app}; Com [Run] Filename: {app}\imprudence.exe; WorkingDir: {app}; Flags: nowait postinstall Filename: {app}\imprudence.url; WorkingDir: {app}; Flags: nowait postinstall shellexec; Description: See what makes Imprudence different -Filename: {tmp}\vcredist_x86_2005.exe; Parameters: "/q:a /c:""VCREDI~1.EXE /q:a /c:""""msiexec /i vcredist.msi /qn"""" """; Flags: runhidden +Filename: {tmp}\vcredist_x86_VS2005_SP1.exe; Parameters: "/q:a /c:""VCREDI~1.EXE /q:a /c:""""msiexec /i vcredist.msi /qn"""" """; Flags: runhidden +Filename: {tmp}\vcredist_x86_VS2010_SP1.exe; Parameters: "/q /norestart"; Check: Needs2010Redist; Flags: runhidden [UninstallDelete] Name: {userappdata}\Imprudence\user_settings\password.dat; Type: files; Languages: @@ -270,3 +274,34 @@ Name: {app}\msvcp80.dll; Type: files; Tasks: ; Languages: Name: {app}\msvcr80.dll; Type: files; Tasks: ; Languages: Name: {app}\msvcr71.dll; Type: files; Tasks: ; Languages: Name: {app}\imprudence.exe.config; Type: files; Tasks: ; Languages: + + +[Code] +// [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86] +// Installed = 1 (REG_DWORD) +function IsVS2010RedistInstalled(): Boolean; +var + V: Cardinal; + Success: Boolean; +begin + if IsWin64 then begin + Success := RegQueryDWordValue(HKLM64, 'SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86', 'Installed', V); + end else begin + Success := RegQueryDWordValue(HKLM, 'SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86', 'Installed', V); + end + + if Success = TRUE then begin + if V = 1 then begin + Result := TRUE; + end else begin + Result := FALSE; + end + end else begin + Result := FALSE; + end +end; + +function Needs2010Redist(): Boolean; +begin + Result := (IsVS2010RedistInstalled = FALSE); +end; diff --git a/linden/indra/newview/installers/windows/vcredist_x86_VS2005_SP1.exe b/linden/indra/newview/installers/windows/vcredist_x86_VS2005_SP1.exe new file mode 100644 index 0000000..1421c29 Binary files /dev/null and b/linden/indra/newview/installers/windows/vcredist_x86_VS2005_SP1.exe differ diff --git a/linden/indra/newview/installers/windows/vcredist_x86_VS2010_SP1.exe b/linden/indra/newview/installers/windows/vcredist_x86_VS2010_SP1.exe new file mode 100644 index 0000000..d81f3f5 Binary files /dev/null and b/linden/indra/newview/installers/windows/vcredist_x86_VS2010_SP1.exe differ -- cgit v1.1 From fedf23cb3dc11abbe466d0d77bce4044c4d6c77b Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Fri, 1 Jul 2011 02:00:05 -0700 Subject: Make sure we clear out skin files that could cause bugs when we install over 1.3 --- .../newview/installers/windows/imprudence_installer_script.iss | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'linden/indra/newview/installers') diff --git a/linden/indra/newview/installers/windows/imprudence_installer_script.iss b/linden/indra/newview/installers/windows/imprudence_installer_script.iss index c23fbf4..783ea0f 100644 --- a/linden/indra/newview/installers/windows/imprudence_installer_script.iss +++ b/linden/indra/newview/installers/windows/imprudence_installer_script.iss @@ -1,5 +1,5 @@ -; Script generated by the Inno Setup Script Wizard. -; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! +; InWorldz inno setup installer script by McCabe Maxsted +; This script only works with VS2005, currently [Setup] ; NOTE: The value of AppId uniquely identifies this application. @@ -196,7 +196,11 @@ Name: C:\Documents and Settings\{username}\.gstreamer-0.10; Type: filesandordirs ; Name: {app}\*.dll; Type: files; Tasks: ; Languages: Name: {app}\lib\gstreamer-plugins\*; Type: filesandordirs; Tasks: ; Languages: ; Name: {app}\skins\default\xui\*; Type: filesandordirs; Tasks: ; Languages: -; Name: {app}\skins\silver\xui\*; Type: filesandordirs; Tasks: ; Languages: +; Old xui skin files can cause bugs, always kill them +Name: {app}\skins\silver\xui\en-us\*; Type: filesandordirs; Tasks: ; Languages: +Name: {app}\app_settings\mozilla; Type: filesandordirs; Tasks: ; Languages: +Name: {app}\app_settings\mozilla_debug; Type: filesandordirs; Tasks: ; Languages: +Name: {app}\app_settings\viewerversion.xml; Type: filesandordirs; Tasks: ; Languages: Name: C:\Documents and Settings\{username}\.gstreamer-0.10\*; Type: filesandordirs Name: C:\Users\{username}\.gstreamer-0.10\*; Type: filesandordirs ; Breaks the browser if installing on top of 1.1: -- cgit v1.1 From 0eb356875bfa7681f2f28bc17545c77fdd9c1881 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Fri, 8 Jul 2011 21:54:09 -0700 Subject: Updated the way the Windows installer handles the VC++ redist files. Includes the following changes: * Updated the VC++ 2005 redist to 8.0.50727.6195. Installers created under Win7 should now work under XP. * Added 2008 redist to the repo in case we ever need it/people who fork from us want to use it 2008 instead of 2005. * Added a check to see if we should install redstributables for 2005/2008 or not. * Fixed issue with the 2005 redist not installing when it should under Vista/7. * The installer now copies redistributables to a new subfolder: 'redist'. Anyone having 'application configuration' errors should be told to run the files in there --- .../windows/imprudence_installer_script.iss | 79 ++++++++++++++++++--- .../installers/windows/vcredist_x86_VS2005_SP1.exe | Bin 2686232 -> 0 bytes .../windows/vcredist_x86_VS2005_SP1_MFC_SEC.EXE | Bin 0 -> 2707352 bytes .../windows/vcredist_x86_VS2008_SP1_ATL_SEC.exe | Bin 0 -> 4485976 bytes 4 files changed, 71 insertions(+), 8 deletions(-) delete mode 100644 linden/indra/newview/installers/windows/vcredist_x86_VS2005_SP1.exe create mode 100644 linden/indra/newview/installers/windows/vcredist_x86_VS2005_SP1_MFC_SEC.EXE create mode 100644 linden/indra/newview/installers/windows/vcredist_x86_VS2008_SP1_ATL_SEC.exe (limited to 'linden/indra/newview/installers') diff --git a/linden/indra/newview/installers/windows/imprudence_installer_script.iss b/linden/indra/newview/installers/windows/imprudence_installer_script.iss index 783ea0f..e463640 100644 --- a/linden/indra/newview/installers/windows/imprudence_installer_script.iss +++ b/linden/indra/newview/installers/windows/imprudence_installer_script.iss @@ -1,4 +1,4 @@ -; InWorldz inno setup installer script by McCabe Maxsted +; Imprudence inno setup installer script by McCabe Maxsted ; This script only works with VS2005, currently [Setup] @@ -32,7 +32,7 @@ SetupIconFile=..\windows\imp_icon.ico Compression=lzma2/ultra64 InternalCompressLevel=ultra64 SolidCompression=true -;PrivilegesRequired=poweruser +PrivilegesRequired=poweruser AllowRootDirectory=true WizardImageFile=..\windows\imprudence_installer_icon_left.bmp WizardSmallImageFile=..\windows\imprudence_installer_icon_right.bmp @@ -142,10 +142,10 @@ Source: ..\..\..\build-vc80\newview\release\package\SLVoice.exe; DestDir: {app}; Source: ..\..\..\build-vc80\newview\release\package\vivoxsdk.dll; DestDir: {app}; Flags: ignoreversion Source: ..\..\..\build-vc80\newview\release\package\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion -; VC++ 2005 SP1 x86 and VC++ 2010 SP1 x86 redist -; TODO: add checking for VS2005. See http://blogs.msdn.com/b/astebner/archive/2007/01/16/mailbag-how-to-detect-the-presence-of-the-vc-8-0-runtime-redistributable-package.aspx and -Source: ..\windows\vcredist_x86_VS2005_SP1.exe; DestDir: {tmp}; DestName: vcredist_x86_VS2005_SP1.exe -Source: ..\windows\vcredist_x86_VS2010_SP1.exe; DestDir: {tmp}; DestName: vcredist_x86_VS2010_SP1.exe +; VC++ 2005 SP1 x86, VC++ 2008 SP1 x86, and VC++ 2010 SP1 x86 redist +Source: ..\windows\vcredist_x86_VS2005_SP1_MFC_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2005_SP1_MFC_SEC.exe +;Source: ..\windows\vcredist_x86_VS2008_SP1_ATL_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2008_SP1_ATL_SEC.exe +Source: ..\windows\vcredist_x86_VS2010_SP1.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2010_SP1.exe ; Old files we don't use anymore: ; Source: ..\..\..\build-vc80\newview\release\package\dronesettings.xml; DestDir: {app}; Flags: ignoreversion @@ -176,8 +176,17 @@ Name: {group}\Imprudence; Filename: {app}\imprudence.exe; WorkingDir: {app}; Com [Run] Filename: {app}\imprudence.exe; WorkingDir: {app}; Flags: nowait postinstall Filename: {app}\imprudence.url; WorkingDir: {app}; Flags: nowait postinstall shellexec; Description: See what makes Imprudence different -Filename: {tmp}\vcredist_x86_VS2005_SP1.exe; Parameters: "/q:a /c:""VCREDI~1.EXE /q:a /c:""""msiexec /i vcredist.msi /qn"""" """; Flags: runhidden -Filename: {tmp}\vcredist_x86_VS2010_SP1.exe; Parameters: "/q /norestart"; Check: Needs2010Redist; Flags: runhidden + +; Install redistributables. +; +; !!!!BEWARE!!!! +; +; Command line parameters and filenames WILL change with each version. Blame Microsoft. + +; Always use /q for VS2005 rather than something quieter such as Parameters: "/q:a c:""msiexec /i vcredist.msi /qn"" ". The redist will fail sometimes if you do otherwise. +Filename: {app}\redist\vcredist_x86_VS2005_SP1_MFC_SEC.exe; Parameters: "/q"; Check: Needs2005Redist; Flags: runhidden +;Filename: {app}\redist\vcredist_x86_VS2008_SP1_ATL_SEC.exe; Parameters: "/q"; Check: Needs2008Redist; Flags: runhidden +Filename: {app}\redist\vcredist_x86_VS2010_SP1.exe; Parameters: "/q /norestart"; Check: Needs2010Redist; Flags: runhidden [UninstallDelete] Name: {userappdata}\Imprudence\user_settings\password.dat; Type: files; Languages: @@ -308,4 +317,58 @@ end; function Needs2010Redist(): Boolean; begin Result := (IsVS2010RedistInstalled = FALSE); + if (Result = TRUE) then begin + Log('User system needs VS 2010 SP1 x86 Redistributable, installing.'); + end else begin + Log('User already has VS 2010 SP1 x86 Redistributable installed, skipping.'); + end +end; + +// VS2008 and 2005 x86 redists. Always look for the latest version we know about. I wish there were a better way to check for these +const + VS2005_X86 = '{A49F249F-0C91-497F-86DF-B2585E8E76B7}'; // http://www.microsoft.com/downloads/details.aspx?familyid=32BC1BEE-A3F9-4C13-9C99-220B62A191EE + VS2005_SP1_X86 = '{7299052B-02A4-4627-81F2-1818DA5D550D}'; // 8.0.50727.762: http://www.microsoft.com/downloads/details.aspx?FamilyID=200B2FD9-AE1A-4A14-984D-389C36F85647 + VS2005_SP1_X86_ATL_SEC = '{837B34E3-7C30-493C-8F6A-2B0F04E2912C}'; // 8.0.50727.4053: http://www.microsoft.com/download/en/details.aspx?displaylang=en&id=14431 + VS2005_SP1_X86_MFC_SEC = '{710f4c1c-cc18-4c49-8cbf-51240c89a1a2}'; // 8.0.50727.6195: http://www.microsoft.com/download/en/details.aspx?displaylang=en&id=26347 + + VS2008_X86 = '{FF66E9F6-83E7-3A3E-AF14-8DE9A809A6A4}'; // http://www.microsoft.com/downloads/details.aspx?FamilyID=9b2da534-3e03-4391-8a4d-074b9f2bc1bf + VS2008_SP1_X86 = '{9A25302D-30C0-39D9-BD6F-21E6EC160475}'; // 9.0.30729.17: http://www.microsoft.com/downloads/details.aspx?familyid=A5C84275-3B97-4AB7-A40D-3802B2AF5FC2 + VS2008_SP1_X86_ATL_SEC = '{1F1C2DFC-2D24-3E06-BCB8-725134ADF989}'; // 9.0.30729.4148: http://www.microsoft.com/downloads/details.aspx?familyid=2051A0C1-C9B5-4B0A-A8F5-770A549FD78C + // These updates currently don't have redist links: + // 9.0.30729.5026: + // 9.0.30729.5570: + // 9.0.30729.6161: http://support.microsoft.com/kb/2538243 + + INSTALLSTATE_INVALIDARG = -2; // An invalid parameter was passed to the function + INSTALLSTATE_UNKNOWN = -1; // The product is not advertised or installed + INSTALLSTATE_ADVERTISED = 1; // The product is advertised but not installed + INSTALLSTATE_ABSENT = 2; // The product is installed for a different user + INSTALLSTATE_DEFAULT = 5; // The product is installed for the current user + +function MsiQueryProductState(ProductCode: String): Integer; + external 'MsiQueryProductStateA@msi.dll stdcall'; + +function IsProductCodeInstalled(ProductUUID: String): Boolean; +begin + Result := (MsiQueryProductState(ProductUUID) = INSTALLSTATE_DEFAULT); +end; + +function Needs2005Redist(): Boolean; +begin + Result:= (IsProductCodeInstalled(VS2005_SP1_X86_MFC_SEC) = FALSE); + if (Result = TRUE) then begin + Log('User system needs VS 2005 SP1 x86 Redistributable, installing.'); + end else begin + Log('User already has VS 2005 SP1 x86 Redistributable installed, skipping.'); + end +end; + +function Needs2008Redist(): Boolean; +begin + Result := (IsProductCodeInstalled(VS2008_SP1_X86_ATL_SEC) = FALSE); + if (Result = TRUE) then begin + Log('User system needs VS 2008 SP1 x86 Redistributable, installing.'); + end else begin + Log('User already has VS 2008 SP1 x86 Redistributable installed, skipping.'); + end end; diff --git a/linden/indra/newview/installers/windows/vcredist_x86_VS2005_SP1.exe b/linden/indra/newview/installers/windows/vcredist_x86_VS2005_SP1.exe deleted file mode 100644 index 1421c29..0000000 Binary files a/linden/indra/newview/installers/windows/vcredist_x86_VS2005_SP1.exe and /dev/null differ diff --git a/linden/indra/newview/installers/windows/vcredist_x86_VS2005_SP1_MFC_SEC.EXE b/linden/indra/newview/installers/windows/vcredist_x86_VS2005_SP1_MFC_SEC.EXE new file mode 100644 index 0000000..8cd783c Binary files /dev/null and b/linden/indra/newview/installers/windows/vcredist_x86_VS2005_SP1_MFC_SEC.EXE differ diff --git a/linden/indra/newview/installers/windows/vcredist_x86_VS2008_SP1_ATL_SEC.exe b/linden/indra/newview/installers/windows/vcredist_x86_VS2008_SP1_ATL_SEC.exe new file mode 100644 index 0000000..378e7f0 Binary files /dev/null and b/linden/indra/newview/installers/windows/vcredist_x86_VS2008_SP1_ATL_SEC.exe differ -- cgit v1.1 From 5ce3a3e900d1a780ff7736546bb393563826f462 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Tue, 12 Jul 2011 16:08:40 -0700 Subject: Updated the experimental installer script --- .../imprudence_installer_script_experimental.iss | 120 +++++++++++++++++++-- 1 file changed, 111 insertions(+), 9 deletions(-) (limited to 'linden/indra/newview/installers') diff --git a/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss b/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss index 99eb4fe..400eb48 100644 --- a/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss +++ b/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss @@ -1,5 +1,5 @@ -; Script generated by the Inno Setup Script Wizard. -; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! +; Imprudence inno setup installer script by McCabe Maxsted +; This script only works with VS2005, currently [Setup] ; NOTE: The value of AppId uniquely identifies this application. @@ -17,15 +17,14 @@ OutputBaseFilename=Imprudence-1.4.0-Experimental-2011.04.19-Setup VersionInfoVersion=1.4.0 VersionInfoTextVersion=1.4.0 VersionInfoProductVersion=1.4.0 +AppVersion=1.4.0 VersionInfoCopyright=2011 -AppCopyright=2011 ; These won't change VersionInfoCompany=Imprudence AppPublisher=The Imprudence Project AppPublisherURL=http://kokuaviewer.org AppSupportURL=http://kokuaviewer.org -AppUpdatesURL=http://kokuaviewer.org AllowNoIcons=true InfoAfterFile=..\..\..\..\..\README.txt OutputDir=C:\imprudence_installers @@ -33,11 +32,13 @@ SetupIconFile=..\windows\imp_icon.ico Compression=lzma2/ultra64 InternalCompressLevel=ultra64 SolidCompression=true -;PrivilegesRequired=poweruser +PrivilegesRequired=poweruser AllowRootDirectory=true WizardImageFile=..\windows\imprudence_installer_icon_left.bmp WizardSmallImageFile=..\windows\imprudence_installer_icon_right.bmp SetupLogging=true +RestartIfNeededByRun=false +AlwaysRestart=false [Languages] Name: english; MessagesFile: compiler:Default.isl @@ -141,8 +142,10 @@ Source: ..\..\..\build-vc80\newview\release\package\SLVoice.exe; DestDir: {app}; Source: ..\..\..\build-vc80\newview\release\package\vivoxsdk.dll; DestDir: {app}; Flags: ignoreversion Source: ..\..\..\build-vc80\newview\release\package\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion -; VC++ 2005 x86 redist -Source: ..\windows\vcredist_x86_VS2005.exe; DestDir: {tmp}; DestName: vcredist_x86_2005.exe +; VC++ 2005 SP1 x86, VC++ 2008 SP1 x86, and VC++ 2010 SP1 x86 redist +Source: ..\windows\vcredist_x86_VS2005_SP1_MFC_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2005_SP1_MFC_SEC.exe +;Source: ..\windows\vcredist_x86_VS2008_SP1_ATL_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2008_SP1_ATL_SEC.exe +Source: ..\windows\vcredist_x86_VS2010_SP1.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2010_SP1.exe ; Old files we don't use anymore: ; Source: ..\..\..\build-vc80\newview\release\package\dronesettings.xml; DestDir: {app}; Flags: ignoreversion @@ -173,7 +176,17 @@ Name: {group}\Imprudence Experimental; Filename: {app}\imprudence.exe; WorkingDi [Run] Filename: {app}\imprudence.exe; WorkingDir: {app}; Flags: nowait postinstall Filename: {app}\imprudence.url; WorkingDir: {app}; Flags: nowait postinstall shellexec; Description: See what makes Imprudence different -Filename: {tmp}\vcredist_x86_2005.exe; Parameters: "/q:a /c:""VCREDI~1.EXE /q:a /c:""""msiexec /i vcredist.msi /qn"""" """; Flags: runhidden + +; Install redistributables. +; +; !!!!BEWARE!!!! +; +; Command line parameters and filenames WILL change with each version. Blame Microsoft. + +; Always use /q for VS2005 rather than something quieter such as Parameters: "/q:a c:""msiexec /i vcredist.msi /qn"" ". The redist will fail sometimes if you do otherwise. +Filename: {app}\redist\vcredist_x86_VS2005_SP1_MFC_SEC.exe; Parameters: "/q"; Check: Needs2005Redist; Flags: runhidden +;Filename: {app}\redist\vcredist_x86_VS2008_SP1_ATL_SEC.exe; Parameters: "/q"; Check: Needs2008Redist; Flags: runhidden +Filename: {app}\redist\vcredist_x86_VS2010_SP1.exe; Parameters: "/q /norestart"; Check: Needs2010Redist; Flags: runhidden [UninstallDelete] Name: {userappdata}\Imprudence\user_settings\password.dat; Type: files; Languages: @@ -192,7 +205,11 @@ Name: C:\Documents and Settings\{username}\.gstreamer-0.10; Type: filesandordirs ; Name: {app}\*.dll; Type: files; Tasks: ; Languages: Name: {app}\lib\gstreamer-plugins\*; Type: filesandordirs; Tasks: ; Languages: ; Name: {app}\skins\default\xui\*; Type: filesandordirs; Tasks: ; Languages: -; Name: {app}\skins\silver\xui\*; Type: filesandordirs; Tasks: ; Languages: +; Old xui skin files can cause bugs, always kill them +Name: {app}\skins\silver\xui\en-us\*; Type: filesandordirs; Tasks: ; Languages: +Name: {app}\app_settings\mozilla; Type: filesandordirs; Tasks: ; Languages: +Name: {app}\app_settings\mozilla_debug; Type: filesandordirs; Tasks: ; Languages: +Name: {app}\app_settings\viewerversion.xml; Type: filesandordirs; Tasks: ; Languages: Name: C:\Documents and Settings\{username}\.gstreamer-0.10\*; Type: filesandordirs Name: C:\Users\{username}\.gstreamer-0.10\*; Type: filesandordirs ; Breaks the browser if installing on top of 1.1: @@ -270,3 +287,88 @@ Name: {app}\msvcp80.dll; Type: files; Tasks: ; Languages: Name: {app}\msvcr80.dll; Type: files; Tasks: ; Languages: Name: {app}\msvcr71.dll; Type: files; Tasks: ; Languages: Name: {app}\imprudence.exe.config; Type: files; Tasks: ; Languages: + + +[Code] +// [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86] +// Installed = 1 (REG_DWORD) +function IsVS2010RedistInstalled(): Boolean; +var + V: Cardinal; + Success: Boolean; +begin + if IsWin64 then begin + Success := RegQueryDWordValue(HKLM64, 'SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86', 'Installed', V); + end else begin + Success := RegQueryDWordValue(HKLM, 'SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86', 'Installed', V); + end + + if Success = TRUE then begin + if V = 1 then begin + Result := TRUE; + end else begin + Result := FALSE; + end + end else begin + Result := FALSE; + end +end; + +function Needs2010Redist(): Boolean; +begin + Result := (IsVS2010RedistInstalled = FALSE); + if (Result = TRUE) then begin + Log('User system needs VS 2010 SP1 x86 Redistributable, installing.'); + end else begin + Log('User already has VS 2010 SP1 x86 Redistributable installed, skipping.'); + end +end; + +// VS2008 and 2005 x86 redists. Always look for the latest version we know about. I wish there were a better way to check for these +const + VS2005_X86 = '{A49F249F-0C91-497F-86DF-B2585E8E76B7}'; // http://www.microsoft.com/downloads/details.aspx?familyid=32BC1BEE-A3F9-4C13-9C99-220B62A191EE + VS2005_SP1_X86 = '{7299052B-02A4-4627-81F2-1818DA5D550D}'; // 8.0.50727.762: http://www.microsoft.com/downloads/details.aspx?FamilyID=200B2FD9-AE1A-4A14-984D-389C36F85647 + VS2005_SP1_X86_ATL_SEC = '{837B34E3-7C30-493C-8F6A-2B0F04E2912C}'; // 8.0.50727.4053: http://www.microsoft.com/download/en/details.aspx?displaylang=en&id=14431 + VS2005_SP1_X86_MFC_SEC = '{710f4c1c-cc18-4c49-8cbf-51240c89a1a2}'; // 8.0.50727.6195: http://www.microsoft.com/download/en/details.aspx?displaylang=en&id=26347 + + VS2008_X86 = '{FF66E9F6-83E7-3A3E-AF14-8DE9A809A6A4}'; // http://www.microsoft.com/downloads/details.aspx?FamilyID=9b2da534-3e03-4391-8a4d-074b9f2bc1bf + VS2008_SP1_X86 = '{9A25302D-30C0-39D9-BD6F-21E6EC160475}'; // 9.0.30729.17: http://www.microsoft.com/downloads/details.aspx?familyid=A5C84275-3B97-4AB7-A40D-3802B2AF5FC2 + VS2008_SP1_X86_ATL_SEC = '{1F1C2DFC-2D24-3E06-BCB8-725134ADF989}'; // 9.0.30729.4148: http://www.microsoft.com/downloads/details.aspx?familyid=2051A0C1-C9B5-4B0A-A8F5-770A549FD78C + // These updates currently don't have redist links: + // 9.0.30729.5026: + // 9.0.30729.5570: + // 9.0.30729.6161: http://support.microsoft.com/kb/2538243 + + INSTALLSTATE_INVALIDARG = -2; // An invalid parameter was passed to the function + INSTALLSTATE_UNKNOWN = -1; // The product is not advertised or installed + INSTALLSTATE_ADVERTISED = 1; // The product is advertised but not installed + INSTALLSTATE_ABSENT = 2; // The product is installed for a different user + INSTALLSTATE_DEFAULT = 5; // The product is installed for the current user + +function MsiQueryProductState(ProductCode: String): Integer; + external 'MsiQueryProductStateA@msi.dll stdcall'; + +function IsProductCodeInstalled(ProductUUID: String): Boolean; +begin + Result := (MsiQueryProductState(ProductUUID) = INSTALLSTATE_DEFAULT); +end; + +function Needs2005Redist(): Boolean; +begin + Result:= (IsProductCodeInstalled(VS2005_SP1_X86_MFC_SEC) = FALSE); + if (Result = TRUE) then begin + Log('User system needs VS 2005 SP1 x86 Redistributable, installing.'); + end else begin + Log('User already has VS 2005 SP1 x86 Redistributable installed, skipping.'); + end +end; + +function Needs2008Redist(): Boolean; +begin + Result := (IsProductCodeInstalled(VS2008_SP1_X86_ATL_SEC) = FALSE); + if (Result = TRUE) then begin + Log('User system needs VS 2008 SP1 x86 Redistributable, installing.'); + end else begin + Log('User already has VS 2008 SP1 x86 Redistributable installed, skipping.'); + end +end; -- cgit v1.1 From 3301aeefa62fc018c238c0aafbaef1f6bdce7728 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Tue, 12 Jul 2011 16:18:40 -0700 Subject: Changed version to beta 1.5 windows test release --- .../installers/windows/imprudence_installer_script_experimental.iss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linden/indra/newview/installers') diff --git a/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss b/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss index 400eb48..c551919 100644 --- a/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss +++ b/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss @@ -9,11 +9,11 @@ ; These will change AppId={{1B3E68BC-13EB-4277-9439-CB5FF9259460} AppName=Imprudence Viewer Experimental -AppVerName=Imprudence Viewer 1.4.0 Experimental 2011.04.19 +AppVerName=Imprudence Viewer 1.4.0 beta 1.5 windows test release DefaultDirName={pf}\ImprudenceExperimental DefaultGroupName=Imprudence Viewer Experimental VersionInfoProductName=Imprudence Viewer Experimental -OutputBaseFilename=Imprudence-1.4.0-Experimental-2011.04.19-Setup +OutputBaseFilename=Imprudence-1.4.0-beta-1.5-windows-test VersionInfoVersion=1.4.0 VersionInfoTextVersion=1.4.0 VersionInfoProductVersion=1.4.0 -- cgit v1.1