Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[787] trunk/OpenMPT/installer
|
From: <sag...@us...> - 2011-01-15 16:42:03
|
Revision: 787
http://modplug.svn.sourceforge.net/modplug/?rev=787&view=rev
Author: saga-games
Date: 2011-01-15 16:41:51 +0000 (Sat, 15 Jan 2011)
Log Message:
-----------
The previous commit unintentionally included an updated install script. The new "unmo3-free" install script has now been moved to install-unmo3-free-itd.iss (only works with ANSI versions, read the comments in the file) and the old one is still there as well (for unicode versions)
Modified Paths:
--------------
trunk/OpenMPT/installer/filetypes.iss
trunk/OpenMPT/installer/install-unmo3-free.iss
trunk/OpenMPT/installer/install.iss
Added Paths:
-----------
trunk/OpenMPT/installer/install-unmo3-free-itd.iss
Modified: trunk/OpenMPT/installer/filetypes.iss
===================================================================
--- trunk/OpenMPT/installer/filetypes.iss 2011-01-15 16:27:50 UTC (rev 786)
+++ trunk/OpenMPT/installer/filetypes.iss 2011-01-15 16:41:51 UTC (rev 787)
@@ -1,7 +1,7 @@
; OpenMPT Install script - File associations
; Written by Johannes Schultz
+; http://openmpt.org/
; http://sagamusix.de/
-; http://sagagames.de/
[Setup]
ChangesAssociations=yes
Added: trunk/OpenMPT/installer/install-unmo3-free-itd.iss
===================================================================
--- trunk/OpenMPT/installer/install-unmo3-free-itd.iss (rev 0)
+++ trunk/OpenMPT/installer/install-unmo3-free-itd.iss 2011-01-15 16:41:51 UTC (rev 787)
@@ -0,0 +1,62 @@
+; OpenMPT Install script for InnoSetup
+; Written by Johannes Schultz
+; http://openmpt.org/
+; http://sagamusix.de/
+
+; This file is provided for creating an install package without the proprietary unmo3.dll (for example for the SourceForge package).
+; Instead of including the file in the setup package, the user instead has the possibility to automatically download unmo3.dll from
+; our servers.
+; The download code requires the InnoIDE with its downloader extension which currently only works in ANSI version! ISPP is also required.
+; To download and install ISPP and InnoIDE, get the Inno Setup QuickStart Pack from http://www.jrsoftware.org/isdl.php#qsp (don't use the unicode pack!)
+; it_download.iss and it_download.dll have to be placed in same directory as the file you are currently viewing.
+
+#define DOWNLOAD_MO3
+#define BaseNameAddition "_sf"
+#include "install.iss"
+#include "it_download.iss"
+
+[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
+ 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
+ begin
+ FileCopy(ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'), ExpandConstant('{app}\unmo3.dll'), true);
+ end;
+ DeleteFile(ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'));
+ end;
+end;
+
+function IsUNMO3Installed(): Boolean;
+begin
+ Result := FileExists(ExpandConstant('{app}\unmo3.dll'));
+end;
+
+procedure InitializeWizard();
+begin
+ ITD_Init();
+ ITD_DownloadAfter(wpReady);
+end;
+
+// Function generated by ISTool.
+procedure CurPageChanged(CurPage: Integer);
+begin
+ case CurPage of
+ CurPage:
+ begin
+ if(IsTaskSelected('downloadmo3')) then
+ begin
+ ITD_AddMirror('http://openmpt.com/download/unmo3.dll', ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'));
+ ITD_AddFile('ftp://ftp.untergrund.net/users/sagamusix/openmpt/unmo3.dll', ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'));
+ end else
+ begin
+ ITD_ClearFiles();
+ end;
+ end;
+ end;
+end;
Modified: trunk/OpenMPT/installer/install-unmo3-free.iss
===================================================================
--- trunk/OpenMPT/installer/install-unmo3-free.iss 2011-01-15 16:27:50 UTC (rev 786)
+++ trunk/OpenMPT/installer/install-unmo3-free.iss 2011-01-15 16:41:51 UTC (rev 787)
@@ -1,61 +1,45 @@
; OpenMPT Install script for InnoSetup
; Written by Johannes Schultz
+; http://openmpt.org/
; http://sagamusix.de/
-; http://sagagames.de/
; This file is provided for creating an install package without the proprietary unmo3.dll (for example for the SourceForge package).
; Instead of including the file in the setup package, the user instead has the possibility to automatically download unmo3.dll from
; our servers.
; The download code requires the ISTool IDE with its downloader extension. ISPP is also required.
-; To download and install ISPP and ISTool, get the Inno Setup QuickStart Pack from http://www.jrsoftware.org/isdl.php#qsp
+; To download and install ISPP, get the Inno Setup QuickStart Pack from http://www.jrsoftware.org/isdl.php#qsp
+; The QuickStart Pack doesn't provide a ISTool downloader anymore, so you'll have to download it manually from http://www.istool.org/
#define DOWNLOAD_MO3
#define BaseNameAddition "_sf"
#include "install.iss"
-#include "it_download.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
- 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
- begin
- FileCopy(ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'), ExpandConstant('{app}\unmo3.dll'), true);
- end;
- DeleteFile(ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'));
+ 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
+ begin
+ FileCopy(ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'), ExpandConstant('{app}\unmo3.dll'), true);
+ end;
+ DeleteFile(ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'));
end;
end;
function IsUNMO3Installed(): Boolean;
begin
- Result := FileExists(ExpandConstant('{app}\unmo3.dll'));
+ Result := FileExists(ExpandConstant('{app}\unmo3.dll'));
end;
-procedure InitializeWizard();
-begin
- ITD_Init();
- ITD_DownloadAfter(wpReady);
-end;
-
// Function generated by ISTool.
-procedure CurPageChanged(CurPage: Integer);
+function NextButtonClick(CurPage: Integer): Boolean;
begin
- case CurPage of
- CurPage:
- begin
- if(IsTaskSelected('downloadmo3')) then
- begin
- ITD_AddMirror('http://openmpt.org/download/unmo3.dll', ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'));
- ITD_AddFile('ftp://ftp.untergrund.net/users/sagamusix/openmpt/unmo3.dll', ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'));
- end else
- begin
- ITD_ClearFiles();
- end;
- end;
- end;
+ Result := istool_download(CurPage);
end;
Modified: trunk/OpenMPT/installer/install.iss
===================================================================
--- trunk/OpenMPT/installer/install.iss 2011-01-15 16:27:50 UTC (rev 786)
+++ trunk/OpenMPT/installer/install.iss 2011-01-15 16:41:51 UTC (rev 787)
@@ -1,12 +1,12 @@
; OpenMPT Install script
; Written by Johannes Schultz
+; http://openmpt.org/
; http://sagamusix.de/
-; http://sagagames.de/
; ISPP is needed for automated version retrieval.
-; Furthermore, the ISTool IDE with its downloader extension is required for "unmo3-free" packages which don't contain unmo3.dll, but download it from a server.
-; Check install-unmo3-free.iss for details on this matter.
-; To download and install ISPP and ISTool, get the Inno Setup QuickStart Pack from http://www.jrsoftware.org/isdl.php#qsp
+; Furthermore, either the ISTool IDE or InnoIDE with their downloader extensions are required for "unmo3-free" packages which don't contain unmo3.dll, but download it from a server.
+; Check install-unmo3-free.iss and install-unmo3-free-itd.iss for details on this matter.
+; To download and install ISPP and InnoIDE, get the Inno Setup QuickStart Pack from http://www.jrsoftware.org/isdl.php#qsp
#define GetAppVersion StringChange(GetFileProductVersion("..\mptrack\bin\mptrack.exe"), ",", ".")
#define GetAppVersionShort Copy(GetAppVersion, 1, 4)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
