paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-04 14:20:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

LazBuild: remove a direct reference to SynRegExpr. Use FCL's RegExpr everywhere in IDE.

Browse Source 
git-svn-id: trunk@53744 -
This commit is contained in:
juha 2016-12-20 23:39:59 +00:00
parent 19f63789bb
commit c3a54973c7
8 changed files with 47 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/simpleideintf/simpleide.pas
View File

@ -26,8 +26,13 @@ unit SimpleIDE;
interface interface
uses uses
Classes, SysUtils, TextTools, SynRegExpr, FileProcs, Classes, SysUtils, RegExpr,
IDETextConverter; // LazUtils
LazFileUtils,
// Codetools
FileProcs,
// IdeIntf
TextTools, IDETextConverter;
type type
{ TLazyTextConverterToolClasses } { TLazyTextConverterToolClasses }

23
components/simpleideintf/simpleideintf.lpk
View File

@ -1,39 +1,34 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<Package Version="3"> <Package Version="4">
<Name Value="SimpleIDEIntf"/> <Name Value="SimpleIDEIntf"/>
<AddToProjectUsesSection Value="True"/>
<CompilerOptions> <CompilerOptions>
<Version Value="8"/> <Version Value="11"/>
<SearchPaths> <SearchPaths>
<UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/> <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
</SearchPaths> </SearchPaths>
<Other>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions> </CompilerOptions>
<Files Count="1"> <Files Count="1">
<Item1> <Item1>
<Filename Value="simpleide.pas"/> <Filename Value="simpleide.pas"/>
<UnitName Value="simpleide"/> <UnitName Value="SimpleIDE"/>
</Item1> </Item1>
</Files> </Files>
<RequiredPkgs Count="4"> <RequiredPkgs Count="3">
<Item1> <Item1>
<PackageName Value="CodeTools"/> <PackageName Value="CodeTools"/>
</Item1> </Item1>
<Item2> <Item2>
<PackageName Value="SynEdit"/> <PackageName Value="IDEIntf"/>
</Item2> </Item2>
<Item3> <Item3>
<PackageName Value="IDEIntf"/>
</Item3>
<Item4>
<PackageName Value="FCL"/> <PackageName Value="FCL"/>
<MinVersion Major="1" Valid="True"/> <MinVersion Major="1" Valid="True"/>
</Item4> </Item3>
</RequiredPkgs> </RequiredPkgs>
<UsageOptions> <UsageOptions>
<UnitPath Value="$(PkgOutDir)/"/> <UnitPath Value="$(PkgOutDir)"/>
</UsageOptions> </UsageOptions>
<PublishOptions> <PublishOptions>
<Version Value="2"/> <Version Value="2"/>

7
converter/chgencodingdlg.pas
View File

@ -30,8 +30,9 @@ unit ChgEncodingDlg;
interface interface
uses uses
// RTL + FCL + LCL // RTL + FCL
Classes, SysUtils, AVL_Tree, Classes, SysUtils, AVL_Tree, RegExpr,
// LCL
LCLProc, Forms, Controls, ExtCtrls, StdCtrls, ComCtrls, Buttons, LCLProc, Forms, Controls, ExtCtrls, StdCtrls, ComCtrls, Buttons,
// CodeTools // CodeTools
CodeCache, CodeToolsStructs, CodeToolManager, FileProcs, CodeCache, CodeToolsStructs, CodeToolManager, FileProcs,
@ -39,8 +40,6 @@ uses
LConvEncoding, LazFileUtils, LazFileCache, LConvEncoding, LazFileUtils, LazFileCache,
// IDEIntf // IDEIntf
IDEWindowIntf, SrcEditorIntf, IDEHelpIntf, IDEWindowIntf, SrcEditorIntf, IDEHelpIntf,
// SynEdit
SynRegExpr,
// IDE // IDE
IDEProcs, PackageDefs, PackageSystem, Project, LazarusIDEStrConsts; IDEProcs, PackageDefs, PackageSystem, Project, LazarusIDEStrConsts;

