From c3a54973c7d14c8cf956d0021c505d90660bd6b1 Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Tue, 20 Dec 2016 23:39:59 +0000
Subject: [PATCH] LazBuild: remove a direct reference to SynRegExpr. Use FCL's
 RegExpr everywhere in IDE.

git-svn-id: trunk@53744 -
---
 components/simpleideintf/simpleide.pas     |  9 +++++++--
 components/simpleideintf/simpleideintf.lpk | 23 +++++++++-------------
 converter/chgencodingdlg.pas               |  7 +++----
 converter/replacefuncsunit.pas             |  9 +++++++--
 converter/replacenamesunit.pas             | 11 +++++++++--
 ide/lazbuild.lpi                           | 11 +++--------
 ide/publishmodule.pas                      |  4 +---
 packager/adddirtopkgdlg.pas                | 11 ++++++++---
 8 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/components/simpleideintf/simpleide.pas b/components/simpleideintf/simpleide.pas
index 92d0719975..5eb4d65596 100644
--- a/components/simpleideintf/simpleide.pas
+++ b/components/simpleideintf/simpleide.pas
@@ -26,8 +26,13 @@ unit SimpleIDE;
 interface
 
 uses
-  Classes, SysUtils, TextTools, SynRegExpr, FileProcs,
-  IDETextConverter;
+  Classes, SysUtils, RegExpr,
+  // LazUtils
+  LazFileUtils,
+  // Codetools
+  FileProcs,
+  // IdeIntf
+  TextTools, IDETextConverter;
 
 type
   { TLazyTextConverterToolClasses }
diff --git a/components/simpleideintf/simpleideintf.lpk b/components/simpleideintf/simpleideintf.lpk
index d189c5d749..4903916afd 100644
--- a/components/simpleideintf/simpleideintf.lpk
+++ b/components/simpleideintf/simpleideintf.lpk
@@ -1,39 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
-  <Package Version="3">
+  <Package Version="4">
     <Name Value="SimpleIDEIntf"/>
+    <AddToProjectUsesSection Value="True"/>
     <CompilerOptions>
-      <Version Value="8"/>
+      <Version Value="11"/>
       <SearchPaths>
         <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
-      <Other>
-        <CompilerPath Value="$(CompPath)"/>
-      </Other>
     </CompilerOptions>
     <Files Count="1">
       <Item1>
         <Filename Value="simpleide.pas"/>
-        <UnitName Value="simpleide"/>
+        <UnitName Value="SimpleIDE"/>
       </Item1>
     </Files>
-    <RequiredPkgs Count="4">
+    <RequiredPkgs Count="3">
       <Item1>
         <PackageName Value="CodeTools"/>
       </Item1>
       <Item2>
-        <PackageName Value="SynEdit"/>
+        <PackageName Value="IDEIntf"/>
       </Item2>
       <Item3>
-        <PackageName Value="IDEIntf"/>
-      </Item3>
-      <Item4>
         <PackageName Value="FCL"/>
         <MinVersion Major="1" Valid="True"/>
-      </Item4>
+      </Item3>
     </RequiredPkgs>
     <UsageOptions>
-      <UnitPath Value="$(PkgOutDir)/"/>
+      <UnitPath Value="$(PkgOutDir)"/>
     </UsageOptions>
     <PublishOptions>
       <Version Value="2"/>
diff --git a/converter/chgencodingdlg.pas b/converter/chgencodingdlg.pas
index f3e737635e..009d88562b 100644
--- a/converter/chgencodingdlg.pas
+++ b/converter/chgencodingdlg.pas
@@ -30,8 +30,9 @@ unit ChgEncodingDlg;
 interface
 
 uses
-  // RTL + FCL + LCL
-  Classes, SysUtils, AVL_Tree,
+  // RTL + FCL
+  Classes, SysUtils, AVL_Tree, RegExpr,
+  // LCL
   LCLProc, Forms, Controls, ExtCtrls, StdCtrls, ComCtrls, Buttons,
   // CodeTools
   CodeCache, CodeToolsStructs, CodeToolManager, FileProcs,
@@ -39,8 +40,6 @@ uses
   LConvEncoding, LazFileUtils, LazFileCache,
   // IDEIntf
   IDEWindowIntf, SrcEditorIntf, IDEHelpIntf,
-  // SynEdit
-  SynRegExpr,
   // IDE
   IDEProcs, PackageDefs, PackageSystem, Project, LazarusIDEStrConsts;
 
