Revision d6c78984

b/trunk/CommonAssemblyVersion.cs
60 60
// You can specify all the values or you can default the Build and Revision Numbers
61 61
// by using the '*' as shown below:
62 62
// [assembly: AssemblyVersion("1.0.*")]
63
[assembly: AssemblyVersion("1.8.21015.55")]
63
[assembly: AssemblyVersion("1.8.21015.58")]
b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
94 94
// by using the '*' as shown below:
95 95
// [assembly: AssemblyVersion("1.0.*")]
96 96
[assembly: AssemblyInformationalVersion("2012-07-06")]
97
[assembly: AssemblyVersion("0.8.21015.55")]
97
[assembly: AssemblyVersion("0.8.21015.58")]
b/trunk/Pithos.Installer/PithosPlus.iss
158 158
Source: "..\Pithos.Manual\Pithos+.chm"; DestDir: "{app}"; Flags: ignoreversion; Components: Documentation; Languages: english french german spanish greek
159 159
;Redistributables
160 160
Source: "Redistributables\dotNetFx40_Client_setup.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall
161
Source: "Redistributables\x86\msvcp100.dll"; DestDir: "{sys}"; Components: RequiredFiles; Languages: english french german spanish greek; Check: not Is64BitInstallMode
162
Source: "Redistributables\x86\msvcr100.dll"; DestDir: "{sys}"; Components: RequiredFiles; Languages: english french german spanish greek; Check: not Is64BitInstallMode
163
Source: "Redistributables\x64\msvcp100.dll"; DestDir: "{syswow64}"; Components: RequiredFiles; Languages: english french german spanish greek; Check: Is64BitInstallMode
164
Source: "Redistributables\x64\msvcr100.dll"; DestDir: "{syswow64}"; Components: RequiredFiles; Languages: english french german spanish greek; Check: Is64BitInstallMode
161
;Source: "Redistributables\x86\msvcp100.dll"; DestDir: "{app}"; Components: RequiredFiles; Languages: english french german spanish greek; Check: not Is64BitInstallMode
162
;Source: "Redistributables\x86\msvcr100.dll"; DestDir: "{app}"; Components: RequiredFiles; Languages: english french german spanish greek; Check: not Is64BitInstallMode
163
;Source: "Redistributables\x64\msvcp100.dll"; DestDir: "{app}"; Components: RequiredFiles; Languages: english french german spanish greek; Check: Is64BitInstallMode
164
;Source: "Redistributables\x64\msvcr100.dll"; DestDir: "{app}"; Components: RequiredFiles; Languages: english french german spanish greek; Check: Is64BitInstallMode
165 165
; Wizard Images
166 166
Source: "Images\grnet-logo.bmp"; Flags: dontcopy
167 167
Source: "Images\account.bmp"; Flags: dontcopy
......
340 340
Name: "{cf}/\TortoiseOverlays/\icons"
341 341
Name: "{cf}/\TortoiseOverlays/icons/\XPStyle"
342 342

  
343
[InstallDelete]
344

  
343 345

  
344 346
[Code]
345 347
const 
......
452 454
end;
453 455

  
454 456
function InitializeSetup(): Boolean;
455
begin    
457
begin     
456 458
  // Test the presence of .NET 4.0
457 459
  if (not(RegKeyExists(HKLM, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4'))) then
458 460
      dotNET40Missing := True;
......
592 594
  BitmapImage1.Parent := Page.Surface;
593 595
end;
594 596

  
597
function GetPathInstalled( AppID: String ): String;
598
var
599
   sPrevPath: String;
600
begin
601
  sPrevPath := '';
602
  if not RegQueryStringValue( 
603
HKLM,'Software\Microsoft\Windows\CurrentVersion\Uninstall\'+AppID+'_is1', 
604
'Inno Setup: App Path', sPrevpath) then
605
    RegQueryStringValue( 
606
HKCU,'Software\Microsoft\Windows\CurrentVersion\Uninstall\'+AppID+'_is1' , 
607
'Inno Setup: App Path', sPrevpath);
608
   Result := sPrevPath;
609
end;
610

  
595 611
procedure InitializeWizard;
596 612
var
597 613
winHwnd: longint;
......
635 651
  OuterNotebookBounds := GetBoundsRect(WizardForm.OuterNotebook);
636 652
  
637 653
  
654
//MsgBox(WizardDirValue+'\sqlcecompact40.dll', mbConfirmation, MB_YESNO or MB_DEFBUTTON2) 
638 655
//Clean versions of DLLS before the bit-aware libraries
639 656

  
640
If fileexists('{app}\sqlcecompact40.dll') Then DeleteFile('{app}\sqlcecompact40.dll');
641
If fileexists('{app}\sqlceer40EN.dll') Then DeleteFile('{app}\sqlceer40EN.dll');
642
If fileexists('{app}\sqlceme40.dll') Then DeleteFile('{app}\sqlceme40.dll');
643
If fileexists('{app}\sqlceqp40.dll') Then DeleteFile('{app}\sqlceqp40.dll');
644
If fileexists('{app}\sqlcese40.dll') Then DeleteFile('{app}\sqlcese40.dll');
645
If fileexists('{app}\msvcr90.dll') Then DeleteFile('{app}\msvcr90.dll');
646
If fileexists('{app}\Microsoft.VC90.CRT.manifest') Then DeleteFile('{app}\Microsoft.VC90.CRT.manifest');
647
If fileexists('{app}\ssleay32.dll') Then DeleteFile('{app}\ssleay32.dll');
648
If fileexists('{app}libeay32.dll') Then DeleteFile('{app}\libeay32.dll');
649
If fileexists('{app}\msvcp100.dll') Then DeleteFile('{app}\msvcp100.dll');
650
If fileexists('{app}\msvcr100.dll') Then DeleteFile('{app}\msvcr100.dll');
651
If fileexists('{app}\Castle.ActiveRecord.dll') Then DeleteFile('{app}\Castle.ActiveRecord.dll');
652
If fileexists('{app}\Castle.Components.Validator.dll') Then DeleteFile('{app}\Castle.Components.Validator.dll');
653
If fileexists('{app}\Castle.Core.dll') Then DeleteFile('{app}\Castle.Core.dll');
654
//If fileexists('{app}\') Then DeleteFile('{app}\');
655
 
657
DeleteFile(WizardDirValue+'\sqlcecompact40.dll');
658
DeleteFile(WizardDirValue+'\sqlceer40EN.dll');
659
DeleteFile(WizardDirValue+'\sqlceme40.dll');
660
DeleteFile(WizardDirValue+'\sqlceqp40.dll');
661
DeleteFile(WizardDirValue+'\sqlcese40.dll');
662
DeleteFile(WizardDirValue+'\msvcr90.dll');
663
DeleteFile(WizardDirValue+'\Microsoft.VC90.CRT.manifest');
664
DeleteFile(WizardDirValue+'\ssleay32.dll');
665
DeleteFile(WizardDirValue+'\libeay32.dll');
666
DeleteFile(WizardDirValue+'\msvcp100.dll');
667
DeleteFile(WizardDirValue+'\msvcr100.dll');
668
DeleteFile(WizardDirValue+'\Castle.ActiveRecord.dll');
669
DeleteFile(WizardDirValue+'\Castle.Components.Validator.dll');
670
DeleteFile(WizardDirValue+'\Castle.Core.dll');  
656 671
end;
657 672

  
658 673
function ShouldSkipPage(CurPage: Integer): Boolean;

Also available in: Unified diff