Changeset 69


Ignore:
Timestamp:
10/18/2007 12:18:19 PM (7 years ago)
Author:
lowjoel
Message:

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

Location:
trunk
Files:
2 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/bin/Eraser.iss

    r68 r69  
    55#define EraserSafeVerString "Eraser" + SAFE_FULL_VERSION_NUMBER_STRING 
    66#define EraserAppVerString "Eraser " + FULL_VERSION_NUMBER_STRING 
    7 ;#define VS90 
    8 ;#define PRIVATE_BUILD 
    97 
    108[Setup] 
     
    1614AppSupportURL=http://sourceforge.net/projects/eraser/ 
    1715AppUpdatesURL=http://sourceforge.net/projects/eraser/ 
     16OutputBaseFilename={#EraserSafeVerString}_setup 
    1817DefaultDirName={pf}\Eraser 
    1918DefaultGroupName=Eraser 
     
    4746 
    4847[Files] 
    49 ;Source: Eraser\history.txt; DestDir: {app}; Flags: overwritereadonly ignoreversion 
    5048;Source: Eraser\eraser.url; DestDir: {app}; Flags: overwritereadonly ignoreversion 
    51 ;Source: Eraser\eraser.xml; DestDir: {app}; Flags: overwritereadonly ignoreversion 
    5249Source: ..\README.txt; DestDir: {app}; Flags: overwritereadonly 
    5350Source: ..\COPYING.txt; DestDir: {app}; Flags: overwritereadonly 
    5451 
     52Source: win32\release\Eraser.exe; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete 32bit; Components: arch32Bit 
     53Source: win32\release\Eraserl.exe; DestDir: {sys}; Flags: ignoreversion restartreplace uninsrestartdelete 32bit; Components: arch32Bit 
     54Source: win32\release\Eraser.dll; DestDir: {sys}; Flags: ignoreversion restartreplace uninsrestartdelete 32bit; Components: arch32Bit 
     55Source: win32\release\Erasext.dll; DestDir: {sys}; Flags: ignoreversion restartreplace uninsrestartdelete 32bit; Components: arch32Bit 
     56Source: win32\release\Verify.exe; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete 32bit; Components: Verify; Check: IsWin32 
     57Source: vcredist_x86.exe; DestDir: {tmp}; DestName: vcredist.exe; Flags: deleteafterinstall; Components: arch32Bit 
     58 
     59Source: x64\release\Eraser.exe; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete 64bit; Components: arch64Bit 
     60Source: x64\release\Eraserl.exe; DestDir: {sys}; Flags: ignoreversion restartreplace uninsrestartdelete 64bit; Components: arch64Bit 
     61Source: x64\release\Eraser.dll; DestDir: {sys}; Flags: ignoreversion restartreplace uninsrestartdelete 64bit; Components: arch64Bit 
     62Source: x64\release\Erasext.dll; DestDir: {sys}; Flags: ignoreversion restartreplace uninsrestartdelete 64bit; Components: arch64Bit 
     63Source: x64\release\Verify.exe; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete 64bit; Components: Verify; Check: IsWin64 
     64Source: vcredist_x64.exe; DestDir: {tmp}; DestName: vcredist.exe; Flags: deleteafterinstall; Components: arch64Bit 
     65 
    5566[Components] 
    56 Name: Eraser; Description: Eraser Core Program Files; Types: full custom compact; Flags: fixed checkablealone 
    57 Name: Eraser\RecycleBin; Description: Add Eraser to the Recycle Bin Context Menu; Types: full custom compact 
     67Name: arch32Bit; Description: Eraser Core Program Files; Types: full custom compact; Flags: fixed checkablealone; Check: IsWin32 
     68Name: arch32Bit\RecycleBin; Description: Add Eraser to the Recycle Bin Context Menu; Types: full compact 
     69Name: arch64Bit; Description: Eraser Core Program Files; Types: full custom compact; Flags: fixed checkablealone; Check: IsWin64 
     70Name: arch64Bit\RecycleBin; Description: Add Eraser to the Recycle Bin Context Menu; Types: full compact 
    5871Name: Verify; Description: Eraser Verifier; Types: full 
    5972 
    6073[Icons] 
    61 Name: {group}\Eraser Verify; Filename: {app}\verify.exe; IconIndex: 0; Components: Verify 
    6274Name: {group}\Eraser; Filename: {app}\eraser.exe 
     75Name: {group}\Eraser Verify; Filename: {app}\verify.exe; Components: Verify 
     76Name: {group}\Eraser Website; Filename: http://heidi.ie/eraser/; Components:  
    6377 
    6478[Registry] 
     
    8094Root: HKCR; SubKey: ErasextMenu\CLSID; ValueType: string; ValueName: ; ValueData: {{8BE13461-936F-11D1-A87D-444553540000}; Flags: uninsdeletekey 
    8195 
    82 Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext; ValueType: string; ValueData: Erase Recycle Bin; Flags: uninsdeletekey; Components: Eraser\RecycleBin 
    83 Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext\command; ValueType: string; ValueData: """{sys}\eraserl.exe"" -recycled"; Flags: uninsdeletekey; Components: Eraser\RecycleBin 
    84 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 
    85 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 
    86 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 
    87 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 
    88 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 
    89 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 
    90 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 
    91 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 
    92 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 
    93 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 
    94 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 
    95 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 
    96 Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext7; ValueType: string; ValueData: Erase Recycle Bin (&Library); Flags: uninsdeletekey; Components: Eraser\RecycleBin 
    97 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 
     96Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext; ValueType: string; ValueData: Erase Recycle Bin; Flags: uninsdeletekey; Components: arch32bit\RecycleBin arch64bit\RecycleBin 
     97Root: 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 
     98Root: 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 
     99Root: 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 
     100Root: 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 
     101Root: 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 
     102Root: 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 
     103Root: 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 
     104Root: 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 
     105Root: 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 
     106Root: 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 
     107Root: 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 
     108Root: 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 
     109Root: 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 
     110Root: HKCR; SubKey: CLSID\{{645FF040-5081-101B-9F08-00AA002F954E}\Shell\Erasext7; ValueType: string; ValueData: Erase Recycle Bin (&Library); Flags: uninsdeletekey; Components: arch32bit\RecycleBin arch64bit\RecycleBin 
     111Root: 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 
    98112 
    99113Root: HKCR; SubKey: CLSID\{{8BE13461-936F-11D1-A87D-444553540000}; ValueType: string; ValueName: ; ValueData: Eraser Shell Extension; Flags: uninsdeletekey 
     
    115129[Run] 
    116130Filename: {app}\eraser.exe; WorkingDir: {app}; Flags: postinstall nowait skipifsilent; Description: Run Eraser 
    117 #ifndef VS90 
    118131Filename: {tmp}\vcredist.exe; StatusMsg: Installing Visual C++ 2005 Runtime... 
    119 #endif 
     132 
     133[Code] 
     134function IsWin32: Boolean; 
     135begin 
     136  Result := not IsWin64; 
     137end; 
  • trunk/version.h

    r68 r69  
    33#define MINOR_NUMBER 8 
    44#define BUILD_NUMBER 5 
    5 #define BUILD_NUMBER_STRING "beta5" 
     5#define BUILD_NUMBER_STRING "5" 
    66#define VERSION_NUMBER_STRING "5.85" 
    7 #define FULL_VERSION_NUMBER_STRING "5.85-beta5" 
     7#define FULL_VERSION_NUMBER_STRING "5.85" 
    88 
    99#define SAFE_VERSION_NUMBER_STRING "585" 
    10 #define SAFE_FULL_VERSION_NUMBER_STRING "585-beta5" 
     10#define SAFE_FULL_VERSION_NUMBER_STRING "585" 
    1111#define COMPANY_NAME "The Eraser Project" 
Note: See TracChangeset for help on using the changeset viewer.