[JVCL-Checkins] SF.net SVN: jvcl:[12151] trunk/jvcl/install/ISS

[<ah...@us...>]

Revision: 12151
          http://jvcl.svn.sourceforge.net/jvcl/?rev=12151&view=rev
Author:   ahuser
Date:     2009-01-18 16:55:39 +0000 (Sun, 18 Jan 2009)

Log Message:
-----------
Fixed InnoSetup installer script

Modified Paths:
--------------
    trunk/jvcl/install/ISS/ComponentInstallerScript.iss
    trunk/jvcl/install/ISS/Install.iss

Modified: trunk/jvcl/install/ISS/ComponentInstallerScript.iss
===================================================================
--- trunk/jvcl/install/ISS/ComponentInstallerScript.iss	2009-01-16 19:27:51 UTC (rev 12150)
+++ trunk/jvcl/install/ISS/ComponentInstallerScript.iss	2009-01-18 16:55:39 UTC (rev 12151)
@@ -169,6 +169,11 @@
   Result := compinst_isBCBInstalled(Version) <> 0;
 end;
 
+function IsStudioInstalled(Version: Integer): Boolean;
+begin
+  Result := compinst_isBDSInstalled(Version) <> 0;
+end;
+
 function IsSourceInstall: Boolean;
 var
   List: TStrings;

Modified: trunk/jvcl/install/ISS/Install.iss
===================================================================
--- trunk/jvcl/install/ISS/Install.iss	2009-01-16 19:27:51 UTC (rev 12150)
+++ trunk/jvcl/install/ISS/Install.iss	2009-01-18 16:55:39 UTC (rev 12151)
@@ -356,7 +356,7 @@
 Root: HKCU; Subkey: "{code:GetDelphiRegKey|11}\Jedi\JVCL"; ValueType: string; ValueName: "RootDir"; ValueData: {app}; Components: "IDE\Delphi11"; Flags: uninsdeletevalue; Check: IsDelphiInstalled(11)
 Root: HKCU; Subkey: "{code:GetDelphiRegKey|11}\Jedi\JVCL"; ValueType: string; ValueName: "Version"; ValueData: {#JvclVersionStr}; Components: "IDE\Delphi11"; Flags: uninsdeletevalue; Check: IsDelphiInstalled(11)
 Root: HKCU; Subkey: "{code:GetDelphiRegKey|11}\Jedi\JVCL\IDE"; ValueType: dword; ValueName: "RegisterGlobalDesignEditors"; ValueData: 1; Components: "Options\RegisterGlobalDesignEditors"; Flags: uninsdeletevalue; Check: IsDelphiInstalled(11)
-Root: HKCU; Subkey: "{code:GetDelphiRegKey|11}\Globals"; ValueType: string; ValueName: "ForceEnvOptionsUpdate"; ValueData: "1"; Components: Components: "IDE\Delphi11"; Check: IsDelphiInstalled(11)
+Root: HKCU; Subkey: "{code:GetDelphiRegKey|11}\Globals"; ValueType: string; ValueName: "ForceEnvOptionsUpdate"; ValueData: "1"; Components: "IDE\Delphi11"; Check: IsDelphiInstalled(11)
 #endif
 #ifdef Include_Delphi12
 ; Delphi 2009
@@ -573,4 +573,3 @@
 // initialize call for skin
   InitializeSkin;
 end;
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.