* Dotted filenames for package fcl-base

packages/fcl-base/namespaced/Fcl.AVLTree.pp

@@ -0,0 +1,3 @@
+unit Fcl.AVLTree;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i avl_tree.pp}

packages/fcl-base/namespaced/Fcl.AdvancedIpc.pp

@@ -0,0 +1,3 @@
+unit Fcl.AdvancedIpc;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i advancedipc.pp}

packages/fcl-base/namespaced/Fcl.AdvancedSingleInstance.pas

@@ -0,0 +1,3 @@
+unit Fcl.AdvancedSingleInstance;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i advancedsingleinstance.pas}

packages/fcl-base/namespaced/Fcl.BaseNEnc.pp

@@ -0,0 +1,3 @@
+unit Fcl.BaseNEnc;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i basenenc.pp}

packages/fcl-base/namespaced/Fcl.CacheCls.pp

@@ -0,0 +1,3 @@
+unit Fcl.CacheCls;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i cachecls.pp}

packages/fcl-base/namespaced/Fcl.Csv.Document.pp

@@ -0,0 +1,3 @@
+unit Fcl.Csv.Document;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i csvdocument.pp}

packages/fcl-base/namespaced/Fcl.Csv.ReadWrite.pp

@@ -0,0 +1,3 @@
+unit Fcl.Csv.ReadWrite;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i csvreadwrite.pp}

packages/fcl-base/namespaced/Fcl.CustApp.pp

@@ -0,0 +1,3 @@
+unit Fcl.CustApp;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i custapp.pp}

packages/fcl-base/namespaced/Fcl.EventLog.pp

@@ -0,0 +1,3 @@
+unit Fcl.EventLog;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i eventlog.pp}

packages/fcl-base/namespaced/Fcl.Expressions.pp

@@ -0,0 +1,3 @@
+unit Fcl.Expressions;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpexprpars.pp}

packages/fcl-base/namespaced/Fcl.FileInfo.pp

@@ -0,0 +1,3 @@
+unit Fcl.FileInfo;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fileinfo.pp}

packages/fcl-base/namespaced/Fcl.IniCollection.pp

@@ -0,0 +1,3 @@
+unit Fcl.IniCollection;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i inicol.pp}

packages/fcl-base/namespaced/Fcl.Observer.pp

@@ -0,0 +1,3 @@
+unit Fcl.Observer;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpobserver.pp}

packages/fcl-base/namespaced/Fcl.Rtf.Parser.pp

@@ -0,0 +1,3 @@
+unit Fcl.Rtf.Parser;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i rtfpars.pp}

packages/fcl-base/namespaced/Fcl.RttiUtils.pp

@@ -0,0 +1,3 @@
+unit Fcl.RttiUtils;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i rttiutils.pp}

packages/fcl-base/namespaced/Fcl.SingleInstance.pp

@@ -0,0 +1,3 @@
+unit Fcl.SingleInstance;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i singleinstance.pp}

packages/fcl-base/namespaced/Fcl.Streams.Buffer.pp

@@ -0,0 +1,3 @@
+unit Fcl.Streams.Buffer;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i bufstream.pp}

packages/fcl-base/namespaced/Fcl.Streams.Chained.pp

@@ -0,0 +1,3 @@
+unit Fcl.Streams.Chained;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i chainstream.pp}

packages/fcl-base/namespaced/Fcl.Streams.Collection.pp

@@ -0,0 +1,3 @@
+unit Fcl.Streams.Collection;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i streamcoll.pp}

packages/fcl-base/namespaced/Fcl.Streams.Extra.pp

@@ -0,0 +1,3 @@
+unit Fcl.Streams.Extra;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i streamex.pp}

packages/fcl-base/namespaced/Fcl.Streams.IO.pp

@@ -0,0 +1,3 @@
+unit Fcl.Streams.IO;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i iostream.pp}

packages/fcl-base/namespaced/Fcl.Streams.LZW.pp

@@ -0,0 +1,3 @@
+unit Fcl.Streams.LZW;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i lzwstream.pp}

packages/fcl-base/namespaced/Fcl.Streams.Null.pp

@@ -0,0 +1,3 @@
+unit Fcl.Streams.Null;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i nullstream.pp}

packages/fcl-base/namespaced/Fcl.Template.pp

@@ -0,0 +1,3 @@
+unit Fcl.Template;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fptemplate.pp}

packages/fcl-base/namespaced/Fcl.ThreadPool.pp

@@ -0,0 +1,3 @@
+unit Fcl.ThreadPool;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpthreadpool.pp}

packages/fcl-base/namespaced/Fcl.Timer.pp

@@ -0,0 +1,3 @@
+unit Fcl.Timer;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fptimer.pp}

packages/fcl-base/namespaced/Fcl.UriParser.pp

@@ -0,0 +1,3 @@
+unit Fcl.UriParser;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i uriparser.pp}

packages/fcl-base/namespaced/Fcl.Wformat.pp

@@ -0,0 +1,3 @@
+unit Fcl.Wformat;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i wformat.pp}

