瀏覽代碼

* Dotted filenames for package fppkg

Michaël Van Canneyt 2 年之前
父節點
當前提交
54d89d43ce
共有 33 個文件被更改,包括 362 次插入32 次删除
  1. 3 0
      packages/fppkg/namespaced/FpPkg.Commands.pp
  2. 3 0
      packages/fppkg/namespaced/FpPkg.Conv.pp
  3. 3 0
      packages/fppkg/namespaced/FpPkg.Download.pp
  4. 3 0
      packages/fppkg/namespaced/FpPkg.Globals.pp
  5. 3 0
      packages/fppkg/namespaced/FpPkg.Handler.pp
  6. 3 0
      packages/fppkg/namespaced/FpPkg.Http.pp
  7. 3 0
      packages/fppkg/namespaced/FpPkg.Make.pp
  8. 3 0
      packages/fppkg/namespaced/FpPkg.Messages.pp
  9. 3 0
      packages/fppkg/namespaced/FpPkg.Options.pp
  10. 3 0
      packages/fppkg/namespaced/FpPkg.Package.pp
  11. 3 0
      packages/fppkg/namespaced/FpPkg.PackageRepos.pp
  12. 3 0
      packages/fppkg/namespaced/FpPkg.Packages.Structure.pp
  13. 3 0
      packages/fppkg/namespaced/FpPkg.Repos.pp
  14. 3 0
      packages/fppkg/namespaced/FpPkg.UninstalledSrcsRepo.pp
  15. 3 0
      packages/fppkg/namespaced/FpPkg.Wget.pp
  16. 3 0
      packages/fppkg/namespaced/FpPkg.XmlRep.pp
  17. 18 0
      packages/fppkg/namespaces.lst
  18. 21 0
      packages/fppkg/src/fprepos.pp
  19. 17 6
      packages/fppkg/src/fpxmlrep.pp
  20. 24 4
      packages/fppkg/src/pkgcommands.pp
  21. 19 1
      packages/fppkg/src/pkgdownload.pp
  22. 11 0
      packages/fppkg/src/pkgfphttp.pp
  23. 19 0
      packages/fppkg/src/pkgfpmake.pp
  24. 31 10
      packages/fppkg/src/pkgfppkg.pp
  25. 26 3
      packages/fppkg/src/pkgglobals.pp
  26. 29 6
      packages/fppkg/src/pkghandler.pp
  27. 2 0
      packages/fppkg/src/pkgmessages.pp
  28. 15 1
      packages/fppkg/src/pkgmkconv.pp
  29. 13 0
      packages/fppkg/src/pkgoptions.pp
  30. 19 0
      packages/fppkg/src/pkgpackagesstructure.pp
  31. 19 0
      packages/fppkg/src/pkgrepos.pp
  32. 18 1
      packages/fppkg/src/pkguninstalledsrcsrepo.pp
  33. 13 0
      packages/fppkg/src/pkgwget.pp

+ 3 - 0
packages/fppkg/namespaced/FpPkg.Commands.pp

@@ -0,0 +1,3 @@
+unit FpPkg.Commands;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i pkgcommands.pp}

+ 3 - 0
packages/fppkg/namespaced/FpPkg.Conv.pp

@@ -0,0 +1,3 @@
+unit FpPkg.Conv;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i pkgmkconv.pp}

+ 3 - 0
packages/fppkg/namespaced/FpPkg.Download.pp

@@ -0,0 +1,3 @@
+unit FpPkg.Download;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i pkgdownload.pp}

+ 3 - 0
packages/fppkg/namespaced/FpPkg.Globals.pp

@@ -0,0 +1,3 @@
+unit FpPkg.Globals;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i pkgglobals.pp}

+ 3 - 0
packages/fppkg/namespaced/FpPkg.Handler.pp

@@ -0,0 +1,3 @@
+unit FpPkg.Handler;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i pkghandler.pp}

+ 3 - 0
packages/fppkg/namespaced/FpPkg.Http.pp

@@ -0,0 +1,3 @@
+unit FpPkg.Http;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i pkgfphttp.pp}

