Updating the dclIndyTLSOpenSSL design-time packages to require the IndyTLSOpenSSL run-time package.

rlebeau · rlebeau · commit 8a1aee087569 · 2024-08-08T09:36:19.000-07:00
Merging IdDsnRegisterOpenSSL.pas into IdRegisterOpenSSL.pas.

Removing IdRegisterCoolOpenSSL.dcr as the images are identical to IdRegisterOpenSSL.dcr.
diff --git a/IdDsnRegisterOpenSSL.pas b/IdDsnRegisterOpenSSL.pas
diff --git a/IdRegisterCoolOpenSSL.dcr b/IdRegisterCoolOpenSSL.dcr
diff --git a/IdRegisterOpenSSL.pas b/IdRegisterOpenSSL.pas
@@ -15,44 +15,73 @@ interface
 {$i IdCompilerDefines.inc}
 
 uses
-  Classes;
+  Classes,
+  {$IFDEF DOTNET}
+  Borland.Vcl.Design.DesignIntF,
+  Borland.Vcl.Design.DesignEditors
+  {$ELSE}
+    {$IFDEF FPC}
+  PropEdits,
+  ComponentEditors
+    {$ELSE}
+      {$IFDEF VCL_6_OR_ABOVE}
+  DesignIntf,
+  DesignEditors
+      {$ELSE}
+  Dsgnintf
+      {$ENDIF}
+    {$ENDIF}
+  {$ENDIF}
+  ;
+
+{$IFDEF HAS_TSelectionEditor}
+type
+  TIdOpenSSLSelectionEditor = class(TSelectionEditor)
+  public
+    procedure RequiresUnits(Proc: TGetStrProc); override;
+  end;
+{$ENDIF}
 
 procedure Register;
 
 implementation
 
 uses
-  IdDsnResourceStrings,
+  IdDsnCoreResourceStrings, // for RSRegIndyIOHandlers in dclIndyCore package
   {$IFDEF FPC}
+  IdDsnResourceStrings,     // for RSProt in dclIndyProtocols package
   LResources,
   {$ENDIF}
   IdSSLOpenSSL;
 
 {$IFNDEF FPC}
-  {$IFDEF BORLAND}
   {$R IdRegisterOpenSSL.dcr}
-  {$ELSE}
-  {$R IdRegisterCoolOpenSSL.dcr}
-  {$ENDIF}
 {$ENDIF}
 
-procedure Register;
-begin
-  {$IFNDEF FPC}
+{$IFDEF HAS_TSelectionEditor}
 
-  RegisterComponents(RSRegIndyIOHandlers, [
-   TIdServerIOHandlerSSLOpenSSL,
-   TIdSSLIOHandlerSocketOpenSSL
-   ]);
+{TIdOpenSSLSelectionEditor}
 
-  {$ELSE}
+procedure TIdOpenSSLSelectionEditor.RequiresUnits(Proc: TGetStrProc);
+begin
+  inherited RequiresUnits(Proc);
+  //for new callback event
+  Proc('IdCTypes'); {Do not localize}
+  Proc('IdSSLOpenSSLHeaders'); {Do not localize}
+end;
 
-  //FreePascal Lazarus Registration
-  RegisterComponents(RSRegIndyIOHandlers+RSProt, [
-   TIdServerIOHandlerSSLOpenSSL,
-   TIdSSLIOHandlerSocketOpenSSL
-   ]);
+{$ENDIF}
 
+procedure Register;
+begin
+  RegisterComponents(RSRegIndyIOHandlers{$IFDEF FPC}+RSProt{$ENDIF}, [
+    TIdServerIOHandlerSSLOpenSSL,
+    TIdSSLIOHandlerSocketOpenSSL
+  ]);
+
+  {$IFDEF HAS_TSelectionEditor}
+  RegisterSelectionEditor(TIdServerIOHandlerSSLOpenSSL, TIdOpenSSLSelectionEditor);
+  RegisterSelectionEditor(TIdSSLIOHandlerSocketOpenSSL, TIdOpenSSLSelectionEditor);
   {$ENDIF}
 end;
 
diff --git a/dclIndyTLSOpenSSL100.dpk b/dclIndyTLSOpenSSL100.dpk
@@ -22,10 +22,10 @@ package dclIndyTLSOpenSSL100;
 
 requires
   designide,
+  IndyTLSOpenSSL100,
   dclIndyCore100;
 
 contains
-  IdDsnRegisterOpenSSL in 'IdDsnRegisterOpenSSL.pas',
   IdRegisterOpenSSL in 'IdRegisterOpenSSL.pas';
 
 end.
diff --git a/dclIndyTLSOpenSSL110.dpk b/dclIndyTLSOpenSSL110.dpk
@@ -22,10 +22,10 @@ package dclIndyTLSOpenSSL110;
 
 requires
   designide,
+  IndyTLSOpenSSL110,
   dclIndyCore110;
 
 contains
