Move unit ProjPackCommon to package IdeConfig.

converter/convertdelphi.pas

@@ -46,10 +46,10 @@ uses
   // IDEIntf
   IDEDialogs, LazIDEIntf, IDEOptEditorIntf, EditorSyntaxHighlighterDef,
   // IdeConfig
-  IDEProcs, ParsedCompilerOpts, CompilerOptions,
+  IDEProcs, SearchPathProcs, ParsedCompilerOpts, CompilerOptions, ProjPackCommon,
   // IDE
-  DialogProcs, ProjPackCommon, Project, PackageDefs, PackageSystem, PackageEditor,
-  BasePkgManager, LazarusIDEStrConsts, SearchPathProcs, SourceFileManager,
+  DialogProcs, Project, PackageDefs, PackageSystem, PackageEditor,
+  BasePkgManager, LazarusIDEStrConsts, SourceFileManager,
   // Converter
   ConverterTypes, ConvertSettings, ConvCodeTool, MissingUnits, MissingPropertiesDlg,
   UsedUnits;

ide/buildmanager.pas

@@ -53,8 +53,9 @@ uses
   // IdeConfig
   LazConf, EnvironmentOpts, ModeMatrixOpts, TransferMacros, IdeConfStrConsts,
   IDEProcs, etMakeMsgParser, etFPCMsgFilePool, ParsedCompilerOpts, CompilerOptions,
+  EditDefineTree,
   // IDE
-  LazarusIDEStrConsts, DialogProcs, EditDefineTree, ProjectResources,
+  LazarusIDEStrConsts, DialogProcs, ProjectResources,
   MiscOptions, ExtTools, etFPCMsgParser, etPas2jsMsgParser, Compiler,
   FPCSrcScan, PackageDefs, PackageSystem, Project, ProjectIcon, BaseBuildManager,
   ApplicationBundle, RunParamsOpts, IdeTransferMacros, SearchPathProcs;

ide/codetoolsdefines.pas

@@ -57,10 +57,10 @@ uses
   // IdeIntf
   IdeIntfStrConsts, IDEWindowIntf, IDEImagesIntf, IDEDialogs,
   // IdeConfig
-  LazConf, TransferMacros, IDEProcs, CompilerOptions,
+  LazConf, TransferMacros, IDEProcs, CompilerOptions, EditDefineTree,
   // IDE
   LazarusIDEStrConsts, CodeToolsOptions, CodeToolsDefPreview,
-  EditorOptions, InputFileDialog, EditDefineTree;
+  EditorOptions, InputFileDialog;
 
 type
 

ide/packages/ideconfig/fpmake.pp

@@ -68,6 +68,7 @@ begin
     t.Dependencies.AddUnit('lazconf');
     t.Dependencies.AddUnit('modematrixopts');
     t.Dependencies.AddUnit('parsedcompileropts');
+    t.Dependencies.AddUnit('projpackcommon');
     t.Dependencies.AddUnit('recentlistprocs');
     t.Dependencies.AddUnit('searchpathprocs');
     t.Dependencies.AddUnit('toolbaroptionsbase');
@@ -77,7 +78,7 @@ begin
     T:=P.Targets.AddUnit('compoptsmodes.pas');
     T:=P.Targets.AddUnit('coolbaroptions.pas');
     T:=P.Targets.AddUnit('diffpatch.pas');
-    P.Targets.AddImplicitUnit('editdefinetree.pas');
+    T:=P.Targets.AddUnit('editdefinetree.pas');
     T:=P.Targets.AddUnit('editortoolbaroptions.pas');
     T:=P.Targets.AddUnit('environmentopts.pp');
     T:=P.Targets.AddUnit('etfpcmsgfilepool.pas');
@@ -91,6 +92,7 @@ begin
     T:=P.Targets.AddUnit('lazconf.pp');
     T:=P.Targets.AddUnit('modematrixopts.pas');
     T:=P.Targets.AddUnit('parsedcompileropts.pas');
+    T:=P.Targets.AddUnit('projpackcommon.pas');
     T:=P.Targets.AddUnit('recentlistprocs.pas');
     T:=P.Targets.AddUnit('searchpathprocs.pas');
     T:=P.Targets.AddUnit('toolbaroptionsbase.pas');

ide/packages/ideconfig/ideconfig.lpk

@@ -95,6 +95,10 @@ Files in this package are for the main configuration of the IDE."/>
         <Filename Value="parsedcompileropts.pas"/>
         <UnitName Value="ParsedCompilerOpts"/>
       </Item>
+      <Item>
+        <Filename Value="projpackcommon.pas"/>
+        <UnitName Value="ProjPackCommon"/>
+      </Item>
       <Item>
         <Filename Value="recentlistprocs.pas"/>
         <UnitName Value="RecentListProcs"/>