+ 3 - 0
packages/fppkg/namespaced/FpPkg.Make.pp

@@ -0,0 +1,3 @@
+unit FpPkg.Make;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i pkgfpmake.pp}

+ 3 - 0
packages/fppkg/namespaced/FpPkg.Messages.pp

@@ -0,0 +1,3 @@
+unit FpPkg.Messages;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i pkgmessages.pp}

+ 3 - 0
packages/fppkg/namespaced/FpPkg.Options.pp

@@ -0,0 +1,3 @@
+unit FpPkg.Options;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i pkgoptions.pp}

+ 3 - 0
packages/fppkg/namespaced/FpPkg.Package.pp

@@ -0,0 +1,3 @@
+unit FpPkg.Package;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i pkgfppkg.pp}

+ 3 - 0
packages/fppkg/namespaced/FpPkg.PackageRepos.pp

@@ -0,0 +1,3 @@
+unit FpPkg.PackageRepos;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i pkgrepos.pp}

+ 3 - 0
packages/fppkg/namespaced/FpPkg.Packages.Structure.pp

@@ -0,0 +1,3 @@
+unit FpPkg.Packages.Structure;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i pkgpackagesstructure.pp}

+ 3 - 0
packages/fppkg/namespaced/FpPkg.Repos.pp

@@ -0,0 +1,3 @@
+unit FpPkg.Repos;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fprepos.pp}

+ 3 - 0
packages/fppkg/namespaced/FpPkg.UninstalledSrcsRepo.pp

@@ -0,0 +1,3 @@
+unit FpPkg.UninstalledSrcsRepo;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i pkguninstalledsrcsrepo.pp}

+ 3 - 0
packages/fppkg/namespaced/FpPkg.Wget.pp

@@ -0,0 +1,3 @@
+unit FpPkg.Wget;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i pkgwget.pp}

+ 3 - 0
packages/fppkg/namespaced/FpPkg.XmlRep.pp

@@ -0,0 +1,3 @@
+unit FpPkg.XmlRep;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpxmlrep.pp}

+ 18 - 0
packages/fppkg/namespaces.lst

@@ -0,0 +1,18 @@
+src/fpxmlrep.pp=namespaced/FpPkg.XmlRep.pp
+{s*:src/}=namespaced/
+{i+:src/}
+src/pkgfpmake.pp=namespaced/FpPkg.Make.pp
+src/pkgwget.pp=namespaced/FpPkg.Wget.pp
+src/fprepos.pp=namespaced/FpPkg.Repos.pp
+src/pkgrepos.pp=namespaced/FpPkg.PackageRepos.pp
+src/pkgmkconv.pp=namespaced/FpPkg.Conv.pp
+src/pkguninstalledsrcsrepo.pp=namespaced/FpPkg.UninstalledSrcsRepo.pp
+src/pkgglobals.pp=namespaced/FpPkg.Globals.pp
+src/pkgmessages.pp=namespaced/FpPkg.Messages.pp
+src/pkgfphttp.pp=namespaced/FpPkg.Http.pp
+src/pkgpackagesstructure.pp=namespaced/FpPkg.Packages.Structure.pp
+src/pkghandler.pp=namespaced/FpPkg.Handler.pp
+src/pkgdownload.pp=namespaced/FpPkg.Download.pp
+src/pkgfppkg.pp=namespaced/FpPkg.Package.pp
+src/pkgoptions.pp=namespaced/FpPkg.Options.pp
+src/pkgcommands.pp=namespaced/FpPkg.Commands.pp

+ 21 - 0
packages/fppkg/src/fprepos.pp

