[OMPT-svn-commit] SF.net SVN: modplug:[646] trunk/OpenMPT/installer

[<sag...@us...>]

Revision: 646
          http://modplug.svn.sourceforge.net/modplug/?rev=646&view=rev
Author:   saga-games
Date:     2010-07-14 19:33:48 +0000 (Wed, 14 Jul 2010)

Log Message:
-----------
[Imp] Installer: If unmo3.dll is already present in the app's directory, the download task is automatically hidden in the unmo3-free version of the installer.

Modified Paths:
--------------
    trunk/OpenMPT/installer/install-unmo3-free.iss
    trunk/OpenMPT/installer/install.iss

Modified: trunk/OpenMPT/installer/install-unmo3-free.iss
===================================================================
--- trunk/OpenMPT/installer/install-unmo3-free.iss	2010-07-13 19:59:59 UTC (rev 645)
+++ trunk/OpenMPT/installer/install-unmo3-free.iss	2010-07-14 19:33:48 UTC (rev 646)
@@ -13,13 +13,15 @@
 
 #include "install.iss"
 
+[_ISToolDownload]
+Source: http://openmpt.com/download/unmo3.dll; DestDir: {tmp}; DestName: openmpt-unmo3.dll.tmp; Tasks: downloadmo3
 [Code]
 // Verify checksum of downloaded file, and if it is OK, copy it to the app directory.
 procedure VerifyUNMO3Checksum();
 begin
     if(IsTaskSelected('downloadmo3') And FileExists(ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'))) then
     begin
-	   if(GetSHA1OfFile(ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp')) <> '2e17f7bb6d19ce326851333b918070c5357cacd1') then
+	    if(GetSHA1OfFile(ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp')) <> '2e17f7bb6d19ce326851333b918070c5357cacd1') then
     	begin
     	   MsgBox('Warning: unmo3.dll has been downloaded, but its checksum is wrong! This means that either the downloaded file is corrupted or that a newer version of unmo3.dll is available. The file has thus not been installed. Please obtain unmo3.dll from http://openmpt.com/ and verify its checksum.', mbCriticalError, MB_OK)
     	end else
@@ -30,11 +32,13 @@
     end;
 end;
 
+function IsUNMO3Installed(): Boolean;
+begin
+	Result := FileExists(ExpandConstant('{app}\unmo3.dll'));
+end;
+
 // Function generated by ISTool.
 function NextButtonClick(CurPage: Integer): Boolean;
 begin
 	Result := istool_download(CurPage);
 end;
-
-[_ISToolDownload]
-Source: http://openmpt.com/download/unmo3.dll; DestDir: {tmp}; DestName: openmpt-unmo3.dll.tmp; Tasks: downloadmo3

Modified: trunk/OpenMPT/installer/install.iss
===================================================================
--- trunk/OpenMPT/installer/install.iss	2010-07-13 19:59:59 UTC (rev 645)
+++ trunk/OpenMPT/installer/install.iss	2010-07-14 19:33:48 UTC (rev 646)
@@ -39,7 +39,7 @@
 Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}
 Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
 #ifdef DOWNLOAD_MO3
-Name: downloadmo3; Description: Download unmo3 (library needed for reading MO3 files, recommended); GroupDescription: Options:
+Name: downloadmo3; Description: Download unmo3 (library needed for reading MO3 files, recommended); Check: not IsUNMO3Installed; GroupDescription: Options:
 #endif
 Name: portable; Description: Portable mode (use program folder for storing settings, no registry changes); GroupDescription: Options:; Flags: unchecked
 Name: vst_scan; Description: Scan for previously installed VST plugins; GroupDescription: Options:; Flags: unchecked


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.