packages/fcl-base/namespaced/Fcl.Whtml.pp

@@ -0,0 +1,3 @@
+unit Fcl.Whtml;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i whtml.pp}

packages/fcl-base/namespaced/Fcl.Wtex.pp

@@ -0,0 +1,3 @@
+unit Fcl.Wtex;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i wtex.pp}

packages/fcl-base/namespaced/Pascal.CodeGenerator.pp

@@ -0,0 +1,3 @@
+unit Pascal.CodeGenerator;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i pascodegen.pp}

packages/fcl-base/namespaced/System.Contnrs.pp

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

packages/fcl-base/namespaced/System.GetText.pp

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

packages/fcl-base/namespaced/System.Hash.Ascii85.pp

@@ -0,0 +1,3 @@
+unit System.Hash.Ascii85;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i ascii85.pp}

packages/fcl-base/namespaced/System.Hash.Base64.pp

@@ -0,0 +1,3 @@
+unit System.Hash.Base64;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i base64.pp}

packages/fcl-base/namespaced/System.Hash.Blowfish.pp

@@ -0,0 +1,3 @@
+unit System.Hash.Blowfish;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i blowfish.pp}

packages/fcl-base/namespaced/System.Hash.Idea.pp

@@ -0,0 +1,3 @@
+unit System.Hash.Idea;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i idea.pp}

packages/fcl-base/namespaced/System.IniFiles.pp

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

packages/fcl-base/namespaced/System.Maskutils.pp

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

packages/fcl-base/namespaced/System.Pooledmm.pp

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

packages/fcl-base/namespaced/System.Streamio.pp

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

packages/fcl-base/namespaced/System.SyncObjs.pp

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

packages/fcl-base/namespaces.lst

@@ -0,0 +1,46 @@
+src/basenenc.pp=namespaced/Fcl.BaseNEnc.pp
+{s*:src/}=namespaced/
+{i+:src/}
+src/wtex.pp=namespaced/Fcl.Wtex.pp
+src/iostream.pp=namespaced/Fcl.Streams.IO.pp
+src/contnrs.pp=namespaced/System.Contnrs.pp
+src/streamio.pp=namespaced/System.Streamio.pp
+src/bufstream.pp=namespaced/Fcl.Streams.Buffer.pp
+src/advancedipc.pp=namespaced/Fcl.AdvancedIpc.pp
+src/fpobserver.pp=namespaced/Fcl.Observer.pp
+src/singleinstance.pp=namespaced/Fcl.SingleInstance.pp
+src/pascodegen.pp=namespaced/fcl-base/namespaced/Pascal.CodeGenerator.pp
+src/eventlog.pp=namespaced/Fcl.EventLog.pp
+src/inicol.pp=namespaced/Fcl.IniCollection.pp
+src/streamex.pp=namespaced/Fcl.Streams.Extra.pp
+src/base64.pp=namespaced/System.Hash.Base64.pp
+src/maskutils.pp=namespaced/System.Maskutils.pp
+src/wformat.pp=namespaced/Fcl.Wformat.pp
+src/advancedsingleinstance.pas=namespaced/Fcl.AdvancedSingleInstance.pas
+src/lzwstream.pp=namespaced/Fcl.Streams.LZW.pp
+src/pooledmm.pp=namespaced/System.Pooledmm.pp
+src/csvreadwrite.pp=namespaced/Fcl.Csv.ReadWrite.pp
+src/idea.pp=namespaced/System.Hash.Idea.pp
+src/whtml.pp=namespaced/Fcl.Whtml.pp
+src/csvdocument.pp=namespaced/Fcl.Csv.Document.pp
+src/gettext.pp=namespaced/System.GetText.pp
+src/chainstream.pp=namespaced/Fcl.Streams.Chained.pp
+src/rttiutils.pp=namespaced/Fcl.RttiUtils.pp
+src/rtfpars.pp=namespaced/Fcl.Rtf.Parser.pp
+src/fptemplate.pp=namespaced/Fcl.Template.pp
+src/fpthreadpool.pp=namespaced/Fcl.ThreadPool.pp
+src/wince/fileinfo.pp=namespaced/Fcl.FileInfo.pp
+{s*:src/wince/}=namespaced/
+{i+:src/wince/}
+src/fpexprpars.pp=namespaced/Fcl.Expressions.pp
+src/uriparser.pp=namespaced/Fcl.UriParser.pp
+src/ascii85.pp=namespaced/System.Hash.Ascii85.pp
+src/streamcoll.pp=namespaced/Fcl.Streams.Collection.pp
+src/inifiles.pp=namespaced/System.IniFiles.pp
+src/custapp.pp=namespaced/Fcl.CustApp.pp
+src/blowfish.pp=namespaced/System.Hash.Blowfish.pp
+src/nullstream.pp=namespaced/Fcl.Streams.Null.pp
+src/syncobjs.pp=namespaced/System.SyncObjs.pp
+src/avl_tree.pp=namespaced/Fcl.AVLTree.pp
+src/cachecls.pp=namespaced/Fcl.CacheCls.pp
+src/fptimer.pp=namespaced/Fcl.Timer.pp

