Pārlūkot izejas kodu

* Dotted filenames for package fcl-process

Michaël Van Canneyt 2 gadi atpakaļ
vecāks
revīzija
f74fa39e26

+ 3 - 0
packages/fcl-process/namespaced/System.Dbugintf.pp

@@ -0,0 +1,3 @@
+unit System.Dbugintf;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i dbugintf.pp}

+ 3 - 0
packages/fcl-process/namespaced/System.Dbugmsg.pp

@@ -0,0 +1,3 @@
+unit System.Dbugmsg;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i dbugmsg.pp}

+ 3 - 0
packages/fcl-process/namespaced/System.Pipes.pp

@@ -0,0 +1,3 @@
+unit System.Pipes;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i pipes.pp}

+ 3 - 0
packages/fcl-process/namespaced/System.Process.Unicode.pp

@@ -0,0 +1,3 @@
+unit System.Process.Unicode;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i processunicode.pp}

+ 3 - 0
packages/fcl-process/namespaced/System.Process.pp

@@ -0,0 +1,3 @@
+unit System.Process;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i process.pp}

+ 3 - 0
packages/fcl-process/namespaced/System.SimpleIpc.pp

@@ -0,0 +1,3 @@
+unit System.SimpleIpc;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i simpleipc.pp}

+ 8 - 0
packages/fcl-process/namespaces.lst

@@ -0,0 +1,8 @@
+src/process.pp=namespaced/System.Process.pp
+{s*:src/}=namespaced/
+{i+:src/}
+src/dbugintf.pp=namespaced/System.Dbugintf.pp
+src/simpleipc.pp=namespaced/System.SimpleIpc.pp
+src/dbugmsg.pp=namespaced/System.Dbugmsg.pp
+src/processunicode.pp=namespaced/System.Process.Unicode.pp
+src/pipes.pp=namespaced/System.Pipes.pp

+ 5 - 0
packages/fcl-process/src/amicommon/pipes.inc

@@ -13,8 +13,13 @@
 
  **********************************************************************}
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Amiga.Core.Exec, Amiga.Core.Amigados;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   exec, AmigaDos;
+{$ENDIF FPC_DOTTEDUNITS}
 
 // No pipes under dos, sorry...
 

+ 5 - 0
packages/fcl-process/src/amicommon/process.inc

@@ -14,8 +14,13 @@
 
  **********************************************************************}
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Amiga.Core.Exec, Amiga.Core.Amigados, Amiga.Core.Utility;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Exec, AmigaDos, Utility;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Resourcestring
   SNoCommandLine        = 'Cannot execute empty command-line';

+ 5 - 0
packages/fcl-process/src/amicommon/simpleipc.inc

@@ -16,8 +16,13 @@
 
 {$DEFINE OSNEEDIPCINITDONE}
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Amiga.Core.Exec, TP.DOS;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Exec, dos;
+{$ENDIF FPC_DOTTEDUNITS}
 
 ResourceString
   SErrMsgPortExists = 'MsgPort already exists: %s';

+ 11 - 0
packages/fcl-process/src/dbugintf.pp

@@ -15,11 +15,17 @@
  **********************************************************************}
 {$mode objfpc}
 {$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit dbugintf;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Dbugmsg;
+{$ELSE FPC_DOTTEDUNITS}
 uses dbugmsg;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   TDebugLevel = (dlInformation,dlWarning,dlError);
@@ -85,8 +91,13 @@ Var
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+Uses 
+  System.SysUtils, System.Classes, System.Process, System.Simpleipc;
+{$ELSE FPC_DOTTEDUNITS}
 Uses 
   SysUtils, classes, process, simpleipc;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Const
   DmtInformation = lctInformation;

+ 6 - 0
packages/fcl-process/src/dbugmsg.pp

@@ -15,11 +15,17 @@
  **********************************************************************}
 {$mode objfpc}
 {$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit dbugmsg;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Classes;
+{$ELSE FPC_DOTTEDUNITS}
 uses Classes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Const
   DebugServerID = 'fpcdebugserver'; { compiled IPC server's IDentifiant-name. Should be the same as the compiled IPC client dbugintf.DefaultDebugServer }

+ 5 - 0
packages/fcl-process/src/os2/pipes.inc

@@ -13,8 +13,13 @@
 
  **********************************************************************}
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+ OS2Api.doscalls;
+{$ELSE FPC_DOTTEDUNITS}
 uses
  DosCalls;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
  PipeBufSize = 1024;

+ 4 - 0
packages/fcl-process/src/os2/simpleipc.inc

@@ -14,7 +14,11 @@
 
  **********************************************************************}
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses OS2Api.doscalls, OS2Api.os2def;
+{$ELSE FPC_DOTTEDUNITS}
 uses DosCalls, OS2Def;
+{$ENDIF FPC_DOTTEDUNITS}
 
 ResourceString
   SErrFailedToCreatePipe = 'Failed to create named pipe: %s';

