Differences

This shows you the differences between two versions of the page.

--- ezfit:clarujust:ezfit_optimizer_clarujust_installation [2009/11/20 09:07]
smayr
+++ ezfit:clarujust:ezfit_optimizer_clarujust_installation [2009/12/24 08:47] (current)
smayr
@@ Line 4: / Line 4: @@
 <code inno>
 ;//----------------------------------------------------------------------------
-;// Inno-script: clarujust-setup.iss
+;// Inno-script: clarujust-proxy-setup.iss
 ;//----------------------------------------------------------------------------
+;//----------------------------------------------------------------------------
+;// Global Defines
+;//----------------------------------------------------------------------------
+#define DefaultAppPath "Audina\ezFITOptimizer\"
+...
+;//----------------------------------------------------------------------------
+;// Setup section
+;//----------------------------------------------------------------------------
+[Setup]
+DefaultDirName={param:AppPath|{pf}\{#DefaultAppPath}}
 ...
 [Files]
 ...
-;---------------------------------------------------
+;//---------------------------------------------------
-; Clarujust files
+;// Clarujust files
-;---------------------------------------------------
+;//---------------------------------------------------
 Source: ..\ClarujustProxy\MockClarujustApp.dll; DestDir: {app}\Clarujust; Flags: ignoreversion
 Source: ..\ClarujustProxy\ClarujustProxyServer.dll; DestDir: {app}\Clarujust; Flags: ignoreversion
@@ Line 43: / Line 54: @@
 ...
 [Files]
-;---------------------------------------------------
+;//---------------------------------------------------
-; Application files
+;// Application files
-;---------------------------------------------------
+;//---------------------------------------------------
 Source: {src}\clarujust-setup.exe; DestDir: {src}; Flags: ignoreversion external skipifsourcedoesntexist dontcopy
 ...
@@ Line 75: / Line 86: @@
 [Files]
-;---------------------------------------------------
+;//---------------------------------------------------
-; Clarujust files
+;// Clarujust files
-;---------------------------------------------------
+;//---------------------------------------------------
 Source: ..\ClarujustProxy\MockClarujustApp.dll; DestDir: {app}; Flags: ignoreversion
 Source: ..\ClarujustProxy\ClarujustProxyServer.dll; DestDir: {app}; Flags: ignoreversion
@@ Line 143: / Line 154: @@
 The Clarujust installer should probably check that ezFIT has been installed (by checking the path and version in the Windows registry), and then it can proceed with the installation.
 ===== Sample Script =====
-This sample script shows how to check if ezFIT (Stand-alone) is installed on the system, and if it is not, then we install it.  It also describes how to get the installation path from the Windows registry.  Please note, a similar logic needs to be implemented for the ezFIT for Noah version.
+This sample script shows how to check if ezFIT (Stand-alone) is installed on the system, and if it is not, then we install it.  It also describes how to get the installation path from the Windows registry.  Please note: a similar logic needs to be implemented to check for a ezFIT for Noah version installation, since either can be present in the system.
 <code inno>
+;//----------------------------------------------------------------------------
+;// Inno-script: clarujust-ezfit-setup.iss
+;//----------------------------------------------------------------------------
+...
 [Files]
-;---------------------------------------------------
+;//---------------------------------------------------
-; Application files
+;// Application files
-;---------------------------------------------------
+;//---------------------------------------------------
 Source: {src}\ezfit-setup.exe; DestDir: {src}; Flags: ignoreversion external skipifsourcedoesntexist dontcopy; Languages:
 ...
 [Run]
-Filename: {src}\ezfit-setup.exe; Description: {cm:LaunchProgram,ezfit.exe}; Flags: skipifdoesntexist; Check: NoValidEzFitExists
+Filename: {src}\ezfit-setup.exe; Description: {cm:LaunchProgram,ezfit.exe}; Flags: skipifdoesntexist; Check: NoValidEzFitExists('4.212009121601')
 ...
@@ Line 165: / Line 180: @@
 function GetEzfitPath(): string; forward;
 function GetEzfitVersion(): string; forward;
-function NoValidEzFitExists(ValidVer: string): Boolean; forward;
+function NoValidEzFitExists(ValidVersion: string): Boolean; forward;
 ...
@@ Line 219: / Line 234: @@
 //  If there is a valid installation, we do not reinstall ezFIT, that is why
 //  we check for no valid install in order to execute ezFIT installer.
-// parameters : void
+// parameters : ValidVersion: string.  Format: V.vvBBBBBBBBBB
+//              V = Major version
+//              v = Minor version
+//              B = Build number
+//              Example: 4.212009121601 -> version 4.21, build 2009-12-16 (number 01)
 // return     : T if no valid installation, F if there is a valid installation
 //----------------------------------------------------------------------------
-function NoValidEzFitExists(ValidVer: string): Boolean;
+function NoValidEzFitExists(ValidVersion: string): Boolean;
 var
   curBuild, validBuild: integer;
+  curVer, validVer: integer;
 begin
   result := False;  // A valid ezFIT install exists already
-  if GetEzfitPath() <> '' then begin
+  if (GetEzfitPath() <> '') then begin
-     curBuild   := StrToInt(copy(GetEzfitVersion(), 2, 10));
+     curVer     := StrToInt(copy(GetEzfitVersion(), 1, 4));
-     validBuild := StrToInt(copy(ValidVer, 2, 10));
+     validVer   := StrToInt(copy(ValidVersion,      1, 4));
-     if StrToFloat(curBuild) < (validBuild) then begin
+     curBuild   := StrToInt(copy(GetEzfitVersion(), 5, 10));
+     validBuild := StrToInt(copy(ValidVersion,      5, 10));
+     if ((curVer < validVer) or (curBuild < validBuild)) then begin
        result := True;  // No valid ezFIT install exists
      end;