9
converter/replacefuncsunit.pas
View File

@ -5,8 +5,13 @@ unit ReplaceFuncsUnit;
interface interface
uses uses
Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls, Classes, SysUtils, RegExpr,
Buttons, ButtonPanel, Grids, CheckLst, Menus, StdCtrls, SynRegExpr, // LCL
Forms, Controls, Graphics, Dialogs, ExtCtrls,
Buttons, ButtonPanel, Grids, CheckLst, Menus, StdCtrls,
// LazUtils
FileUtil,
// IDE, converter
LazarusIDEStrConsts, ConverterTypes; LazarusIDEStrConsts, ConverterTypes;
type type

11
converter/replacenamesunit.pas
View File

@ -5,8 +5,15 @@ unit ReplaceNamesUnit;
interface interface
uses uses
Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs, Classes, SysUtils, RegExpr,
Grids, Buttons, ExtCtrls, Menus, ButtonPanel, CodeToolsStructs, SynRegExpr, // LCL
LResources, Forms, Controls, Graphics, Dialogs,
Grids, Buttons, ExtCtrls, Menus, ButtonPanel,
// Codetools
CodeToolsStructs,
// LazUtils
FileUtil,
// IDE, converter
LazarusIDEStrConsts, ConverterTypes; LazarusIDEStrConsts, ConverterTypes;
type type

11
ide/lazbuild.lpi
View File

@ -19,7 +19,7 @@
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="include;include/$(TargetOS)"/> <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)"/> <UnitOutputDirectory Value="../units/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)"/>
</SearchPaths> </SearchPaths>
<CodeGeneration> <CodeGeneration>
@ -63,7 +63,7 @@
<PackageName Value="IDEIntf"/> <PackageName Value="IDEIntf"/>
</Item3> </Item3>
</RequiredPackages> </RequiredPackages>
<Units Count="5"> <Units Count="4">
<Unit0> <Unit0>
<Filename Value="lazbuild.lpr"/> <Filename Value="lazbuild.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
@ -83,11 +83,6 @@
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="IDECmdLine"/> <UnitName Value="IDECmdLine"/>
</Unit3> </Unit3>
<Unit4>
<Filename Value="../components/synedit/synregexpr.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="SynRegExpr"/>
</Unit4>
</Units> </Units>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>
@ -97,7 +92,7 @@
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="include;include/$(TargetOS)"/> <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)"/> <UnitOutputDirectory Value="../units/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)"/>
</SearchPaths> </SearchPaths>
<Parsing> <Parsing>

4
ide/publishmodule.pas
View File

@ -35,13 +35,11 @@ unit PublishModule;
interface interface
uses uses
Classes, SysUtils, Classes, SysUtils, RegExpr,
// LCL // LCL
LCLProc, LCLProc,
// LazUtils // LazUtils
LazFileUtils, Laz2_XMLCfg, LazFileUtils, Laz2_XMLCfg,
// SynEdit
SynRegExpr,
// IDE // IDE
IDEProcs; IDEProcs;

11
packager/adddirtopkgdlg.pas
View File

@ -25,10 +25,15 @@ unit AddDirToPkgDlg;
interface interface
uses uses
Classes, SysUtils, Forms, Controls, Dialogs, StdCtrls, ButtonPanel, EditBtn, Classes, SysUtils, RegExpr,
SynRegExpr, FileProcs, LazFileUtils, // LCL
Forms, Controls, Dialogs, StdCtrls, ButtonPanel, EditBtn,
// LazUtils
FileProcs, LazFileUtils,
// IdeIntf
IDEWindowIntf,
// IDE // IDE
IDEWindowIntf, IDEProcs, LazarusIDEStrConsts, PackageDefs; IDEProcs, LazarusIDEStrConsts, PackageDefs;
type type