Fixed Installer build output directory.

Added UninsHs.exe since it was auto ignored.

Signed-off-by: George Pantazis <gpant@noc.grnet.gr>

diff --git a/trunk/Pithos.Installer/PithosPlus.iss b/trunk/Pithos.Installer/PithosPlus.iss
index 1bad9a3..00ada81 100644 (file)
--- a/trunk/Pithos.Installer/PithosPlus.iss
+++ b/trunk/Pithos.Installer/PithosPlus.iss
@@ -47,7 +47,7 @@ VersionInfoVersion={#MyAppVersion}
 MinVersion=0,5.01sp3\r
 ArchitecturesInstallIn64BitMode=x64\r
 AppMutex=PITHOSMUTEX\r
-OutputDir={tmp}\r
+OutputDir=Output\\r
 SetupLogging=true\r
 UninstallLogMode=append\r
 VersionInfoCompany=GRNET\r

diff --git a/trunk/Pithos.Installer/PithosPlus.~is b/trunk/Pithos.Installer/PithosPlus.~is
index c714551..c876c08 100644 (file)
--- a/trunk/Pithos.Installer/PithosPlus.~is
+++ b/trunk/Pithos.Installer/PithosPlus.~is
@@ -47,7 +47,7 @@ VersionInfoVersion={#MyAppVersion}
 MinVersion=0,5.01sp3
 ArchitecturesInstallIn64BitMode=x64
 AppMutex=PITHOSMUTEX
-OutputDir={tmp}
+OutputDir=Output\
 SetupLogging=true
 UninstallLogMode=append
 VersionInfoCompany=GRNET
@@ -393,18 +393,14 @@ begin
             
       hWnd := StrToInt(ExpandConstant('{wizardhwnd}'));                     { get main wizard handle }
       IssEnableAnyFileInUseCheck(ExpandConstant('{app}'));
-      sModuleName :=ExpandConstant('{app}*;pithos*.exe;PithosPlus.exe');      
-      
+      sModuleName :=ExpandConstant('pithos*.dll;PithosPlus.exe');            
       nCode:=IssFindModule(hWnd,sModuleName,'en',false,true);                { search for module and display files-in-use window if found  }
-
      if nCode=1 then  begin                                                 { cancel pressed or files-in-use window closed }
           PostMessage (WizardForm.Handle, $0010, 0, 0);                     { quit setup, $0010=WM_CLOSE }
      end else if (nCode=0) or (nCode=2) then begin                          { no module found or ignored pressed}
           Result := true;                                                   { continue setup  }
      end;
-
   end;
-
 end;
 
 function InitializeSetup(): Boolean;

diff --git a/trunk/Pithos.Installer/Tools/UninsHs.exe b/trunk/Pithos.Installer/Tools/UninsHs.exe
new file mode 100644 (file)
index 0000000..9bbb430
Binary files /dev/null and b/trunk/Pithos.Installer/Tools/UninsHs.exe differ