packages/fcl-base/src/advancedipc.pp

@@ -1,5 +1,5 @@
 {
-    This file is part of the Free Component Library (FCL)
+    This file is part of the Free Component Library (Fcl)
     Copyright (c) 2015 by Ondrej Pokorny
 
     Unit implementing two-way (request/response) IPC between 1 server and more
@@ -19,18 +19,28 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit AdvancedIPC;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}
 {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  {$IFDEF Unix}
+  UnixApi.Base,
+  {$endif}
+  System.SysUtils, System.Classes, Fcl.SingleInstance;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   {$IFDEF UNIX}
   baseunix,
   {$endif}
   sysutils, Classes, singleinstance;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   HEADER_VERSION = 2;
@@ -45,7 +55,7 @@ type
     MsgVersion: Integer;
   end;
 
-  TFileHandle = Classes.THandle;
+  TFileHandle = {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}Classes.THandle;
 
   TReleaseHandleStream = class(THandleStream)
   public

packages/fcl-base/src/advancedsingleinstance.pas

@@ -1,5 +1,5 @@
 {
-    This file is part of the Free Component Library (FCL)
+    This file is part of the Free Component Library (Fcl)
     Copyright (c) 2015 by Ondrej Pokorny
 
     Unit implementing Single Instance functionality.
@@ -19,14 +19,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit AdvancedSingleInstance;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, Fcl.AdvancedIpc, Fcl.SingleInstance;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, AdvancedIPC, singleinstance;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 

packages/fcl-base/src/ascii85.pp

@@ -14,7 +14,9 @@
 
 // I, Danny Milosavljevic, hereby release this code into the public domain.
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit ascii85;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$M+}
 {$MODE OBJFPC}
@@ -23,7 +25,11 @@ unit ascii85;
 //   which is based on C code from <http://www.stillhq.com/cgi-bin/cvsweb/ascii85/>.
 
 interface
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils, System.Classes;
+{$ELSE FPC_DOTTEDUNITS}
 uses sysutils, classes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TASCII85State = (ascInitial = 0, ascOneEncodedChar = 1, ascTwoEncodedChars = 2, ascThreeEncodedChars = 3, ascFourEncodedChars = 4, ascNoEncodedChar = 5, ascPrefix = 6);

packages/fcl-base/src/avl_tree.pp

@@ -20,7 +20,9 @@
     balanced, so that inserting, deleting and finding a node is performed in
     O(log(#Nodes)).
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit AVL_Tree;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$ifdef FPC}{$mode objfpc}{$endif}{$H+}
 
@@ -29,9 +31,15 @@ interface
 {off $DEFINE MEM_CHECK}
 {off $DEFINE CheckAVLTreeNodeManager}
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  {$IFDEF MEM_CHECK}MemCheck,{$ENDIF}
+  System.Classes, System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   {$IFDEF MEM_CHECK}MemCheck,{$ENDIF}
   Classes, SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TAVLTree = class;

packages/fcl-base/src/base64.pp

@@ -22,11 +22,17 @@
 {$MODE objfpc}
 {$H+}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit base64;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Classes, System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses classes, sysutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 
@@ -91,8 +97,13 @@ function DecodeStringBase64(const s: AnsiString;strict:boolean=false): AnsiStrin
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Math;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Math;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   SStrictNonBase64Char    = 'Non-valid Base64 Encoding character in input';

packages/fcl-base/src/basenenc.pp

@@ -13,13 +13,19 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit basenenc;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode ObjFPC}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   { TAlphabetEncoder }

packages/fcl-base/src/blowfish.pp

@@ -18,11 +18,17 @@
 {$h+}
 {$inline on}
 {$endif}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit BlowFish;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils,System.Classes;
+{$ELSE FPC_DOTTEDUNITS}
 uses SysUtils,Classes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Const
   BFRounds = 16;      { 16 blowfish rounds }

packages/fcl-base/src/bufstream.pp

@@ -16,12 +16,19 @@
 
 {$mode objfpc}
 {$H+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit bufstream;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Const
   DefaultBufferCapacity : Integer = 16; // Default buffer capacity in Kb.

packages/fcl-base/src/cachecls.pp

@@ -14,11 +14,17 @@
 {$mode objfpc}
 {$H+}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit CacheCls;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 resourcestring
   SInvalidIndex = 'Invalid index %i';

packages/fcl-base/src/chainstream.pp

@@ -14,14 +14,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit chainstream;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode ObjFPC}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   TChainedStreamItem = record
@@ -66,7 +73,11 @@ Type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.RtlConsts;
+{$ELSE FPC_DOTTEDUNITS}
 uses rtlconsts;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { TChainedStream }
 

packages/fcl-base/src/contnrs.pp

@@ -17,12 +17,19 @@
 {$ifdef CLASSESINLINE}{$inline on}{$endif}
 {$IFOPT R+}{$DEFINE RangeChecking}{$ENDIF}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit Contnrs;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils,System.Classes;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   SysUtils,Classes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 Type
@@ -600,8 +607,13 @@ Type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.RtlConsts;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   RtlConsts;
+{$ENDIF FPC_DOTTEDUNITS}
 
 ResourceString
   DuplicateMsg   = 'An item with key %0:s already exists';

packages/fcl-base/src/csvdocument.pp

@@ -35,7 +35,9 @@
   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit csvdocument;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$IFDEF FPC}
   {$MODE DELPHI}
