Changeset 399

Timestamp:

Aug 7, 2012, 2:43:10 PM (12 years ago)

Author:

chronos

Message:

• Modified: TModule in ModularSystem is now TComponent decendant registred to ModularSystem group in component palette.

Location:

ModularSystem

Files:

• ModularSystem.lpk (modified) (2 diffs)
• ModularSystem.pas (modified) (1 diff)
• UModularSystem.pas (modified) (12 diffs)

ModularSystem/ModularSystem.lpk

@@ -9 +9 @@
       <PathDelim Value="\"/>
       <SearchPaths>
-        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\"/>
+        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
       <Other>
@@ -24 +24 @@
       <Item1>
         <Filename Value="UModularSystem.pas"/>
+        <HasRegisterProc Value="True"/>
         <UnitName Value="UModularSystem"/>
       </Item1>

ModularSystem/ModularSystem.pas

@@ -14 +14 @@
 procedure Register;
 begin
+  RegisterUnit('UModularSystem', @UModularSystem.Register);
 end;
 

ModularSystem/UModularSystem.pas

@@ -11 +11 @@
   TModuleManager = class;
 
-  TAPI = class
+  TAPI = class(TComponent)
 
   end;
@@ -17 +17 @@
   { TModule }
 
-  TModule = class
+  TModule = class(TComponent)
   private
     FInstalled: Boolean;
     Manager: TModuleManager;
+    FVersion: string;
+    FIdentification: string;
+    FTitle: string;
+    FLicense: string;
+    FAuthor: string;
+    FDependencies: TStringList;
+    FDescription: TStringList;
     procedure SetInstalled(AValue: Boolean);
   public
-    Version: string;
-    Name: string;
-    Title: string;
-    Dependencies: TStringList;
-    Author: string;
-    Description: TStringList;
-    License: string;
     API: TAPI;
     MarkForInstall: Boolean;
@@ -40 +40 @@
     destructor Destroy; override;
     property Installed: Boolean read FInstalled write SetInstalled;
+  published
+    property Version: string read FVersion write FVersion;
+    property Identification: string read FIdentification write FIdentification;
+    property Title: string read FTitle write FTitle;
+    property License: string read FLicense write FLicense;
+    property Author: string read FAuthor write FAuthor;
+    property Dependencies: TStringList read FDependencies write FDependencies;
+    property Description: TStringList read FDescription write FDescription;
   end;
 
@@ -64 +72 @@
   end;
 
+procedure Register;
+
 
 implementation
@@ -70 +80 @@
   SModuleNotFound = 'Module %s not found';
 
+procedure Register;
+begin
+  RegisterComponents('ModularSystem', [TModuleManager, TModule]);
+end;
+
 { TModuleManager }
 
@@ -87 +102 @@
 begin
   I := 0;
-  while (I < Modules.Count) and (TModule(Modules[I]).Name <> Name) do Inc(I);
+  while (I < Modules.Count) and (TModule(Modules[I]).Identification <> Name) do Inc(I);
   if I < Modules.Count then Result := TModule(Modules[I])
     else Result := nil;
@@ -101 +116 @@
     if Assigned(Module) then begin
       if not Module.Installed then Module.Install;
-    end else raise Exception.CreateFmt(SModuleNotFound, [Module.Name]);
+    end else raise Exception.CreateFmt(SModuleNotFound, [Module.Identification]);
   end;
 end;
@@ -111 +126 @@
   for I := 0 to Modules.Count - 1 do
   with TModule(Modules[I]) do begin
-    if Dependencies.IndexOf(ModuleName) <> - 1 then Uninstall;
+    if (Dependencies.IndexOf(ModuleName) <> - 1) and Installed then Uninstall;
   end;
 end;
@@ -124 +139 @@
     Module := FindModuleByName(Dependencies[I]);
     if Assigned(Module) then begin
-      if not Module.Installed and (ModuleList.IndexOf(Module.Name) = -1) then begin
-        ModuleList.Add(Module.Name);
+      if not Module.Installed and (ModuleList.IndexOf(Module.Identification) = -1) then begin
+        ModuleList.Add(Module.Identification);
         EnumModulesInstall(Module.Dependencies, ModuleList);
       end;
-    end else raise Exception.CreateFmt(SModuleNotFound, [Module.Name]);
+    end else raise Exception.CreateFmt(SModuleNotFound, [Module.Identification]);
   end;
 end;
@@ -140 +155 @@
   with TModule(Modules[I]) do begin
     if (Dependencies.IndexOf(ModuleName) <> -1) and Installed and
-      (ModuleList.IndexOf(Name) = -1) then begin
-      ModuleList.Add(Name);
-      Self.EnumModulesUninstall(Name, ModuleList);
+      (ModuleList.IndexOf(Identification) = -1) then begin
+      ModuleList.Add(Identification);
+      Self.EnumModulesUninstall(Identification, ModuleList);
     end;
   end;
@@ -210 +225 @@
 begin
   if not Installed then Exit;
-  Manager.UninstallDependencies(Name);
+  Manager.UninstallDependencies(Identification);
   FInstalled := False;
 end;
@@ -228 +243 @@
 begin
   ModuleList.Clear;
-  Manager.EnumModulesUninstall(Name, ModuleList);
+  Manager.EnumModulesUninstall(Identification, ModuleList);
 end;