-  IdDsnRegisterOpenSSL in 'IdDsnRegisterOpenSSL.pas',
   IdRegisterOpenSSL in 'IdRegisterOpenSSL.pas';
 
 end.
diff --git a/dclIndyTLSOpenSSL120.dpk b/dclIndyTLSOpenSSL120.dpk
@@ -22,10 +22,10 @@ package dclIndyTLSOpenSSL120;
 
 requires
   designide,
+  IndyTLSOpenSSL120,
   dclIndyCore120;
 
 contains
-  IdDsnRegisterOpenSSL in 'IdDsnRegisterOpenSSL.pas',
   IdRegisterOpenSSL in 'IdRegisterOpenSSL.pas';
 
 end.
diff --git a/dclIndyTLSOpenSSL130.dpk b/dclIndyTLSOpenSSL130.dpk
@@ -22,10 +22,10 @@ package dclIndyTLSOpenSSL130;
 
 requires
   designide,
+  IndyTLSOpenSSL130,
   dclIndyCore130;
 
 contains
-  IdDsnRegisterOpenSSL in 'IdDsnRegisterOpenSSL.pas',
   IdRegisterOpenSSL in 'IdRegisterOpenSSL.pas';
 
 end.
diff --git a/dclIndyTLSOpenSSL140.dpk b/dclIndyTLSOpenSSL140.dpk
@@ -23,10 +23,10 @@ package dclIndyTLSOpenSSL140;
 
 requires
   designide,
+  IndyTLSOpenSSL140,
   dclIndyCore140;
 
 contains
-  IdDsnRegisterOpenSSL in 'IdDsnRegisterOpenSSL.pas',
   IdRegisterOpenSSL in 'IdRegisterOpenSSL.pas';
 
 end.
diff --git a/dclIndyTLSOpenSSL150.dpk b/dclIndyTLSOpenSSL150.dpk
@@ -23,10 +23,10 @@ package dclIndyTLSOpenSSL150;
 
 requires
   designide,
+  IndyTLSOpenSSL150,
   dclIndyCore150;
 
 contains
-  IdDsnRegisterOpenSSL in 'IdDsnRegisterOpenSSL.pas',
   IdRegisterOpenSSL in 'IdRegisterOpenSSL.pas';
 
 end.
diff --git a/dclIndyTLSOpenSSL160.dpk b/dclIndyTLSOpenSSL160.dpk
@@ -31,10 +31,10 @@ package dclIndyTLSOpenSSL60;
 
 requires
   designide,
+  IndyTLSOpenSSL160,
   dclIndyCore160;
 
 contains
-  IdDsnRegisterOpenSSL in 'IdDsnRegisterOpenSSL.pas',
   IdRegisterOpenSSL in 'IdRegisterOpenSSL.pas';
 
 end.
diff --git a/dclIndyTLSOpenSSL170.dpk b/dclIndyTLSOpenSSL170.dpk
@@ -31,10 +31,10 @@ package dclIndyTLSOpenSSL170;
 
 requires
   designide,
+  IndyTLSOpenSSL170,
   dclIndyCore170;
 
 contains
-  IdDsnRegisterOpenSSL in 'IdDsnRegisterOpenSSL.pas',
   IdRegisterOpenSSL in 'IdRegisterOpenSSL.pas';
 
 end.
diff --git a/dclIndyTLSOpenSSL180.dpk b/dclIndyTLSOpenSSL180.dpk
@@ -32,10 +32,10 @@ package dclIndyTLSOpenSSL180;
 
 requires
   designide,
+  IndyTLSOpenSSL180,
   dclIndyCore180;
 
 contains
-  IdDsnRegisterOpenSSL in 'IdDsnRegisterOpenSSL.pas',
   IdRegisterOpenSSL in 'IdRegisterOpenSSL.pas';
 
 end.
diff --git a/dclIndyTLSOpenSSL190.dpk b/dclIndyTLSOpenSSL190.dpk
@@ -32,10 +32,10 @@ package dclIndyTLSOpenSSL190;
 
 requires
   designide,
+  IndyTLSOpenSSL190,
   dclIndyCore190;
 
 contains
-  IdDsnRegisterOpenSSL in 'IdDsnRegisterOpenSSL.pas',
   IdRegisterOpenSSL in 'IdRegisterOpenSSL.pas';
 
 end.
diff --git a/dclIndyTLSOpenSSL200.dpk b/dclIndyTLSOpenSSL200.dpk
@@ -32,10 +32,10 @@ package dclIndyTLSOpenSSL200;
 
 requires
   designide,
+  IndyTLSOpenSSL200,
   dclIndyCore200;
 
 contains
-  IdDsnRegisterOpenSSL in 'IdDsnRegisterOpenSSL.pas',
   IdRegisterOpenSSL in 'IdRegisterOpenSSL.pas';
 
 end.