ide/packages/ideconfig/ideconfig.pas

@@ -12,8 +12,8 @@ uses
   EditorToolBarOptions, EnvironmentOpts, etFPCMsgFilePool, etMakeMsgParser, 
   IDECmdLine, IdeConfStrConsts, IDEGuiCmdLine, IDEOptionDefs, IDEProcs, 
   IdeXmlConfigProcs, LazConf, ModeMatrixOpts, ParsedCompilerOpts, 
-  RecentListProcs, SearchPathProcs, ToolBarOptionsBase, TransferMacros, 
-  LazarusPackageIntf;
+  ProjPackCommon, RecentListProcs, SearchPathProcs, ToolBarOptionsBase, 
+  TransferMacros, LazarusPackageIntf;
 
 implementation
 

ide/packages/ideconfig/projpackcommon.pas

@@ -1,3 +1,23 @@
+{
+ ***************************************************************************
+ *                                                                         *
+ *   This source is free software; you can redistribute it and/or modify   *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This code is distributed in the hope that it will be useful, but      *
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
+ *   General Public License for more details.                              *
+ *                                                                         *
+ *   A copy of the GNU General Public License is available on the World    *
+ *   Wide Web at <http://www.gnu.org/copyleft/gpl.html>. You can also      *
+ *   obtain it by writing to the Free Software Foundation,                 *
+ *   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1335, USA.   *
+ *                                                                         *
+ ***************************************************************************
+}
 unit ProjPackCommon;
 
 {$mode objfpc}{$H+}

ide/project.pp

@@ -65,11 +65,10 @@ uses
   // IdeConfig
   EnvironmentOpts, LazConf, TransferMacros, SearchPathProcs, IdeXmlConfigProcs,
   IDECmdLine, IDEProcs, CompOptsModes, ModeMatrixOpts,
-  ParsedCompilerOpts, CompilerOptions,
+  ParsedCompilerOpts, CompilerOptions, EditDefineTree, ProjPackCommon,
   // IDE
   ProjectResources, ProjectIcon, RunParamsOpts,
-  ProjectDefs, EditDefineTree, LazarusIDEStrConsts,
-  ProjPackCommon, PackageDefs, PackageSystem;
+  ProjectDefs, LazarusIDEStrConsts, PackageDefs, PackageSystem;
 
 type
   TUnitInfo = class;

packager/addfpmakedependencydlg.pas

@@ -16,8 +16,10 @@ uses
   PackageIntf,
   // IdeIntf
   IDEWindowIntf,
+  // IdeConfig
+  ProjPackCommon,
   // IDE
-  LazarusIDEStrConsts, ProjPackCommon, PackageDefs, AddPkgDependencyDlg,
+  LazarusIDEStrConsts, PackageDefs, AddPkgDependencyDlg,
   // fppkg
   FppkgHelper;
 

packager/addpkgdependencydlg.pas

@@ -16,8 +16,10 @@ uses
   PackageIntf, PackageLinkIntf, PackageDependencyIntf,
   // IDEIntf
   IDEWindowIntf, IDEDialogs,
+  // IdeConfig
+  ProjPackCommon,
   // IDE
-  MainIntf, LazarusIDEStrConsts, PackageDefs, PackageSystem, ProjPackCommon, ProjPackChecks;
+  MainIntf, LazarusIDEStrConsts, PackageDefs, PackageSystem, ProjPackChecks;
 
 type
 

packager/packagedefs.pas

@@ -52,9 +52,9 @@ uses
   PackageDependencyIntf, PackageIntf, FppkgIntf, LazMsgWorker, BaseIDEIntf,
   // IdeConfig
   TransferMacros, IDEProcs, IDEOptionDefs, CompOptsModes, SearchPathProcs,
-  IdeXmlConfigProcs, ParsedCompilerOpts, CompilerOptions,
+  IdeXmlConfigProcs, ParsedCompilerOpts, CompilerOptions, EditDefineTree, ProjPackCommon,
   // IDE
-  EditDefineTree, ProjPackCommon, LazarusIDEStrConsts, FppkgHelper;
+  LazarusIDEStrConsts, FppkgHelper;
 
 type
   TLazPackage = class;

packager/projpackchecks.pas

@@ -16,8 +16,10 @@ uses
   PackageIntf, PackageDependencyIntf, ComponentReg,
   // IDEIntf
   IDEDialogs,
+  // IdeConfig
+  ProjPackCommon,
   // IDE
-  LazarusIDEStrConsts, IDEDefs, Project, PackageSystem, PackageDefs, ProjPackCommon;
+  LazarusIDEStrConsts, IDEDefs, Project, PackageSystem, PackageDefs;
 
 type