Move unit FppkgHelper to package IdeConfig.

ide/generatefppkgconfigurationdlg.pas

@@ -26,36 +26,23 @@ interface
 
 uses
   // Rtl
-  Classes,
-  SysUtils,
+  Classes, SysUtils,
   // Fcl
-  fpmkunit,
-  process,
+  fpmkunit, process,
   // Fppkg
   pkgglobals,
   // LazUtils
-  FPCAdds,
-  LazFileUtils,
-  LazFileCache,
-  UTF8Process,
+  FPCAdds, LazFileUtils, LazFileCache, UTF8Process,
   // Lcl
-  Forms,
-  Controls,
-  Graphics,
-  Dialogs,
-  StdCtrls,
-  ExtCtrls,
+  Forms, Controls, Graphics, Dialogs, StdCtrls, ExtCtrls,
   // Codetools
   CodeToolManager, DefineTemplates,
-  // IdeConfig
-  IDEProcs, LazConf, EnvironmentOpts,
-  // IDE
-  LazarusIDEStrConsts,
-  InitialSetupProc,
-  // Packager
-  FppkgHelper,
   // Ideintf
-  IDEDialogs;
+  IDEDialogs,
+  // IdeConfig
+  IDEProcs, LazConf, EnvironmentOpts, FppkgHelper,
+  // IDE
+  LazarusIDEStrConsts, InitialSetupProc;
 
 type
 

ide/initialsetupproc.pas

@@ -42,9 +42,9 @@ uses
   // IDEIntf
   IdeIntfStrConsts,
   // IDEConfig
-  LazConf, EnvironmentOpts,
+  LazConf, EnvironmentOpts, FppkgHelper,
   // IDE
-  LazarusIDEStrConsts, FppkgHelper;
+  LazarusIDEStrConsts;
 
 type
   TSDFilenameQuality = (

ide/lazarusidestrconsts.pas

@@ -1003,10 +1003,6 @@ resourcestring
   lisFppkgFpcmkcfgProbTooOld = 'It is probably too old to create the configuration files.';
   lisFppkgFpcmkcfgMissing = 'Could not find the fpcmkcfg configuration tool, ' +
     'which is needed to create the configuration files.';
-  lisFppkgRtlNotFound = 'Fppkg reports that the RTL is not installed.';
-  lisFppkgCompilerNotFound = 'Could not find the compiler [%s] configured for Fppkg.';
-  lisFppkgCompilerNotExists = 'The compiler [%s] configured for Fppkg does not exist.';
-  lisFppkgCompilerNotExecutable = 'The compiler [%s] configured for Fppkg is not an executable.';
   lisGenerateFppkgConfigurationCaption = 'Generate new Fppkg configuration files';
   lisGenerateFppkgConfiguration = 'Use this screen to generate new Fppkg configuration files ' +
     'with the fpcmkcfg tool.';

ide/packages/ideconfig/fppkghelper.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 FppkgHelper;
 
 {$mode objfpc}{$H+}
@@ -8,8 +28,8 @@ uses
   Classes, SysUtils, pkgFppkg, fpmkunit, fprepos,
   // LazUtils
   LazLoggerBase, LazFileCache, FileUtil, LazFileUtils,
-  // IDE
-  LazarusIDEStrConsts;
+  // IdeConfig
+  IdeConfStrConsts;
 
 type
 

ide/packages/ideconfig/ideconfig.lpk

@@ -59,6 +59,10 @@ Files in this package are for the main configuration of the IDE."/>
         <Filename Value="etmakemsgparser.pas"/>
         <UnitName Value="etMakeMsgParser"/>
       </Item>
+      <Item>
+        <Filename Value="fppkghelper.pas"/>
+        <UnitName Value="FppkgHelper"/>
+      </Item>
       <Item>
         <Filename Value="idecmdline.pas"/>
         <UnitName Value="IDECmdLine"/>

ide/packages/ideconfig/ideconfig.pas

@@ -10,8 +10,8 @@ interface
 uses
   CompilerOptions, CompOptsModes, CoolBarOptions, DiffPatch, EditDefineTree, 
   EditorToolBarOptions, EnvironmentOpts, etFPCMsgFilePool, etMakeMsgParser, 
-  IDECmdLine, IdeConfStrConsts, IDEGuiCmdLine, IDEOptionDefs, IDEProcs, 
-  IdeXmlConfigProcs, LazConf, ModeMatrixOpts, ParsedCompilerOpts, 
+  FppkgHelper, IDECmdLine, IdeConfStrConsts, IDEGuiCmdLine, IDEOptionDefs, 
+  IDEProcs, IdeXmlConfigProcs, LazConf, ModeMatrixOpts, ParsedCompilerOpts, 
   ProjPackCommon, RecentListProcs, SearchPathProcs, ToolBarOptionsBase, 
   TransferMacros, LazarusPackageIntf;
 

ide/packages/ideconfig/ideconfstrconsts.pas

@@ -39,6 +39,11 @@ resourcestring
   lisEdtDefsetOVERFLOWCHECKSOn = 'set OVERFLOWCHECKS on';
   lisEdtDefuseLineInfoUnit = 'use LineInfo unit';
   lisEdtDefuseHeapTrcUnit = 'use HeapTrc unit';
+  // Fppkg checks
+  lisFppkgRtlNotFound = 'Fppkg reports that the RTL is not installed.';
+  lisFppkgCompilerNotExists = 'The compiler [%s] configured for Fppkg does not exist.';
+  lisFppkgCompilerNotExecutable = 'The compiler [%s] configured for Fppkg is not an executable.';
+  lisFppkgCompilerNotFound = 'Could not find the compiler [%s] configured for Fppkg.';
 
 
 implementation

packager/addfpmakedependencydlg.pas

@@ -17,11 +17,9 @@ uses
   // IdeIntf
   IDEWindowIntf,
   // IdeConfig
-  ProjPackCommon,
+  ProjPackCommon, FppkgHelper,
   // IDE
-  LazarusIDEStrConsts, PackageDefs, AddPkgDependencyDlg,
-  // fppkg
-  FppkgHelper;
+  LazarusIDEStrConsts, PackageDefs, AddPkgDependencyDlg;
 
 type
 

packager/packagedefs.pas

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

packager/packagesystem.pas

@@ -62,10 +62,10 @@ uses
   LazarusPackageIntf,
   // IdeConfig
   EnvironmentOpts, LazConf, TransferMacros, IDEProcs, SearchPathProcs,
-  ParsedCompilerOpts, CompilerOptions,
+  ParsedCompilerOpts, CompilerOptions, FppkgHelper,
   // IDE
   LazarusIDEStrConsts, DialogProcs, IDETranslations,
-  PackageLinks, PackageDefs, FppkgHelper, PkgSysBasePkgs;
+  PackageLinks, PackageDefs, PkgSysBasePkgs;
 
 const
   MakefileCompileVersion = 2;