IDE, FCL: moved designtime unit registerfcl.pas from fcl.lpk to the IDE

git-svn-id: trunk@53617 -

.gitattributes

@@ -8178,6 +8178,7 @@ packager/pkggraphexplorer.pas svneol=native#text/pascal
 packager/pkglinksdlg.lfm svneol=native#text/plain
 packager/pkglinksdlg.pas svneol=native#text/plain
 packager/pkgmanager.pas svneol=native#text/pascal
+packager/pkgregisterbase.pas svneol=native#text/pascal
 packager/pkgvirtualuniteditor.pas svneol=native#text/pascal
 packager/projpackbase.pas svneol=native#text/pascal
 packager/projpackchecks.pas svneol=native#text/pascal
@@ -8187,7 +8188,6 @@ packager/registration/fcl.lpk svneol=native#text/plain
 packager/registration/fcllaz.pas svneol=native#text/plain
 packager/registration/fpmake.pp svneol=native#text/plain
 packager/registration/lazaruspackageintf.pas svneol=native#text/pascal
-packager/registration/registerfcl.pas svneol=native#text/pascal
 startlazarus.app/Contents/Info.plist svneol=native#text/plain
 startlazarus.app/Contents/MacOS/startlazarus -text svneol=unset#application/octet-stream
 startlazarus.app/Contents/PkgInfo svneol=native#text/plain

packager/pkgmanager.pas

@@ -60,9 +60,9 @@ uses
   MenuIntf, IDEWindowIntf, IDEExternToolIntf, MacroIntf, LazIDEIntf, IDEMsgIntf,
   ComponentReg, PropEdits, IDEDialogs, UnitResources,
   // IDE
-  IDECmdLine, LazarusIDEStrConsts, IDEProcs, ObjectLists, DialogProcs,
+  PkgRegisterBase, IDECmdLine, LazarusIDEStrConsts, IDEProcs, ObjectLists,
-  IDECommands, IDEOptionDefs, EnvironmentOpts, MiscOptions, InputHistory,
+  DialogProcs, IDECommands, IDEOptionDefs, EnvironmentOpts, MiscOptions,
-  Project, OldCustomCompDlg, PackageEditor, AddToPackageDlg,
+  InputHistory, Project, OldCustomCompDlg, PackageEditor, AddToPackageDlg,
   PackageDefs, PackageLinks, PackageSystem, OpenInstalledPkgDlg,
   PkgGraphExplorer, BrokenDependenciesDlg, CompilerOptions,
   IDETranslations, TransferMacros, BuildLazDialog, NewDialog, FindInFilesDlg,
@@ -1549,6 +1549,8 @@ begin
   StaticPackages:=LazarusPackageIntf.RegisteredPackages;
   if StaticPackages=nil then exit;
   Quiet:=false;
+
+  // register components in Lazarus packages
   for i:=0 to StaticPackages.Count-1 do begin
     StaticPackage:=PRegisteredPackage(StaticPackages[i]);
 
@@ -1570,9 +1572,13 @@ begin
     // load package
     APackage:=LoadInstalledPackage(StaticPackage^.Name,KeepInstalledPackages,
                                    Quiet);
-    
+
     // register
-    PackageGraph.RegisterStaticPackage(APackage,StaticPackage^.RegisterProc);
+    if APackage=PackageGraph.FCLPackage then
+      // register FCL components used by the IDE itself
+      PackageGraph.RegisterStaticPackage(APackage,@PkgRegisterBase.Register)
+    else
+      PackageGraph.RegisterStaticPackage(APackage,StaticPackage^.RegisterProc);
   end;
   PackageGraph.SortAutoInstallDependencies;
   ClearRegisteredPackages;

packager/pkgregisterbase.pas

@@ -1,8 +1,7 @@
-{  $Id$  }
 {
  /***************************************************************************
-                            registerlcl.pas
+                            pkgregisterbase.pas
-                            ---------------
+                            -------------------
 
 
  ***************************************************************************/
@@ -29,9 +28,9 @@
   Author: Mattias Gaertner
 
   Abstract:
-    Registration of the FCL components.
+    Registration of the FCL components used by the IDE.
 }
-unit RegisterFCL;
+unit PkgRegisterBase;
 
 {$mode objfpc}{$H+}
 

packager/registration/fcl.lpk

@@ -16,58 +16,53 @@
     <Description Value="The FCL - FreePascal Component Library provides the base classes for object pascal."/>
     <License Value="modified LGPL-2"/>
     <Version Major="1" Release="1"/>
-    <Files Count="10">
+    <Files Count="9">
       <Item1>
         <Filename Value="lazaruspackageintf.pas"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="LazarusPackageIntf"/>
       </Item1>
       <Item2>
-        <Filename Value="registerfcl.pas"/>
-        <HasRegisterProc Value="True"/>
-        <UnitName Value="RegisterFCL"/>
-      </Item2>
-      <Item3>
         <Filename Value="db.pas"/>
         <Type Value="Virtual Unit"/>
         <UnitName Value="db"/>
-      </Item3>
+      </Item2>
-      <Item4>
+      <Item3>
         <Filename Value="process.pas"/>
         <Type Value="Virtual Unit"/>
         <UnitName Value="process"/>
-      </Item4>
+      </Item3>
-      <Item5>
+      <Item4>
         <Filename Value="simpleipc.pas"/>
         <Type Value="Virtual Unit"/>
         <UnitName Value="simpleipc"/>
-      </Item5>
+      </Item4>
-      <Item6>
+      <Item5>
         <Filename Value="eventlog.pas"/>
         <Type Value="Virtual Unit"/>
         <UnitName Value="eventlog"/>
-      </Item6>
+      </Item5>
-      <Item7>
+      <Item6>
         <Filename Value="XMLConf.pas"/>
         <Type Value="Virtual Unit"/>
         <UnitName Value="XMLConf"/>
-      </Item7>
+      </Item6>
-      <Item8>
+      <Item7>
         <Filename Value="fcllaz.pas"/>
         <Type Value="Main Unit"/>
         <UnitName Value="fcllaz"/>
-      </Item8>
+      </Item7>
-      <Item9>
+      <Item8>
         <Filename Value="servicemanager.pas"/>
         <Type Value="Virtual Unit"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="ServiceManager"/>
-      </Item9>
+      </Item8>
-      <Item10>
+      <Item9>
         <Filename Value="sqldb.pp"/>
         <Type Value="Virtual Unit"/>
         <UnitName Value="sqldb"/>
-      </Item10>
+      </Item9>
     </Files>
     <LazDoc Paths="docs"/>
     <UsageOptions>

packager/registration/fcllaz.pas

@@ -8,14 +8,12 @@ unit fcllaz;
 interface
 
 uses
-  RegisterFCL, db, process, simpleipc, eventlog, XMLConf, sqldb, 
+  db, process, simpleipc, eventlog, XMLConf, sqldb, LazarusPackageIntf;
-  LazarusPackageIntf;
 
 implementation
 
 procedure Register;
 begin
-  RegisterUnit('RegisterFCL', @RegisterFCL.Register);
 end;
 
 initialization