@@ -12,16 +12,27 @@
  **********************************************************************}
 {$mode objfpc}
 {$H+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fprepos;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes,System.SysUtils,
+  System.Contnrs,
+  Fpmkunit,
+  Fcl.Streams.Collection,
+  FpPkg.Options;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   classes,sysutils,
   contnrs,
   fpmkunit,
   streamcoll,
   pkgoptions;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Const
   StreamVersion   : Integer = 1;
@@ -330,6 +341,15 @@ Procedure StringToCPUOS(S : String; Var CPU : TCPU; Var OS: TOS);
 
 Implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.TypInfo,
+  FpPkg.Globals,
+  FpPkg.Messages,
+  FpPkg.PackageRepos,
+  FpPkg.XmlRep,
+  Fcl.UriParser;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   typinfo,
   pkgglobals,
@@ -337,6 +357,7 @@ uses
   pkgrepos,
   fpxmlrep,
   uriparser;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   // Keys for unit config

+ 17 - 6
packages/fppkg/src/fpxmlrep.pp

@@ -10,14 +10,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpxmlrep;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, Xml.Dom, FpPkg.Repos, Fpmkunit;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, dom, fprepos, fpmkunit;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
 
@@ -106,7 +113,11 @@ Type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Xml.Writer,Xml.Read,System.TypInfo;
+{$ELSE FPC_DOTTEDUNITS}
 uses xmlwrite,xmlread,typinfo;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Const
   SNodeRepository   = 'repository';
@@ -764,7 +775,7 @@ procedure TFPXMLRepositoryHandler.LoadFromXml(D: TFPDependency; Stream: TStream)
 Var
   XML : TXMLDocument;
 begin
-  Xmlread.ReadXMLFile(XML,Stream);
+  ReadXMLFile(XML,Stream);
   try
     XmlToDependency(XML.DocumentElement,D);
   finally
@@ -777,7 +788,7 @@ procedure TFPXMLRepositoryHandler.LoadFromXml(DS: TFPDependencies; Stream: TStre
 Var
   XML : TXMLDocument;
 begin
-  xmlread.ReadXMLFile(XML,Stream);
+  ReadXMLFile(XML,Stream);
   try
     XmlToDependencies(XML.DocumentElement,DS);
   finally
@@ -790,7 +801,7 @@ procedure TFPXMLRepositoryHandler.LoadFromXml(P: TFPPackage; Stream: TStream);
 Var
   XML : TXMLDocument;
 begin
-  xmlread.ReadXMLFile(XML,Stream);
+  ReadXMLFile(XML,Stream);
   try
     XmlToPackage(XML.DocumentElement,P);
   finally
@@ -803,7 +814,7 @@ procedure TFPXMLRepositoryHandler.LoadFromXml(PS: TFPPackages; Stream: TStream);
 Var
   XML : TXMLDocument;
 begin
-  xmlread.ReadXMLFile(XML,Stream);
+  ReadXMLFile(XML,Stream);
   try
     XmlToPackages(XML.DocumentElement,PS);
   finally
@@ -816,7 +827,7 @@ procedure TFPXMLRepositoryHandler.LoadFromXml(R: TFPRepository; Stream: TStream)
 Var
   XML : TXMLDocument;
 begin
-  xmlread.ReadXMLFile(XML,Stream);
+  ReadXMLFile(XML,Stream);
   try
     XmlToRepository(XML.DocumentElement,R);
   finally
@@ -946,7 +957,7 @@ procedure TFPXMLMirrorHandler.LoadFromXml(PS: TFPMirrors; Stream: TStream);
 Var
   XML : TXMLDocument;
 begin
-  xmlread.ReadXMLFile(XML,Stream);
+  ReadXMLFile(XML,Stream);
   try
     XmlToMirrors(XML.DocumentElement,PS);
   finally

+ 24 - 4
packages/fppkg/src/pkgcommands.pp

@@ -10,17 +10,36 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit pkgcommands;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, FpPkg.Handler, Fpmkunit;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, pkghandler, fpmkunit;
+{$ENDIF FPC_DOTTEDUNITS}
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.ZLib.Zipper,
+  FpPkg.Messages,
+  FpPkg.Globals,
+  FpPkg.Options,
+  FpPkg.Download,
+  FpPkg.PackageRepos,
+  FpPkg.Package,
+  FpPkg.XmlRep,
+  FpPkg.Repos;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   zipper,
   pkgmessages,
@@ -31,6 +50,7 @@ uses
   pkgFppkg,
   fpxmlrep,
   fprepos;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   { TCommandAddConfig }
@@ -658,7 +678,7 @@ begin
   if L.Count > 0 then
     begin
       if DependenciesDepth=0 then
-        pkgglobals.Log(llProgress,SProgrInstallDependencies);
+        {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Log(llProgress,SProgrInstallDependencies);
       inc(DependenciesDepth);
 
       for i:=0 to L.Count-1 do
@@ -667,7 +687,7 @@ begin
 
       dec(DependenciesDepth);
       if DependenciesDepth=0 then
-        pkgglobals.Log(llProgress,SProgrDependenciesInstalled);
+        {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Log(llProgress,SProgrDependenciesInstalled);
     end;
   FreeAndNil(L);
   if assigned(ManifestPackages) then
@@ -690,7 +710,7 @@ begin
     PackageManager.FindBrokenPackages(SL);
     if SL.Count=0 then
       break;
-    pkgglobals.Log(llProgress,SProgrReinstallDependent);
+    {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Log(llProgress,SProgrReinstallDependent);
     for i:=0 to SL.Count-1 do
       begin
         if not ExecuteAction(SL[i],'build') then
@@ -700,7 +720,7 @@ begin
         if PackageManager.PackageIsBroken(PackageManager.PackageByName(SL[i], pkgpkInstalled), Reason, nil) then
           begin
             BreakLoop := true;
-            pkgglobals.Log(llWarning, SWarnBrokenAfterReinstall, [SL[i], Reason]);
+            {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Log(llWarning, SWarnBrokenAfterReinstall, [SL[i], Reason]);
           end;
       end;
   until BreakLoop;

+ 19 - 1
packages/fppkg/src/pkgdownload.pp

@@ -10,14 +10,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit pkgDownload;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, FpPkg.Handler, FpPkg.Package;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, pkghandler, pkgFppkg;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
 
@@ -53,6 +60,16 @@ function DownloadFile(const RemoteFile,LocalFile:String; PackageManager: TpkgFPp
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Contnrs,
+  Fcl.UriParser,
+  FpPkg.PackageRepos,
+  FpPkg.Globals,
+  FpPkg.Options,
+  FpPkg.Messages,
+  FpPkg.Repos;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   contnrs,
   uriparser,
@@ -61,6 +78,7 @@ uses
   pkgoptions,
   pkgmessages,
   pkgrepos;
+{$ENDIF FPC_DOTTEDUNITS}
 
 var
   DownloaderList  : TFPHashList;
@@ -197,7 +215,7 @@ begin
           if RemoteArchive <> '' then
             begin
               Log(llCommands,SLogDownloading,[RemoteArchive,PackageManager.PackageLocalArchive(P)]);
-              pkgglobals.log(llProgress,SProgrDownloadPackage,[P.Name, P.Version.AsString]);
+              {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkgglobals{$ENDIF}.log(llProgress,SProgrDownloadPackage,[P.Name, P.Version.AsString]);
 
               // Force the existing of the archives-directory if it is being used
               if (P.Name<>CurrentDirPackageName) and (P.Name<>CmdLinePackageName) then

+ 11 - 0
packages/fppkg/src/pkgfphttp.pp

@@ -12,11 +12,17 @@
  **********************************************************************}
 {$mode objfpc}
 {$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit pkgfphttp;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Classes,FpPkg.Download,FpPkg.Options,FpPkg.Repos;
+{$ELSE FPC_DOTTEDUNITS}
 uses Classes,pkgdownload,pkgoptions,fprepos;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
 
@@ -29,8 +35,13 @@ Type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils,FpWeb.Http.Client, FpPkg.Globals, FpPkg.Messages;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   sysutils,fphttpclient, pkgglobals, pkgmessages;
+{$ENDIF FPC_DOTTEDUNITS}
 
 function TFPHTTPDownloader.HTTPDownload(Const URL: String; Dest: TStream): Boolean;
 

+ 19 - 0
packages/fppkg/src/pkgfpmake.pp

@@ -10,18 +10,36 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit pkgfpmake;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes,System.SysUtils, System.DateUtils,
+  FpPkg.Handler, Fpmkunit;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes,SysUtils,DateUtils,
   pkghandler, fpmkunit;
+{$ENDIF FPC_DOTTEDUNITS}
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  FpPkg.Repos,
+  FpPkg.Options,
+  FpPkg.Globals,
+  FpPkg.Messages,
+  FpPkg.PackageRepos,
+  FpPkg.Package,
+  FpPkg.XmlRep;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   fprepos,
   pkgoptions,
@@ -30,6 +48,7 @@ uses
   pkgrepos,
   pkgFppkg,
   fpxmlrep;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   { TFPMakeCompiler }

+ 31 - 10
packages/fppkg/src/pkgfppkg.pp

@@ -10,12 +10,25 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit pkgFppkg;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes,
+  System.SysUtils,
+  System.Contnrs,
+  FpPkg.Repos,
+  FpPkg.Messages,
+  FpPkg.Globals,
+  FpPkg.Options,
+  FpPkg.Packages.structure;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes,
   SysUtils,
@@ -25,6 +38,7 @@ uses
   pkgglobals,
   pkgoptions,
   pkgPackagesStructure;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 
@@ -99,10 +113,17 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Fpmkunit,
+  FpPkg.XmlRep,
+  FpPkg.PackageRepos;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   fpmkunit,
   fpxmlrep,
   pkgrepos;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { TpkgFPpkg }
 
@@ -209,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
-    pkgglobals.Log(llDebug,SLogGeneratingGlobalConfig,[cfgfile])
+    {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Log(llDebug,SLogGeneratingGlobalConfig,[cfgfile])
   else
-    pkgglobals.Log(llDebug,SLogLoadingGlobalConfig,[cfgfile]);
+    {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Log(llDebug,SLogLoadingGlobalConfig,[cfgfile]);
   FConfigurationFilename := CfgFile;
   // Log configuration
   FOptions.LogValues(llDebug);
@@ -226,7 +247,7 @@ begin
   FCompilerOptions.UpdateLocalRepositoryOption(FOptions);
   if FileExists(S) then
     begin
-      pkgglobals.Log(llDebug,SLogLoadingCompilerConfig,[S]);
+      {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$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
@@ -239,7 +260,7 @@ begin
         // A new fppkg.cfg has been created, try to create a new compiler-configuration
         // file too.
         begin
-          pkgglobals.Log(llDebug,SLogGeneratingCompilerConfig,[S]);
+          {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Log(llDebug,SLogGeneratingCompilerConfig,[S]);
           FCompilerOptions.InitCompilerDefaults;
           if not FCompilerOptions.SaveCompilerToFile(S) then
             Error(SErrMissingCompilerConfig,[S]);
@@ -254,7 +275,7 @@ begin
   FFPMakeCompilerOptions.UpdateLocalRepositoryOption(FOptions);
   if FileExists(S) then
     begin
-      pkgglobals.Log(llDebug,SLogLoadingFPMakeCompilerConfig,[S]);
+      {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$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
@@ -594,12 +615,12 @@ var
 begin
   // Determine the repository to install a package into. See the
   // repositorylogics.dia file.
-  pkgglobals.Log(llDebug, SLogDetermineInstallRepo, [ASourcePackage.GetDebugName]);
+  {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$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.
-    pkgglobals.Log(llDebug, SLogUseCommandLineRepo, [RepoName])
+    {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Log(llDebug, SLogUseCommandLineRepo, [RepoName])
   else
     begin
       // The source-repository is already determined by the source-package, which
@@ -613,12 +634,12 @@ begin
       Assert(Assigned(SourceRepository.DefaultPackagesStructure));
       RepoName := SourceRepository.DefaultPackagesStructure.InstallRepositoryName;
       if RepoName<>'' then
-        pkgglobals.Log(llDebug, SLogUseSourceRepoInstRepo, [RepoName, SourceRepository.RepositoryName])
+        {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Log(llDebug, SLogUseSourceRepoInstRepo, [RepoName, SourceRepository.RepositoryName])
       else
         begin
           RepoName := Options.GlobalSection.InstallRepository;
           if RepoName<>'' then
-            pkgglobals.Log(llDebug, SLogUseConfigurationRepo, [RepoName])
+            {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Log(llDebug, SLogUseConfigurationRepo, [RepoName])
           else
             begin
               for i := RepositoryList.Count-1 downto 0 do
@@ -626,7 +647,7 @@ begin
                   if (RepositoryList[i] as TFPRepository).RepositoryType = fprtInstalled then
                     begin
                       Result := TFPRepository(RepositoryList[i]);
-                      pkgglobals.Log(llDebug, SLogUseLastRepo, [Result.RepositoryName]);
+                      {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Log(llDebug, SLogUseLastRepo, [Result.RepositoryName]);
                       Exit;
                     end;
                 end;

+ 26 - 3
packages/fppkg/src/pkgglobals.pp

@@ -12,10 +12,21 @@
  **********************************************************************}
 {$mode objfpc}
 {$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit pkgglobals;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+{$ifdef Unix}
+  UnixApi.Base,
+{$endif}
+  System.SysUtils,
+  System.Classes,
+  Fpmkunit;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 {$ifdef unix}
   baseunix,
@@ -23,6 +34,7 @@ uses
   SysUtils,
   Classes,
   fpmkunit;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Const
 {$ifdef unix}
@@ -121,6 +133,16 @@ Implementation
 {$ENDIF GO32v2 or WATCOM or OS2}
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.TypInfo,
+{$IFNDEF USE_SHELL}
+  System.Process,
+{$ENDIF USE_SHELL}
+  System.Contnrs,
+  Fcl.UriParser,
+  FpPkg.Messages;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   typinfo,
 {$IFNDEF USE_SHELL}
@@ -129,6 +151,7 @@ uses
   contnrs,
   uriparser,
   pkgmessages;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 function FPPkgGetVendorName:string;
@@ -269,7 +292,7 @@ end;
 
 Function DirectoryExistsLog(const ADir:string):Boolean;
 begin
-  result:=SysUtils.DirectoryExists(ADir);
+  result:={$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.DirectoryExists(ADir);
   if result then
     log(llDebug,SDbgDirectoryExists,[ADir,SDbgFound])
   else
@@ -279,7 +302,7 @@ end;
 
 Function FileExistsLog(const AFileName:string):Boolean;
 begin
-  result:=SysUtils.FileExists(AFileName);
+  result:={$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.FileExists(AFileName);
   if result then
     log(llDebug,SDbgFileExists,[AFileName,SDbgFound])
   else
@@ -370,7 +393,7 @@ begin
   else
    TmpfileName := 'fppkgout.' + ProcIDStr;
   CmdLine2 := '/C ' + ACompiler + ' ' + AOptions + ' > ' + TmpFileName;
-  SysUtils.ExecuteProcess (GetEnvironmentVariable ('COMSPEC'), CmdLine2);
+  {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.ExecuteProcess (GetEnvironmentVariable ('COMSPEC'), CmdLine2);
   Assign (TmpFile, TmpFileName);
   Reset (TmpFile, 1);
   BlockRead (TmpFile, Buf, BufSize, Count);

+ 29 - 6
packages/fppkg/src/pkghandler.pp

@@ -13,7 +13,9 @@
 
 {$mode objfpc}
 {$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit pkghandler;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$IFDEF OS2}
  {$DEFINE NO_UNIT_PROCESS}
@@ -29,6 +31,17 @@ unit pkghandler;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes,System.SysUtils,
+  FpPkg.Globals,
+  FpPkg.Options,
+{$ifdef HAS_UNIT_PROCESS}
+  System.Process,
+{$endif HAS_UNIT_PROCESS}
+  FpPkg.Repos,
+  FpPkg.Package;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes,SysUtils,
   pkgglobals,
@@ -38,6 +51,7 @@ uses
 {$endif HAS_UNIT_PROCESS}
   fprepos,
   pkgFppkg;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   { TPackageHandler }
@@ -76,12 +90,21 @@ procedure ClearExecutedAction;
 
 Implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.TypInfo,
+  System.Contnrs,
+  Fcl.UriParser,
+  FpPkg.PackageRepos,
+  FpPkg.Messages;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   typinfo,
   contnrs,
   uriparser,
   pkgrepos,
   pkgmessages;
+{$ENDIF FPC_DOTTEDUNITS}
 
 var
   PkgHandlerList  : TFPHashList;
@@ -255,7 +278,7 @@ end;
 Procedure TPackageHandler.SetCurrentDir(Const ADir:String);
 begin
   Log(llCommands,SLogChangeDir,[ADir]);
-  if not SysUtils.SetCurrentDir(ADir) then
+  if not {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.SetCurrentDir(ADir) then
     Error(SErrChangeDirFailed,[ADir]);
 end;
 
@@ -271,31 +294,31 @@ end;
 
 function TPackageHandler.ExecuteAction(const APackageName, AAction: string): Boolean;
 begin
-  Result := pkghandler.ExecuteAction(APackageName,AAction,PackageManager);
+  Result := {$IFDEF FPC_DOTTEDUNITS}FpPkg.Handler{$ELSE}pkghandler{$ENDIF}.ExecuteAction(APackageName,AAction,PackageManager);
 end;
 
 
 Procedure TPackageHandler.Log(Level:TLogLevel; Msg:String);
 begin
-  pkgglobals.Log(Level,PackageLogPrefix+Msg);
+  {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Log(Level,PackageLogPrefix+Msg);
 end;
 
 
 Procedure TPackageHandler.Log(Level:TLogLevel; Fmt:String; const Args:array of const);
 begin
-  pkgglobals.log(Level,PackageLogPrefix+Fmt,Args);
+  {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.log(Level,PackageLogPrefix+Fmt,Args);
 end;
 
 
 Procedure TPackageHandler.Error(Msg:String);
 begin
-  pkgglobals.Error(PackageLogPrefix+Msg);
+  {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Error(PackageLogPrefix+Msg);
 end;
 
 
 Procedure TPackageHandler.Error(Fmt:String; const Args:array of const);
 begin
-  pkgglobals.Error(PackageLogPrefix+Fmt,Args);
+  {$IFDEF FPC_DOTTEDUNITS}FpPkg.Globals{$ELSE}pkglobals{$ENDIF}.Error(PackageLogPrefix+Fmt,Args);
 end;
 
 

+ 2 - 0
packages/fppkg/src/pkgmessages.pp

@@ -11,7 +11,9 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit pkgmessages;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 

+ 15 - 1
packages/fppkg/src/pkgmkconv.pp

@@ -10,14 +10,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit pkgmkconv;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils,FpPkg.Handler;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils,pkghandler;
+{$ENDIF FPC_DOTTEDUNITS}
   { TMakeFileConverter }
 
 Type
@@ -60,10 +67,17 @@ Type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.TypInfo,
+  FpPkg.Globals,
+  FpPkg.Messages;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   TypInfo,
   pkgglobals,
   pkgmessages;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Function GetWord(var S : String; Sep : AnsiChar) : String;
 
@@ -133,7 +147,7 @@ begin
     Add('{$mode objfpc}{$H+}');
     Add('program fpmake;');
     Add('');
-    Add(' { Generated automatically by '+ExtractFileName(Paramstr(0))+' on '+DateToStr(Sysutils.Date)+' }');
+    Add(' { Generated automatically by '+ExtractFileName(Paramstr(0))+' on '+DateToStr({$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}Sysutils.Date)+' }');
     Add('');
     Add('uses fpmkunit;');
     Add('');

+ 13 - 0
packages/fppkg/src/pkgoptions.pp

@@ -12,12 +12,18 @@
  **********************************************************************}
 {$mode objfpc}
 {$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit pkgoptions;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
 // pkgglobals must be AFTER fpmkunit
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Classes, System.SysUtils, System.IniFiles, System.StrUtils, Fcl.Template, Fpmkunit, FpPkg.Globals, System.FGL;
+{$ELSE FPC_DOTTEDUNITS}
 uses Classes, Sysutils, Inifiles, StrUtils, fpTemplate, fpmkunit, pkgglobals, fgl;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Const
   UnitConfigFileName   = 'fpunits.cfg';
@@ -270,10 +276,17 @@ Type
 
 Implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  FpPkg.UninstalledSrcsRepo,
+  FpPkg.Packages.Structure,
+  FpPkg.Messages;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   pkgUninstalledSrcsRepo,
   pkgPackagesStructure,
   pkgmessages;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Const
   DefaultMirrorsURL  = 'https://www.freepascal.org/repository/'+MirrorsFileName;

+ 19 - 0
packages/fppkg/src/pkgpackagesstructure.pp

@@ -10,18 +10,29 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit pkgPackagesStructure;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes,
+  System.SysUtils,
+  FpPkg.Repos,
+  FpPkg.XmlRep,
+  FpPkg.Options;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes,
   SysUtils,
   fprepos,
   fpxmlrep,
   pkgoptions;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 
@@ -112,11 +123,19 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Fpmkunit,
+  FpPkg.Messages,
+  FpPkg.PackageRepos,
+  FpPkg.Globals;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   fpmkunit,
   pkgmessages,
   pkgrepos,
   pkgglobals;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { TFPArchiveFilenamePackagesStructure }
 

+ 19 - 0
packages/fppkg/src/pkgrepos.pp

@@ -10,17 +10,27 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit pkgrepos;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils,System.Classes,
+  FpPkg.Repos,FpPkg.Options,
+  FpPkg.Package,
+  Fpmkunit;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   SysUtils,Classes,
   fprepos,pkgoptions,
   pkgFppkg,
   fpmkunit;
+{$ENDIF FPC_DOTTEDUNITS}
 
 procedure LoadLocalAvailableMirrors;
 function LoadManifestFromFile(const AManifestFN:string):TFPPackage;
@@ -40,12 +50,21 @@ var
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.ZLib.Zipper,
+  FpPkg.XmlRep,
+  FpPkg.Globals,
+  FpPkg.Messages,
+  FpPkg.Packages.Structure;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   zipper,
   fpxmlrep,
   pkgglobals,
   pkgmessages,
   pkgPackagesStructure;
+{$ENDIF FPC_DOTTEDUNITS}
 
 resourcestring
   SErrRepositoryClassAlreadyAssigned = 'Default repository class is already assigned.';

+ 18 - 1
packages/fppkg/src/pkguninstalledsrcsrepo.pp

@@ -10,12 +10,28 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit pkgUninstalledSrcsRepo;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes,
+  System.SysUtils,
+  Fpmkunit,
+  FpPkg.Options,
+  FpPkg.Package,
+  FpPkg.Globals,
+  FpPkg.Messages,
+  FpPkg.Repos,
+  FpPkg.PackageRepos,
+  FpPkg.Handler,
+  FpPkg.Packages.Structure;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes,
   SysUtils,
@@ -28,6 +44,7 @@ uses
   pkgrepos,
   pkghandler,
   pkgPackagesStructure;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 
@@ -277,7 +294,7 @@ begin
                             TempPackagesStructure.SetTempPath(Path+SR.Name);
                             PackageName :=  SR.Name + '_create_manifest';
                             TempPackagesStructure.TempPackageName := PackageName;
-                            pkghandler.ExecuteAction(PackageName,'fpmakemanifest',PackageManager);
+                            {$IFDEF FPC_DOTTEDUNITS}FpPkg.Handler{$ELSE}pkghandler{$ENDIF}.ExecuteAction(PackageName,'fpmakemanifest',PackageManager);
                           except
                             on E: Exception do
                               begin

+ 13 - 0
packages/fppkg/src/pkgwget.pp

@@ -12,11 +12,17 @@
  **********************************************************************}
 {$mode objfpc}
 {$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit pkgwget;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Classes,FpPkg.Download,FpPkg.Options,FpPkg.Repos;
+{$ELSE FPC_DOTTEDUNITS}
 uses Classes,pkgdownload,pkgoptions,fprepos;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
 
@@ -36,10 +42,17 @@ Type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils,System.Process,
+  FpPkg.Globals,
+  FpPkg.Messages;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   sysutils,process,
   pkgglobals,
   pkgmessages;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Constructor TWGetDownloader.Create(AOwner: TComponent);