+ 6 - 0
packages/fcl-process/src/pipes.pp

@@ -15,11 +15,17 @@
 
 {$mode objfpc}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 Unit Pipes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+Uses System.SysUtils,System.Classes;
+{$ELSE FPC_DOTTEDUNITS}
 Uses sysutils,Classes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   EPipeError = Class(EStreamError);

+ 9 - 0
packages/fcl-process/src/process.pp

@@ -12,14 +12,23 @@
  **********************************************************************}
 {$mode objfpc}
 {$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit process;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+Uses System.Classes,
+     System.Pipes,
+     System.SysUtils,
+     System.Math;
+{$ELSE FPC_DOTTEDUNITS}
 Uses Classes,
      pipes,
      SysUtils,
      Math;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   TProcessOption = (poRunSuspended,poWaitOnExit,

+ 20 - 10
packages/fcl-process/src/processunicode.pp

@@ -12,30 +12,40 @@
  **********************************************************************}
 {$mode objfpc}
 {$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit processunicode;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+Uses System.Classes,
+     System.Pipes,
+     System.SysUtils,
+     System.Math,
+     System.Process;
+{$ELSE FPC_DOTTEDUNITS}
 Uses Classes,
      pipes,
      SysUtils,
      Math,
      Process;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
-  TProcessOption = process.TProcessOption;
-  TShowWindowOptions = process.TShowWindowOptions;
-  TStartupOption = process.TStartupOption ;
-  TProcessPriority = process.TProcessPriority;
-  TProcessOptions = process.TProcessOptions;
-  TStartupOptions = process.TStartupOptions;
+  TProcessOption = {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}process.TProcessOption;
+  TShowWindowOptions = {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}process.TShowWindowOptions;
+  TStartupOption = {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}process.TStartupOption ;
+  TProcessPriority = {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}process.TProcessPriority;
+  TProcessOptions = {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}process.TProcessOptions;
+  TStartupOptions = {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}process.TStartupOptions;
   {$ifdef UNIX}
-  TProcessForkEvent = Process.TProcessForkEvent;
+  TProcessForkEvent = {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}Process.TProcessForkEvent;
   {$endif UNIX}
 
-  TRunCommandEventCode = Process.TRunCommandEventCode;
-  TOnRunCommandEvent = Process.TOnRunCommandEvent;
-  EProcess = Process.EProcess;
+  TRunCommandEventCode = {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}Process.TRunCommandEventCode;
+  TOnRunCommandEvent = {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}Process.TOnRunCommandEvent;
+  EProcess = {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}Process.EProcess;
 
 {$macro on}
 {$IF SIZEOF(CHAR)=1}

+ 11 - 4
packages/fcl-process/src/simpleipc.pp

@@ -13,14 +13,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit simpleipc;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Contnrs, System.SyncObjs, System.Classes, System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Contnrs, SyncObjs, Classes, SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   MsgVersion = 1;
@@ -356,7 +363,7 @@ begin
   if Timeout >= 0 then
     Result := Timeout
   else
-    Result := SyncObjs.INFINITE;
+    Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SyncObjs.INFINITE;
 end;
 
 // Timeout values:
@@ -745,9 +752,9 @@ end;
 function TSimpleIPCServer.StartThread: Boolean;
 begin
   FThreadError := '';
-  FQueueLock := SyncObjs.TCriticalSection.Create;
-  FQueueAddEvent := SyncObjs.TSimpleEvent.Create;
-  FThreadReadyEvent := SyncObjs.TSimpleEvent.Create;
+  FQueueLock := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SyncObjs.TCriticalSection.Create;
+  FQueueAddEvent := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SyncObjs.TSimpleEvent.Create;
+  FThreadReadyEvent := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SyncObjs.TSimpleEvent.Create;
   FThread := TIPCServerThread.Create(Self);
   FThread.Start;
   Result := WaitForReady;

+ 5 - 0
packages/fcl-process/src/unix/pipes.inc

@@ -13,8 +13,13 @@
 
  **********************************************************************}
 
+{$IFDEF FPC_DOTTEDUNITS}
+Uses
+  UnixApi.Base, UnixApi.Unix, UnixApi.TermIO;
+{$ELSE FPC_DOTTEDUNITS}
 Uses
   BaseUnix, Unix, TermIO;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Function CreatePipeHandles (Var Inhandle,OutHandle : Longint; APipeBufferSize : Cardinal = 1024) : Boolean;
 

+ 9 - 0
packages/fcl-process/src/unix/process.inc

@@ -12,11 +12,20 @@
  **********************************************************************}
  
 {$DEFINE OS_HASEXITCODE}