diff --git a/dclIndyTLSOpenSSL210.dpk b/dclIndyTLSOpenSSL210.dpk
@@ -32,10 +32,10 @@ package dclIndyTLSOpenSSL210;
 
 requires
   designide,
+  IndyTLSOpenSSL210,
   dclIndyCore210;
 
 contains
-  IdDsnRegisterOpenSSL in 'IdDsnRegisterOpenSSL.pas',
   IdRegisterOpenSSL in 'IdRegisterOpenSSL.pas';
 
 end.
diff --git a/dclIndyTLSOpenSSL220.dpk b/dclIndyTLSOpenSSL220.dpk
@@ -32,10 +32,10 @@ package dclIndyTLSOpenSSL220;
 
 requires
   designide,
+  IndyTLSOpenSSL220,
   dclIndyCore220;
 
 contains
-  IdDsnRegisterOpenSSL in 'IdDsnRegisterOpenSSL.pas',
   IdRegisterOpenSSL in 'IdRegisterOpenSSL.pas';
 
 end.
diff --git a/dclIndyTLSOpenSSL230.dpk b/dclIndyTLSOpenSSL230.dpk
@@ -32,10 +32,10 @@ package dclIndyTLSOpenSSL230;
 
 requires
   designide,
+  IndyTLSOpenSSL230,
   dclIndyCore230;
 
 contains
-  IdDsnRegisterOpenSSL in 'IdDsnRegisterOpenSSL.pas',
   IdRegisterOpenSSL in 'IdRegisterOpenSSL.pas';
 
 end.
diff --git a/dclIndyTLSOpenSSL240.dpk b/dclIndyTLSOpenSSL240.dpk
@@ -32,10 +32,10 @@ package dclIndyTLSOpenSSL240;
 
 requires
   designide,
+  IndyTLSOpenSSL240,
   dclIndyCore240;
 
 contains
-  IdDsnRegisterOpenSSL in 'IdDsnRegisterOpenSSL.pas',
   IdRegisterOpenSSL in 'IdRegisterOpenSSL.pas';
 
 end.
diff --git a/dclIndyTLSOpenSSL250.dpk b/dclIndyTLSOpenSSL250.dpk
@@ -32,10 +32,10 @@ package dclIndyTLSOpenSSL250;
 
 requires
   designide,
+  IndyTLSOpenSSL250,
   dclIndyCore250;
 
 contains
-  IdDsnRegisterOpenSSL in 'IdDsnRegisterOpenSSL.pas',
   IdRegisterOpenSSL in 'IdRegisterOpenSSL.pas';
 
 end.
diff --git a/dclIndyTLSOpenSSL260.dpk b/dclIndyTLSOpenSSL260.dpk
@@ -32,10 +32,10 @@ package dclIndyTLSOpenSSL260;
 
 requires
   designide,
+  IndyTLSOpenSSL260,
   dclIndyCore260;
 
 contains
-  IdDsnRegisterOpenSSL in 'IdDsnRegisterOpenSSL.pas',
   IdRegisterOpenSSL in 'IdRegisterOpenSSL.pas';
 
 end.
diff --git a/dclIndyTLSOpenSSL270.dpk b/dclIndyTLSOpenSSL270.dpk
@@ -32,10 +32,10 @@ package dclIndyTLSOpenSSL270;
 
 requires
   designide,
+  IndyTLSOpenSSL270,
   dclIndyCore270;
 
 contains
-  IdDsnRegisterOpenSSL in 'IdDsnRegisterOpenSSL.pas',
   IdRegisterOpenSSL in 'IdRegisterOpenSSL.pas';
 
 end.
diff --git a/dclIndyTLSOpenSSL280.dpk b/dclIndyTLSOpenSSL280.dpk
@@ -32,10 +32,10 @@ package dclIndyTLSOpenSSL280;
 
 requires
   designide,
+  IndyTLSOpenSSL280,
   dclIndyCore280;
 
 contains
-  IdDsnRegisterOpenSSL in 'IdDsnRegisterOpenSSL.pas',
   IdRegisterOpenSSL in 'IdRegisterOpenSSL.pas';
 
 end.
diff --git a/dclIndyTLSOpenSSL290.dpk b/dclIndyTLSOpenSSL290.dpk
diff --git a/dclIndyTLSOpenSSL40.dpk b/dclIndyTLSOpenSSL40.dpk
diff --git a/dclIndyTLSOpenSSL50.dpk b/dclIndyTLSOpenSSL50.dpk
diff --git a/dclIndyTLSOpenSSL60.dpk b/dclIndyTLSOpenSSL60.dpk
diff --git a/dclIndyTLSOpenSSL70.dpk b/dclIndyTLSOpenSSL70.dpk
diff --git a/dclIndyTLSOpenSSL80.dpk b/dclIndyTLSOpenSSL80.dpk
diff --git a/dclIndyTLSOpenSSL90.dpk b/dclIndyTLSOpenSSL90.dpk