@@ -43,13 +45,18 @@ unit csvdocument;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Contnrs, Fcl.Csv.ReadWrite, Fcl.Streams.Buffer;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, Contnrs, csvreadwrite, bufstream;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
-  TCSVChar = csvreadwrite.TCSVChar;
-  TCSVParser = csvreadwrite.TCSVParser;
-  TCSVBuilder = csvreadwrite.TCSVBuilder;
+  TCSVChar = {$IFDEF FPC_DOTTEDUNITS}Fcl.Csv.ReadWrite{$ELSE}csvreadwrite{$ENDIF}.TCSVChar;
+  TCSVParser = {$IFDEF FPC_DOTTEDUNITS}Fcl.Csv.ReadWrite{$ELSE}csvreadwrite{$ENDIF}.TCSVParser;
+  TCSVBuilder = {$IFDEF FPC_DOTTEDUNITS}Fcl.Csv.ReadWrite{$ELSE}csvreadwrite{$ENDIF}.TCSVBuilder;
 
   {$IFNDEF FPC}
   TFPObjectList = TObjectList;

packages/fcl-base/src/csvreadwrite.pp

@@ -35,15 +35,22 @@
   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit csvreadwrite;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}
 {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.StrUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, strutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   TCSVChar = Char;

packages/fcl-base/src/custapp.pp

@@ -14,11 +14,17 @@
  **********************************************************************}
 {$mode objfpc}
 {$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit CustApp;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils,System.Classes,Fcl.SingleInstance;
+{$ELSE FPC_DOTTEDUNITS}
 uses SysUtils,Classes,singleinstance;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   TStringArray = Array of string;
@@ -111,8 +117,13 @@ var CustomApplication : TCustomApplication = nil;
 Implementation
 
 {$ifdef darwin}
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  MacOsApi.MacOSAll;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   MacOSAll;
+{$ENDIF FPC_DOTTEDUNITS}
 {$endif}
 
 { TCustomApplication }
@@ -303,7 +314,7 @@ end;
 procedure TCustomApplication.HandleException(Sender: TObject);
 begin
   If Not (ExceptObject is Exception) then
-    SysUtils.showexception(ExceptObject,ExceptAddr)
+    {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.showexception(ExceptObject,ExceptAddr)
   else
     begin
     If Not Assigned(FOnexception) then
@@ -355,7 +366,7 @@ end;
 procedure TCustomApplication.ShowException(E: Exception);
 
 begin
-  Sysutils.ShowException(E,ExceptAddr)
+  {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}Sysutils.ShowException(E,ExceptAddr)
 end;
 
 procedure TCustomApplication.Terminate;

packages/fcl-base/src/eventlog.pp

@@ -15,11 +15,17 @@
 
 {$mode objfpc}
 {$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit eventlog;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils,System.Classes;
+{$ELSE FPC_DOTTEDUNITS}
 uses SysUtils,Classes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   TEventLog = Class;

packages/fcl-base/src/fpexprpars.pp

@@ -15,12 +15,19 @@
  **********************************************************************}
 {$mode objfpc}
 {$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpexprpars;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Contnrs;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, contnrs;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   // tokens
@@ -839,7 +846,11 @@ function ArgToFloat(Arg: TFPExpressionResult): TExprFloat;
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.TypInfo;
+{$ELSE FPC_DOTTEDUNITS}
 uses typinfo;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { TFPExpressionParser }
 

packages/fcl-base/src/fpobserver.pp

@@ -11,15 +11,22 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpobserver;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 {$interfaces corba}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.TypInfo, System.Contnrs;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, typinfo, contnrs;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
 

packages/fcl-base/src/fptemplate.pp

@@ -14,14 +14,22 @@
 {$mode objfpc}
 {$H+}
 {$define NOCONTNRS}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpTemplate;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils,
+  System.Classes;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   SysUtils,
   Classes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Const
   DefaultParseDepth = 100;

packages/fcl-base/src/fpthreadpool.pp

@@ -1,11 +1,17 @@
+{$IFNDEF FPC_DOTTEDUNITS}
  unit fpthreadpool;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode ObjFPC}{$H+}
 { $DEFINE DEBUGTHREADPOOL}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+Uses System.Classes, System.SysUtils, System.DateUtils, System.SyncObjs;
+{$ELSE FPC_DOTTEDUNITS}
 Uses Classes, SysUtils, DateUtils, SyncObjs;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 Const

packages/fcl-base/src/fptimer.pp

@@ -33,7 +33,9 @@
      still greater than TEvent, where the delay is only a few milliseconds (0-3).     
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fptimer;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
@@ -51,8 +53,13 @@ unit fptimer;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TFPTimerDriver = Class;
@@ -120,8 +127,13 @@ Var
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { ---------------------------------------------------------------------
     TFPTimer

packages/fcl-base/src/gettext.pp

@@ -16,11 +16,17 @@
 {$MODE objfpc}
 {$H+}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit gettext;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils, System.Classes;
+{$ELSE FPC_DOTTEDUNITS}
 uses SysUtils, Classes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   MOFileHeaderMagic = $950412DE;
@@ -79,8 +85,15 @@ type
 implementation
 
 {$ifdef Windows}
+
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+   WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses
    windows;
+{$ENDIF FPC_DOTTEDUNITS}
+
 {$endif}
 
 

packages/fcl-base/src/idea.pp

@@ -15,7 +15,9 @@
 {$mode objfpc}
 {$endif}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 Unit idea;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {
  IDEA encryption routines for pascal
@@ -46,7 +48,11 @@ Unit idea;
 
 INTERFACE
 
+{$IFDEF FPC_DOTTEDUNITS}
+Uses System.SysUtils,System.Classes;
+{$ELSE FPC_DOTTEDUNITS}
 Uses Sysutils,Classes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 CONST 
   IDEAKEYSIZE   = 16;

packages/fcl-base/src/inicol.pp

@@ -13,11 +13,17 @@
 
 {$mode objfpc}
 {$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit inicol;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+Uses System.SysUtils,System.Classes,System.IniFiles;
+{$ELSE FPC_DOTTEDUNITS}
 Uses SysUtils,Classes,Inifiles;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
 

packages/fcl-base/src/inifiles.pp

@@ -46,14 +46,20 @@
  *
  *}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit IniFiles;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}
 {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Classes, System.SysUtils, System.Contnrs;
+{$ELSE FPC_DOTTEDUNITS}
 uses classes, sysutils, contnrs;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 

packages/fcl-base/src/iostream.pp

@@ -12,11 +12,17 @@
  **********************************************************************}
 {$mode objfpc}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit iostream;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Classes;
+{$ELSE FPC_DOTTEDUNITS}
 uses Classes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TIOSType = (iosInput,iosOutPut,iosError);

packages/fcl-base/src/lzwstream.pp

@@ -13,7 +13,9 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit LZWStream;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 
@@ -21,8 +23,13 @@ unit LZWStream;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   ELZWStreamError = Class(EStreamError);

packages/fcl-base/src/maskutils.pp

@@ -19,15 +19,22 @@
 }
 
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit MaskUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 {.$define debug_maskutils}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 function FormatMaskText(const EditMask: string; const AValue: string): string;

packages/fcl-base/src/nullstream.pp

@@ -16,11 +16,17 @@ all data.
 Emulates a memorystream as far as needed: by writing past the end you can
 increase its size; reading past the end gives an error}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit nullstream;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Classes;
+{$ELSE FPC_DOTTEDUNITS}
 uses Classes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   ENullStreamError = class(EStreamError);

packages/fcl-base/src/pascodegen.pp

@@ -13,14 +13,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit pascodegen;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   TCodegenLogType = (cltInfo);

packages/fcl-base/src/pooledmm.pp

@@ -20,14 +20,21 @@
     An own memory manager is somewhat faster and makes debugging and
     profiling easier.
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit pooledmm;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   PPooledMemManagerItem = ^TPooledMemManagerItem;

packages/fcl-base/src/rtfpars.pp

@@ -1,4 +1,6 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 Unit RTFPars;
+{$ENDIF FPC_DOTTEDUNITS}
 {
     This file is part of the Free Pascal run time library.
     Copyright (c) 1999-2000 by Michael Van Canneyt, Member of the
@@ -19,7 +21,11 @@ Unit RTFPars;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+Uses System.Classes,System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 Uses classes,sysutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$i rtfdata.inc}
 

packages/fcl-base/src/rttiutils.pp

@@ -29,12 +29,19 @@
 
 {$mode objfpc}
 {$H+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit RttiUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils, System.Classes, {Graphics, MacOsApi.Controls, Forms,} System.TypInfo, System.StrUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   SysUtils, Classes, {Graphics, Controls, Forms,} TypInfo, StrUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 

packages/fcl-base/src/singleinstance.pp

@@ -1,4 +1,6 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit singleinstance;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {
     This file is part of the Free Component Library (FCL)
@@ -18,8 +20,13 @@ unit singleinstance;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils, System.Classes;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   SysUtils, Classes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 

packages/fcl-base/src/streamcoll.pp

@@ -12,12 +12,19 @@
  **********************************************************************}
 {$mode objfpc}
 {$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit streamcoll;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes,System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes,SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TStreamCollectionItem = Class(TCollectionItem)

packages/fcl-base/src/streamex.pp

@@ -19,12 +19,19 @@
 
 {$mode objfpc}
 {$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit streamex;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.RtlConsts;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, RtlConsts;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   MIN_BUFFER_SIZE = 128;

packages/fcl-base/src/streamio.pp

@@ -16,11 +16,17 @@
 {$mode objfpc}
 {$H+}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit StreamIO;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Classes,System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses Classes,SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Procedure AssignStream(var F: Textfile; Stream: TStream);
 Function GetStream(var F: TTextRec) : TStream;

packages/fcl-base/src/syncobjs.pp

@@ -13,16 +13,24 @@
  **********************************************************************}
 {$mode objfpc}
 {$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit syncobjs;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
 uses
-  sysutils
+{$IFDEF FPC_DOTTEDUNITS}
   {$IFNDEF VER3_2}
-  ,system.timespan
+  system.timespan,
   {$ENDIF}
-  ;
+  System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
+  {$IFNDEF VER3_2}
+  system.timespan,
+  {$ENDIF}
+  sysutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   PSecurityAttributes = Pointer;
@@ -150,7 +158,11 @@ type
 implementation
 
 {$ifdef MSWindows}
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE}
 uses Windows;
+{$ENDIF}
 {$endif}
 
 
@@ -277,7 +289,7 @@ begin
     raise ESyncObjectException.CreateFmt(SErrEventMaxObjects, [MAXIMUM_WAIT_OBJECTS]);
 
   for HandleIndex := 0 to Len - 1 do
-    WOHandles[HandleIndex] := Windows.HANDLE(HandleObjs[HandleIndex].Handle);
+    WOHandles[HandleIndex] := {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.HANDLE(HandleObjs[HandleIndex].Handle);
 
   // what about UseCOMWait?
   if UseCOMWait Then

packages/fcl-base/src/uriparser.pp

@@ -18,7 +18,9 @@
 {$H+}
 {$ENDIF}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit URIParser;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
@@ -53,7 +55,11 @@ function IsAbsoluteURI(const UriReference: string): Boolean;
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   GenDelims = [':', '/', '?', '#', '[', ']', '@'];

packages/fcl-base/src/wformat.pp

@@ -10,7 +10,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit wformat;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$ifdef fpc}
 {$mode objfpc}
@@ -18,7 +20,11 @@ unit wformat;
 
 Interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Classes,System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses Classes,SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   TlistType = (ltNumbered,ltOrdered,ltDefinition);

packages/fcl-base/src/whtml.pp

@@ -1,5 +1,5 @@
 {
-    This file is part of the Free Component Library (FCL)
+    This file is part of the Free Component Library (Fcl)
     Copyright (c) 1999-2000 by the Free Pascal development team
 
     See the file COPYING.FPC, included in this distribution,
@@ -10,7 +10,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit whtml;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$ifdef fpc}
 {$mode objfpc}
@@ -18,7 +20,11 @@ unit whtml;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Fcl.Wformat,System.Classes,System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses wformat,Classes,SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   THTMLWriter=Class(TFormattingWriter)

packages/fcl-base/src/win/eventlog.inc

@@ -13,7 +13,11 @@
 
  **********************************************************************}
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   SKeyEventLog = 'SYSTEM\CurrentControlSet\Services\EventLog\Application\%s';

packages/fcl-base/src/wince/fileinfo.pp

@@ -25,12 +25,19 @@
          FileVersionInfo1.fileName := 'd:\winnt\system32\comctl32.dll';
          showMessage(FileVersionInfo1.getVersionSetting('ProductVersion'));
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fileinfo;
+{$ENDIF FPC_DOTTEDUNITS}
 {$mode objfpc}
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  WinApi.Windows, System.SysUtils, System.Classes;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Windows, SysUtils, Classes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 { Record to receive charset }
@@ -52,7 +59,7 @@ type
   public
      constructor Create(AOwner: TComponent);  override;
      destructor Destroy; override;
-     function getVersionSetting(inp : ): ;
+     function getVersionSetting(inp : string): string;
   published
     property fileName : widestring  read FFileName write SetFileName;
     property VersionStrings  : TStringList  read FmyVersionStrings;
@@ -156,7 +163,7 @@ begin
 end;
 
 { get single version  }
-function TFileVersionInfo.getVersionSetting(inp : ): ;
+function TFileVersionInfo.getVersionSetting(inp : string): string;
 var i : integer;
 begin
   inp:=LowerCase(inp);

packages/fcl-base/src/wtex.pp

@@ -1,5 +1,5 @@
 {
-    This file is part of the Free Component Library (FCL)
+    This file is part of the Free Component Library (Fcl)
     Copyright (c) 1999-2000 by the Free Pascal development team
 
     See the file COPYING.FPC, included in this distribution,
@@ -10,7 +10,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit wtex;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
@@ -19,7 +21,11 @@ interface
 {$endif}
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Fcl.Wformat,System.Classes,System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses wformat,classes,sysutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   TTexWriter=Class(TFormattingWriter)

packages/fcl-web/fpmake.pp

@@ -39,7 +39,9 @@ begin
     P.Dependencies.Add('fcl-registry',AllWindowsOSes);
     P.Dependencies.Add('openssl',AllUnixOSes+AllWindowsOSes);
     P.Dependencies.Add('fastcgi');
+{$ifndef ALLPACKAGES}
     P.Dependencies.Add('httpd20', AllOses - [amiga,aros,morphos]);
+{$endif ALLPACKAGES}    
     P.Dependencies.Add('httpd22', AllOses - [amiga,aros,morphos]);
     P.Dependencies.Add('httpd24', AllOses - [amiga,aros,morphos]);
     P.Dependencies.Add('winunits-base', [Win32,Win64]);

packages/fcl-web/src/restbridge/sqldbrestdata.pp

@@ -127,15 +127,11 @@ Type
 
 implementation
 
-<<<<<<< HEAD
-uses typinfo, strutils, variants, dateutils, base64, sqldbrestconst;
-=======
 {$IFDEF FPC_DOTTEDUNITS}
-uses System.StrUtils, System.Variants, System.DateUtils, System.Hash.Base64, FpWeb.RestBridge.Consts;
+uses System.TypInfo, System.StrUtils, System.Variants, System.DateUtils, System.Hash.Base64, FpWeb.RestBridge.Consts;
 {$ELSE FPC_DOTTEDUNITS}
-uses strutils, variants, dateutils, base64, sqldbrestconst;
+uses typinfo, strutils, variants, dateutils, base64, sqldbrestconst;
 {$ENDIF FPC_DOTTEDUNITS}
->>>>>>> f4da77c296 (* Dotted filenames for package fcl-web)
 
 
 Const

packages/fcl-web/src/restbridge/sqldbrestio.pp

@@ -25,7 +25,7 @@ uses
   System.Classes, System.SysUtils, FpJson.Data, Data.BufDataset, Data.Sqldb, Data.Db, FpWeb.Http.Defs, FpWeb.RestBridge.Schema;
 {$ELSE FPC_DOTTEDUNITS}
 uses
-  Classes, SysUtils, fpjson, sqldb, db, httpdefs, sqldbrestschema;
+  Classes, SysUtils, fpjson, bufdataset, sqldb, db, httpdefs, sqldbrestschema;
 {$ENDIF FPC_DOTTEDUNITS}
 
 

packages/fppkg/src/pkgcommands.pp

@@ -678,7 +678,7 @@ begin
   if L.Count > 0 then
     begin
       if DependenciesDepth=0 then
-        {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Log(llProgress,SProgrInstallDependencies);
+        {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkgglobals{$ENDIF}.Log(llProgress,SProgrInstallDependencies);
       inc(DependenciesDepth);
 
       for i:=0 to L.Count-1 do
@@ -687,7 +687,7 @@ begin
 
       dec(DependenciesDepth);
       if DependenciesDepth=0 then
-        {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Log(llProgress,SProgrDependenciesInstalled);
+        {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkgglobals{$ENDIF}.Log(llProgress,SProgrDependenciesInstalled);
     end;
   FreeAndNil(L);
   if assigned(ManifestPackages) then
@@ -710,7 +710,7 @@ begin
     PackageManager.FindBrokenPackages(SL);
     if SL.Count=0 then
       break;
-    {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Log(llProgress,SProgrReinstallDependent);
+    {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkgglobals{$ENDIF}.Log(llProgress,SProgrReinstallDependent);
     for i:=0 to SL.Count-1 do
       begin
         if not ExecuteAction(SL[i],'build') then
@@ -720,7 +720,7 @@ begin
         if PackageManager.PackageIsBroken(PackageManager.PackageByName(SL[i], pkgpkInstalled), Reason, nil) then
           begin
             BreakLoop := true;
-            {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Log(llWarning, SWarnBrokenAfterReinstall, [SL[i], Reason]);
+            {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkgglobals{$ENDIF}.Log(llWarning, SWarnBrokenAfterReinstall, [SL[i], Reason]);
           end;
       end;
   until BreakLoop;

packages/fppkg/src/pkgfppkg.pp

@@ -230,9 +230,9 @@ begin
   FOptions.CommandLineSection.CompilerConfig:=FOptions.GlobalSection.CompilerConfig;
   // Tracing of what we've done above, need to be done after the verbosity is set
   if GeneratedConfig then
-    {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Log(llDebug,SLogGeneratingGlobalConfig,[cfgfile])
+    {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkgglobals{$ENDIF}.Log(llDebug,SLogGeneratingGlobalConfig,[cfgfile])
   else
-    {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Log(llDebug,SLogLoadingGlobalConfig,[cfgfile]);
+    {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkgglobals{$ENDIF}.Log(llDebug,SLogLoadingGlobalConfig,[cfgfile]);
   FConfigurationFilename := CfgFile;
   // Log configuration
   FOptions.LogValues(llDebug);
@@ -247,7 +247,7 @@ begin
   FCompilerOptions.UpdateLocalRepositoryOption(FOptions);
   if FileExists(S) then
     begin
-      {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Log(llDebug,SLogLoadingCompilerConfig,[S]);
+      {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkgglobals{$ENDIF}.Log(llDebug,SLogLoadingCompilerConfig,[S]);
       FCompilerOptions.LoadCompilerFromFile(S);
       if FCompilerOptions.SaveInifileChanges then
         // The file is in an old format, try to update the file but ignore
@@ -260,7 +260,7 @@ begin
         // A new fppkg.cfg has been created, try to create a new compiler-configuration
         // file too.
         begin
-          {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Log(llDebug,SLogGeneratingCompilerConfig,[S]);
+          {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkgglobals{$ENDIF}.Log(llDebug,SLogGeneratingCompilerConfig,[S]);
           FCompilerOptions.InitCompilerDefaults;
           if not FCompilerOptions.SaveCompilerToFile(S) then
             Error(SErrMissingCompilerConfig,[S]);
@@ -275,7 +275,7 @@ begin
   FFPMakeCompilerOptions.UpdateLocalRepositoryOption(FOptions);
   if FileExists(S) then
     begin
-      {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Log(llDebug,SLogLoadingFPMakeCompilerConfig,[S]);
+      {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkgglobals{$ENDIF}.Log(llDebug,SLogLoadingFPMakeCompilerConfig,[S]);
       FFPMakeCompilerOptions.LoadCompilerFromFile(S);
       if FFPMakeCompilerOptions.SaveInifileChanges then
         // The file is in an old format, try to update the file but ignore
@@ -615,12 +615,12 @@ var
 begin
   // Determine the repository to install a package into. See the
   // repositorylogics.dia file.
-  {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Log(llDebug, SLogDetermineInstallRepo, [ASourcePackage.GetDebugName]);
+  {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkgglobals{$ENDIF}.Log(llDebug, SLogDetermineInstallRepo, [ASourcePackage.GetDebugName]);
   RepoName := Options.CommandLineSection.InstallRepository;
   if RepoName <> '' then
     // If an install-repository is given on the command line, this overrides
     // everything.
-    {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Log(llDebug, SLogUseCommandLineRepo, [RepoName])
+    {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkgglobals{$ENDIF}.Log(llDebug, SLogUseCommandLineRepo, [RepoName])
   else
     begin
       // The source-repository is already determined by the source-package, which
@@ -634,12 +634,12 @@ begin
       Assert(Assigned(SourceRepository.DefaultPackagesStructure));
       RepoName := SourceRepository.DefaultPackagesStructure.InstallRepositoryName;
       if RepoName<>'' then
-        {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Log(llDebug, SLogUseSourceRepoInstRepo, [RepoName, SourceRepository.RepositoryName])
+        {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkgglobals{$ENDIF}.Log(llDebug, SLogUseSourceRepoInstRepo, [RepoName, SourceRepository.RepositoryName])
       else
         begin
           RepoName := Options.GlobalSection.InstallRepository;
           if RepoName<>'' then
-            {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Log(llDebug, SLogUseConfigurationRepo, [RepoName])
+            {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkgglobals{$ENDIF}.Log(llDebug, SLogUseConfigurationRepo, [RepoName])
           else
             begin
               for i := RepositoryList.Count-1 downto 0 do
@@ -647,7 +647,7 @@ begin
                   if (RepositoryList[i] as TFPRepository).RepositoryType = fprtInstalled then
                     begin
                       Result := TFPRepository(RepositoryList[i]);
-                      {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Log(llDebug, SLogUseLastRepo, [Result.RepositoryName]);
+                      {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkgglobals{$ENDIF}.Log(llDebug, SLogUseLastRepo, [Result.RepositoryName]);
                       Exit;
                     end;
                 end;

packages/fppkg/src/pkghandler.pp

@@ -300,25 +300,25 @@ end;
 
 Procedure TPackageHandler.Log(Level:TLogLevel; Msg:String);
 begin
-  {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Log(Level,PackageLogPrefix+Msg);
+  {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkgglobals{$ENDIF}.Log(Level,PackageLogPrefix+Msg);
 end;
 
 
 Procedure TPackageHandler.Log(Level:TLogLevel; Fmt:String; const Args:array of const);
 begin
-  {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.log(Level,PackageLogPrefix+Fmt,Args);
+  {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkgglobals{$ENDIF}.log(Level,PackageLogPrefix+Fmt,Args);
 end;
 
 
 Procedure TPackageHandler.Error(Msg:String);
 begin
-  {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Error(PackageLogPrefix+Msg);
+  {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkgglobals{$ENDIF}.Error(PackageLogPrefix+Msg);
 end;
 
 
 Procedure TPackageHandler.Error(Fmt:String; const Args:array of const);
 begin
-  {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Error(PackageLogPrefix+Fmt,Args);
+  {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkgglobals{$ENDIF}.Error(PackageLogPrefix+Fmt,Args);
 end;