+
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+   System.CTypes,
+   UnixApi.Types,
+   UnixApi.Unix,
+   UnixApi.Base;
+{$ELSE FPC_DOTTEDUNITS}
 uses
    ctypes,
    UnixType,
    Unix,
    Baseunix;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Resourcestring
   SNoCommandLine        = 'Cannot execute empty command-line';

+ 8 - 0
packages/fcl-process/src/unix/simpleipc.inc

@@ -19,11 +19,19 @@ unit pipesipc;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils, System.Classes, System.Simpleipc, UnixApi.Base;
+{$ELSE FPC_DOTTEDUNITS}
 uses sysutils, classes, simpleipc, baseunix;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$else}
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses UnixApi.Base;
+{$ELSE FPC_DOTTEDUNITS}
 uses baseunix;
+{$ENDIF FPC_DOTTEDUNITS}
 {$endif}
 
 

+ 4 - 0
packages/fcl-process/src/win/pipes.inc

@@ -13,7 +13,11 @@
 
  **********************************************************************}
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Const piInheritablePipe : TSecurityAttributes = (
                            nlength:SizeOF(TSecurityAttributes);

+ 5 - 1
packages/fcl-process/src/win/process.inc

@@ -11,9 +11,13 @@
 
  **********************************************************************}
 
+{$IFDEF FPC_DOTTEDUNITS}
+Uses
+  WinApi.Windows;
+{$ELSE}
 Uses
   Windows;
-
+{$ENDIF}
 
 Resourcestring
   SNoCommandLine        = 'Cannot execute empty command-line';

+ 12 - 8
packages/fcl-process/src/winall/simpleipc.inc

@@ -14,7 +14,11 @@
 
  **********************************************************************}
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows,WinApi.Messages;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows,messages;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   MsgWndClassName: WideString = 'FPCMsgWindowCls';
@@ -119,7 +123,7 @@ begin
   MsgWindowClass.lpszClassName:=PWideChar(MsgWndClassName);
   isreg:=GetClassInfoW(HInstance,PWideChar(MsgWndClassName),@cls);
   if not isreg then
-    if (Windows.RegisterClassW(MsgWindowClass)=0) then
+    if ({$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.RegisterClassW(MsgWindowClass)=0) then
       Owner.DoError(SErrFailedToRegisterWindowClass,[]);
   Result:=CreateWindowExW(WS_EX_TOOLWINDOW, PWideChar(MsgWndClassName),
     PWideChar(aWindowName), WS_POPUP {!0}, 0, 0, 0, 0, 0, 0, HInstance, nil);
@@ -201,12 +205,12 @@ procedure TWinMsgServerComm.ProcessMessages;
 var
   Msg: TMsg;
 begin
-  // Windows.PeekMessage dispatches incoming sent messages by directly
+  // {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.PeekMessage dispatches incoming sent messages by directly
   // calling associated WindowProc, and then checks the thread message queue
   // for posted messages and retrieves a message if any available.
   // Note: WM_COPYDATA is a sent message, not posted, so it will be processed
-  // directly via WindowProc inside of Windows.PeekMessage call.
-  while Windows.PeekMessage(Msg, FHWND, 0, 0, PM_REMOVE) do
+  // directly via WindowProc inside of {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.PeekMessage call.
+  while {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.PeekMessage(Msg, FHWND, 0, 0, PM_REMOVE) do
   begin
     // Empty the message queue by processing all posted messages.
     HandlePostedMessage(Msg);
@@ -234,11 +238,11 @@ begin
     // We either need to wait infinitely or we have a timer.
     if (TimeOut < 0) or (TimerID <> 0) then
     begin
-      // Windows.GetMessage dispatches incoming sent messages until a posted
+      // {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.GetMessage dispatches incoming sent messages until a posted
       // message is available for retrieval. Note: WM_COPYDATA will not actually
-      // wake up Windows.GetMessage, so we must post a dummy message when
+      // wake up {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.GetMessage, so we must post a dummy message when
       // we receive WM_COPYDATA inside of WindowProc.
-      GetMessageResult := Windows.GetMessage(Msg, FHWND, 0, 0);
+      GetMessageResult := {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.GetMessage(Msg, FHWND, 0, 0);
       case LongInt(GetMessageResult) of
         -1, 0: ;
         else HandlePostedMessage(Msg);
@@ -387,7 +391,7 @@ begin
     CDS.dwData:=MsgType;
     CDS.lpData:=Data.Memory;
     CDS.cbData:=Data.Size;
-    Windows.SendMessage(FHWND,WM_COPYDATA,0,PtrInt(@CDS));
+    {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.SendMessage(FHWND,WM_COPYDATA,0,PtrInt(@CDS));
   finally
     FreeAndNil(FMemStr);
   end;

+ 5 - 0
packages/fcl-process/src/wince/process.inc

@@ -11,8 +11,13 @@
 
  **********************************************************************}
 
+{$IFDEF FPC_DOTTEDUNITS}
+Uses
+  WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 Uses
   Windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 Resourcestring