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

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

Revision: 942
          http://modplug.svn.sourceforge.net/modplug/?rev=942&view=rev
Author:   saga-games
Date:     2011-07-30 18:54:07 +0000 (Sat, 30 Jul 2011)

Log Message:
-----------
[Mod] Removed existance check for unmo3.dll in sourceforge installer, updated paths to unmo3.dll 2.4.0.2

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

Modified: trunk/OpenMPT/installer/install-unmo3-free-itd.iss
===================================================================
--- trunk/OpenMPT/installer/install-unmo3-free-itd.iss	2011-07-30 00:50:44 UTC (rev 941)
+++ trunk/OpenMPT/installer/install-unmo3-free-itd.iss	2011-07-30 18:54:07 UTC (rev 942)
@@ -21,7 +21,7 @@
 begin
     if(IsTaskSelected('downloadmo3') And FileExists(ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'))) then
     begin
-        if(GetSHA1OfFile(ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp')) <> '393be7e0f50c62d142386a16d6855ca771025554') then
+        if(GetSHA1OfFile(ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp')) <> 'f8ec44e0a089f17ddd6333956ecc37cd8081e7e8') 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.org/ and verify its checksum.', mbCriticalError, MB_OK)
       	end else
@@ -32,11 +32,6 @@
     end;
 end;
 
-function IsUNMO3Installed(): Boolean;
-begin
-    Result := FileExists(ExpandConstant('{app}\unmo3.dll'));
-end;
-
 procedure InitializeWizard();
 begin
     ITD_Init();
@@ -51,7 +46,7 @@
         begin
             if(IsTaskSelected('downloadmo3')) then
             begin
-            	  ITD_AddFile('http://openmpt.org/files/unmo3/2.4.0.1/unmo3.dll', ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'));
+            	  ITD_AddFile('http://openmpt.org/files/unmo3/2.4.0.2/unmo3.dll', ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'));
             	  ITD_AddMirror('ftp://ftp.untergrund.net/users/sagamusix/openmpt/unmo3.dll', ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'));
             end else
           	begin

Modified: trunk/OpenMPT/installer/install-unmo3-free.iss
===================================================================
--- trunk/OpenMPT/installer/install-unmo3-free.iss	2011-07-30 00:50:44 UTC (rev 941)
+++ trunk/OpenMPT/installer/install-unmo3-free.iss	2011-07-30 18:54:07 UTC (rev 942)
@@ -13,14 +13,14 @@
 #include "install.iss"
 
 [_ISToolDownload]
-Source: http://openmpt.org/files/unmo3/2.4.0.1/unmo3.dll; DestDir: {tmp}; DestName: openmpt-unmo3.dll.tmp; Tasks: downloadmo3
+Source: http://openmpt.org/files/unmo3/2.4.0.2/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')) <> '393be7e0f50c62d142386a16d6855ca771025554') then
+	    if(GetSHA1OfFile(ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp')) <> 'f8ec44e0a089f17ddd6333956ecc37cd8081e7e8') 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.org/ and verify its checksum.', mbCriticalError, MB_OK)
     	end else
@@ -31,11 +31,6 @@
     end;
 end;
 
-function IsUNMO3Installed(): Boolean;
-begin
-	Result := FileExists(ExpandConstant('{app}\unmo3.dll'));
-end;
-
 // Function generated by ISTool.
 function NextButtonClick(CurPage: Integer): Boolean;
 begin

Modified: trunk/OpenMPT/installer/install.iss
===================================================================
--- trunk/OpenMPT/installer/install.iss	2011-07-30 00:50:44 UTC (rev 941)
+++ trunk/OpenMPT/installer/install.iss	2011-07-30 18:54:07 UTC (rev 942)
@@ -43,7 +43,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); Check: not IsUNMO3Installed; GroupDescription: Options:
+Name: downloadmo3; Description: Download unmo3 (library needed for reading MO3 files, recommended); GroupDescription: Options:
 #endif
 Name: update_c; Description: Automatically check for updates; GroupDescription: Options:
 Name: portable; Description: Portable mode (use program folder for storing settings, no registry changes); GroupDescription: Options:; Flags: unchecked


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