diff --git a/converter/replacefuncsunit.pas b/converter/replacefuncsunit.pas
index a6a46116d9..2ebf82eab3 100644
--- a/converter/replacefuncsunit.pas
+++ b/converter/replacefuncsunit.pas
@@ -5,8 +5,13 @@ unit ReplaceFuncsUnit;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
-  Buttons, ButtonPanel, Grids, CheckLst, Menus, StdCtrls, SynRegExpr,
+  Classes, SysUtils, RegExpr,
+  // LCL
+  Forms, Controls, Graphics, Dialogs, ExtCtrls,
+  Buttons, ButtonPanel, Grids, CheckLst, Menus, StdCtrls,
+  // LazUtils
+  FileUtil,
+  // IDE, converter
   LazarusIDEStrConsts, ConverterTypes;
 
 type
diff --git a/converter/replacenamesunit.pas b/converter/replacenamesunit.pas
index 73d4af22a2..ea0ac7c2a9 100644
--- a/converter/replacenamesunit.pas
+++ b/converter/replacenamesunit.pas
@@ -5,8 +5,15 @@ unit ReplaceNamesUnit;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  Grids, Buttons, ExtCtrls, Menus, ButtonPanel, CodeToolsStructs, SynRegExpr,
+  Classes, SysUtils, RegExpr,
+  // LCL
+  LResources, Forms, Controls, Graphics, Dialogs,
+  Grids, Buttons, ExtCtrls, Menus, ButtonPanel,
+  // Codetools
+  CodeToolsStructs,
+  // LazUtils
+  FileUtil,
+  // IDE, converter
   LazarusIDEStrConsts, ConverterTypes;
 
 type
diff --git a/ide/lazbuild.lpi b/ide/lazbuild.lpi
index aefdaae9f0..33ba0cad07 100644
--- a/ide/lazbuild.lpi
+++ b/ide/lazbuild.lpi
@@ -19,7 +19,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="include;include/$(TargetOS)"/>
-            <OtherUnitFiles Value="../designer;../packager;../debugger;../ide;../components/synedit"/>
+            <OtherUnitFiles Value="../designer;../packager;../debugger;../ide"/>
             <UnitOutputDirectory Value="../units/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)"/>
           </SearchPaths>
           <CodeGeneration>
@@ -63,7 +63,7 @@
         <PackageName Value="IDEIntf"/>
       </Item3>
     </RequiredPackages>
-    <Units Count="5">
+    <Units Count="4">
       <Unit0>
         <Filename Value="lazbuild.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -83,11 +83,6 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="IDECmdLine"/>
       </Unit3>
-      <Unit4>
-        <Filename Value="../components/synedit/synregexpr.pas"/>
-        <IsPartOfProject Value="True"/>
-        <UnitName Value="SynRegExpr"/>
-      </Unit4>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
@@ -97,7 +92,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="include;include/$(TargetOS)"/>
-      <OtherUnitFiles Value="../designer;../packager;../debugger;../ide;../components/synedit"/>
+      <OtherUnitFiles Value="../designer;../packager;../debugger;../ide"/>
       <UnitOutputDirectory Value="../units/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)"/>
     </SearchPaths>
     <Parsing>
diff --git a/ide/publishmodule.pas b/ide/publishmodule.pas
index e464a98366..f52d926498 100644
--- a/ide/publishmodule.pas
+++ b/ide/publishmodule.pas
@@ -35,13 +35,11 @@ unit PublishModule;
 interface
 
 uses
-  Classes, SysUtils,
+  Classes, SysUtils, RegExpr,
   // LCL
   LCLProc,
   // LazUtils
   LazFileUtils, Laz2_XMLCfg,
-  // SynEdit
-  SynRegExpr,
   // IDE
   IDEProcs;
 
diff --git a/packager/adddirtopkgdlg.pas b/packager/adddirtopkgdlg.pas
index 423cf11459..655ade506a 100644
--- a/packager/adddirtopkgdlg.pas
+++ b/packager/adddirtopkgdlg.pas
@@ -25,10 +25,15 @@ unit AddDirToPkgDlg;
 interface
 
 uses
-  Classes, SysUtils, Forms, Controls, Dialogs, StdCtrls, ButtonPanel, EditBtn,
-  SynRegExpr, FileProcs, LazFileUtils,
+  Classes, SysUtils, RegExpr,
+  // LCL
+  Forms, Controls, Dialogs, StdCtrls, ButtonPanel, EditBtn,
+  // LazUtils
+  FileProcs, LazFileUtils,
+  // IdeIntf
+  IDEWindowIntf,
   // IDE
-  IDEWindowIntf, IDEProcs, LazarusIDEStrConsts, PackageDefs;
+  IDEProcs, LazarusIDEStrConsts, PackageDefs;
 
 type