Changeset 69 for trunk/bin/Eraser.iss

Timestamp:

10/18/2007 12:18:19 PM (4 years ago)

Author:

lowjoel

Message:

-Combine both architecture installs to be unified.
-5.85 final release.

File:

• trunk/bin/Eraser.iss (modified) (5 diffs)

trunk/bin/Eraser.iss

@@ -5 +5 @@
 #define EraserSafeVerString "Eraser" + SAFE_FULL_VERSION_NUMBER_STRING
 #define EraserAppVerString "Eraser " + FULL_VERSION_NUMBER_STRING
-;#define VS90
-;#define PRIVATE_BUILD
 
 [Setup]
@@ -16 +14 @@
 AppSupportURL=http://sourceforge.net/projects/eraser/
 AppUpdatesURL=http://sourceforge.net/projects/eraser/
+OutputBaseFilename={#EraserSafeVerString}_setup
 DefaultDirName={pf}\Eraser
 DefaultGroupName=Eraser
@@ -47 +46 @@
 
 [Files]
-;Source: Eraser\history.txt; DestDir: {app}; Flags: overwritereadonly ignoreversion
 ;Source: Eraser\eraser.url; DestDir: {app}; Flags: overwritereadonly ignoreversion
-;Source: Eraser\eraser.xml; DestDir: {app}; Flags: overwritereadonly ignoreversion
 Source: ..\README.txt; DestDir: {app}; Flags: overwritereadonly
 Source: ..\COPYING.txt; DestDir: {app}; Flags: overwritereadonly
 
+Source: win32\release\Eraser.exe; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete 32bit; Components: arch32Bit
+Source: win32\release\Eraserl.exe; DestDir: {sys}; Flags: ignoreversion restartreplace uninsrestartdelete 32bit; Components: arch32Bit
+Source: win32\release\Eraser.dll; DestDir: {sys}; Flags: ignoreversion restartreplace uninsrestartdelete 32bit; Components: arch32Bit
+Source: win32\release\Erasext.dll; DestDir: {sys}; Flags: ignoreversion restartreplace uninsrestartdelete 32bit; Components: arch32Bit
+Source: win32\release\Verify.exe; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete 32bit; Components: Verify; Check: IsWin32
+Source: vcredist_x86.exe; DestDir: {tmp}; DestName: vcredist.exe; Flags: deleteafterinstall; Components: arch32Bit
+
+Source: x64\release\Eraser.exe; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete 64bit; Components: arch64Bit
+Source: x64\release\Eraserl.exe; DestDir: {sys}; Flags: ignoreversion restartreplace uninsrestartdelete 64bit; Components: arch64Bit
+Source: x64\release\Eraser.dll; DestDir: {sys}; Flags: ignoreversion restartreplace uninsrestartdelete 64bit; Components: arch64Bit
+Source: x64\release\Erasext.dll; DestDir: {sys}; Flags: ignoreversion restartreplace uninsrestartdelete 64bit; Components: arch64Bit
+Source: x64\release\Verify.exe; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete 64bit; Components: Verify; Check: IsWin64
+Source: vcredist_x64.exe; DestDir: {tmp}; DestName: vcredist.exe; Flags: deleteafterinstall; Components: arch64Bit
+
 [Components]
-Name: Eraser; Description: Eraser Core Program Files; Types: full custom compact; Flags: fixed checkablealone
-Name: Eraser\RecycleBin; Description: Add Eraser to the Recycle Bin Context Menu; Types: full custom compact
+Name: arch32Bit; Description: Eraser Core Program Files; Types: full custom compact; Flags: fixed checkablealone; Check: IsWin32
+Name: arch32Bit\RecycleBin; Description: Add Eraser to the Recycle Bin Context Menu; Types: full compact
+Name: arch64Bit; Description: Eraser Core Program Files; Types: full custom compact; Flags: fixed checkablealone; Check: IsWin64
+Name: arch64Bit\RecycleBin; Description: Add Eraser to the Recycle Bin Context Menu; Types: full compact
 Name: Verify; Description: Eraser Verifier; Types: full
 
 [Icons]
-Name: {group}\Eraser Verify; Filename: {app}\verify.exe; IconIndex: 0; Components: Verify
 Name: {group}\Eraser; Filename: {app}\eraser.exe
+Name: {group}\Eraser Verify; Filename: {app}\verify.exe; Components: Verify
+Name: {group}\Eraser Website; Filename: http://heidi.ie/eraser/; Components: 
 
 [Registry]
@@ -80 +94 @@
 Root: HKCR; SubKey: ErasextMenu\CLSID; ValueType: string; ValueName: ; ValueData: {{8BE13461-936F-11D1-A87D-444553540000}; Flags: uninsdeletekey
 
-Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext; ValueType: string; ValueData: Erase Recycle Bin; Flags: uninsdeletekey; Components: Eraser\RecycleBin
-Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext\command; ValueType: string; ValueData: """{sys}\eraserl.exe"" -recycled"; Flags: uninsdeletekey; Components: Eraser\RecycleBin
-Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext1; ValueType: string; ValueData: Erase Recycle Bin (35-Pass &Gutmann); Flags: uninsdeletekey; Components: Eraser\RecycleBin
-Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext1\command; ValueType: string; ValueData: """{sys}\eraserl.exe"" -recycled -method Gutmann"; Flags: uninsdeletekey; Components: Eraser\RecycleBin
-Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext2; ValueType: string; ValueData: Erase Recycle Bin (7-Pass &Schneier); Flags: uninsdeletekey; Components: Eraser\RecycleBin
-Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext2\command; ValueType: string; ValueData: """{sys}\eraserl.exe"" -recycled -method Schneier"; Flags: uninsdeletekey; Components: Eraser\RecycleBin
-Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext3; ValueType: string; ValueData: Erase Recycle Bin (7-Pass &DoD); Flags: uninsdeletekey; Components: Eraser\RecycleBin
-Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext3\command; ValueType: string; ValueData: """{sys}\eraserl.exe"" -recycled -method DoD"; Flags: uninsdeletekey; Components: Eraser\RecycleBin
-Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext4; ValueType: string; ValueData: Erase Recycle Bin (3-Pass DoD &E); Flags: uninsdeletekey; Components: Eraser\RecycleBin
-Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext4\command; ValueType: string; ValueData: """{sys}\eraserl.exe"" -recycled -method DoD_E"; Flags: uninsdeletekey; Components: Eraser\RecycleBin
-Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext5; ValueType: string; ValueData: Erase Recycle Bin (1-Pass First-last &2k); Flags: uninsdeletekey; Components: Eraser\RecycleBin
-Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext5\command; ValueType: string; ValueData: """{sys}\eraserl.exe"" -recycled -method First_Last2k"; Flags: uninsdeletekey; Components: Eraser\RecycleBin
-Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext6; ValueType: string; ValueData: Erase Recycle Bin (1-Pass &Pseudorandom Data); Flags: uninsdeletekey; Components: Eraser\RecycleBin
-Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext6\command; ValueType: string; ValueData: """{sys}\eraserl.exe"" -recycled -method Random 1"; Flags: uninsdeletekey; Components: Eraser\RecycleBin
-Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext7; ValueType: string; ValueData: Erase Recycle Bin (&Library); Flags: uninsdeletekey; Components: Eraser\RecycleBin
-Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext7\command; ValueType: string; ValueData: """{sys}\eraserl.exe"" -recycled -method Library"; Flags: uninsdeletekey; Components: Eraser\RecycleBin
+Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext; ValueType: string; ValueData: Erase Recycle Bin; Flags: uninsdeletekey; Components: arch32bit\RecycleBin arch64bit\RecycleBin
+Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext\command; ValueType: string; ValueData: """{sys}\eraserl.exe"" -recycled"; Flags: uninsdeletekey; Components: arch32bit\RecycleBin arch64bit\RecycleBin
+Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext1; ValueType: string; ValueData: Erase Recycle Bin (35-Pass &Gutmann); Flags: uninsdeletekey; Components: arch32bit\RecycleBin arch64bit\RecycleBin
+Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext1\command; ValueType: string; ValueData: """{sys}\eraserl.exe"" -recycled -method Gutmann"; Flags: uninsdeletekey; Components: arch32bit\RecycleBin arch64bit\RecycleBin
+Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext2; ValueType: string; ValueData: Erase Recycle Bin (7-Pass &Schneier); Flags: uninsdeletekey; Components: arch32bit\RecycleBin arch64bit\RecycleBin
+Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext2\command; ValueType: string; ValueData: """{sys}\eraserl.exe"" -recycled -method Schneier"; Flags: uninsdeletekey; Components: arch32bit\RecycleBin arch64bit\RecycleBin
+Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext3; ValueType: string; ValueData: Erase Recycle Bin (7-Pass &DoD); Flags: uninsdeletekey; Components: arch32bit\RecycleBin arch64bit\RecycleBin
+Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext3\command; ValueType: string; ValueData: """{sys}\eraserl.exe"" -recycled -method DoD"; Flags: uninsdeletekey; Components: arch32bit\RecycleBin arch64bit\RecycleBin
+Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext4; ValueType: string; ValueData: Erase Recycle Bin (3-Pass DoD &E); Flags: uninsdeletekey; Components: arch32bit\RecycleBin arch64bit\RecycleBin
+Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext4\command; ValueType: string; ValueData: """{sys}\eraserl.exe"" -recycled -method DoD_E"; Flags: uninsdeletekey; Components: arch32bit\RecycleBin arch64bit\RecycleBin
+Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext5; ValueType: string; ValueData: Erase Recycle Bin (1-Pass First-last &2k); Flags: uninsdeletekey; Components: arch32bit\RecycleBin arch64bit\RecycleBin
+Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext5\command; ValueType: string; ValueData: """{sys}\eraserl.exe"" -recycled -method First_Last2k"; Flags: uninsdeletekey; Components: arch32bit\RecycleBin arch64bit\RecycleBin
+Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext6; ValueType: string; ValueData: Erase Recycle Bin (1-Pass &Pseudorandom Data); Flags: uninsdeletekey; Components: arch32bit\RecycleBin arch64bit\RecycleBin
+Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext6\command; ValueType: string; ValueData: """{sys}\eraserl.exe"" -recycled -method Random 1"; Flags: uninsdeletekey; Components: arch32bit\RecycleBin arch64bit\RecycleBin
+Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext7; ValueType: string; ValueData: Erase Recycle Bin (&Library); Flags: uninsdeletekey; Components: arch32bit\RecycleBin arch64bit\RecycleBin
+Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext7\command; ValueType: string; ValueData: """{sys}\eraserl.exe"" -recycled -method Library"; Flags: uninsdeletekey; Components: arch32bit\RecycleBin arch64bit\RecycleBin
 
 Root: HKCR; SubKey: CLSID\{{8BE13461-936F-11D1-A87D-444553540000}; ValueType: string; ValueName: ; ValueData: Eraser Shell Extension; Flags: uninsdeletekey
@@ -115 +129 @@
 [Run]
 Filename: {app}\eraser.exe; WorkingDir: {app}; Flags: postinstall nowait skipifsilent; Description: Run Eraser
-#ifndef VS90
 Filename: {tmp}\vcredist.exe; StatusMsg: Installing Visual C++ 2005 Runtime...
-#endif
+
+[Code]
+function IsWin32: Boolean;
+begin
+  Result := not IsWin64;
+end;