소스 검색

* Dotted filenames for package openssl

Michaël Van Canneyt 2 년 전
부모
커밋
fdac8f4e43

+ 3 - 0
packages/openssl/namespaced/Api.Openssl.pas

@@ -0,0 +1,3 @@
+unit Api.Openssl;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i openssl.pas}

+ 3 - 0
packages/openssl/namespaced/System.Net.Fpopenssl.pp

@@ -0,0 +1,3 @@
+unit System.Net.Fpopenssl;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpopenssl.pp}

+ 3 - 0
packages/openssl/namespaced/System.Net.Opensslsockets.pp

@@ -0,0 +1,3 @@
+unit System.Net.Opensslsockets;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i opensslsockets.pp}

+ 5 - 0
packages/openssl/namespaces.lst

@@ -0,0 +1,5 @@
+src/opensslsockets.pp=namespaced/System.Net.Opensslsockets.pp
+{s*:src/}=namespaced/
+{i+:src/}
+src/openssl.pas=namespaced/Api.Openssl.pas
+src/fpopenssl.pp=namespaced/System.Net.Fpopenssl.pp

+ 11 - 0
packages/openssl/src/fpopenssl.pp

@@ -12,15 +12,22 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 
  **********************************************************************}
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpopenssl;
 unit fpopenssl;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 {$mode objfpc}{$H+}
 {$mode objfpc}{$H+}
 {$DEFINE DUMPCERT}
 {$DEFINE DUMPCERT}
 
 
 interface
 interface
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Net.Sslbase, Api.Openssl, System.CTypes;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 uses
   Classes, SysUtils, sslbase, openssl, ctypes;
   Classes, SysUtils, sslbase, openssl, ctypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 {$IFDEF DUMPCERT}
 {$IFDEF DUMPCERT}
 Const
 Const
@@ -127,7 +134,11 @@ Function BioToString(B : PBIO; FreeBIO : Boolean = False) : AnsiString;
 
 
 implementation
 implementation
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.DateUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses dateutils;
 uses dateutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 Resourcestring
 Resourcestring
   SErrCountNotGetContext = 'Failed to create SSL Context';
   SErrCountNotGetContext = 'Failed to create SSL Context';

+ 10 - 0
packages/openssl/src/openssl.pas

@@ -1,4 +1,6 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit openssl;
 unit openssl;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 {==============================================================================|
 {==============================================================================|
 | Project : Ararat Synapse                                       | 003.004.001 |
 | Project : Ararat Synapse                                       | 003.004.001 |
@@ -79,11 +81,19 @@ requested OpenSSL function just return errorcode.
 
 
 interface
 interface
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+{$IFDEF OS2}
+  System.Net.Sockets,
+{$ENDIF OS2}
+  System.DynLibs, System.CTypes, System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 uses
 {$IFDEF OS2}
 {$IFDEF OS2}
   Sockets,
   Sockets,
 {$ENDIF OS2}
 {$ENDIF OS2}
   DynLibs, cTypes, SysUtils;
   DynLibs, cTypes, SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 Type
 Type
   TLibreSSLSupport = (lssFirst,lssLast,lssDisabled);
   TLibreSSLSupport = (lssFirst,lssLast,lssDisabled);

+ 7 - 0
packages/openssl/src/opensslsockets.pp

@@ -1,11 +1,18 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit opensslsockets;
 unit opensslsockets;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 {$mode objfpc}{$H+}
 {$mode objfpc}{$H+}
 
 
 interface
 interface
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Net.Sockets, System.Net.Ssockets, System.Net.Sslsockets, System.Net.Sslbase, Api.Openssl, System.Net.Fpopenssl;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 uses
   Classes, SysUtils, sockets, ssockets, sslsockets, sslbase, openssl, fpopenssl;
   Classes, SysUtils, sockets, ssockets, sslsockets, sslbase, openssl, fpopenssl;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 Type
 Type