From 6c8f081d969315ae82d62d6f59fac1ca30c4abd1 Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Tue, 20 Dec 2016 00:09:19 +0000
Subject: [PATCH] LazBuild: Remove SynEdit dependency completely.

git-svn-id: trunk@53730 -
---
 ide/buildmanager.pas   |  1 -
 ide/environmentopts.pp |  9 ++++--
 ide/lazbuild.lpi       | 72 ++++++++++++++++++++++++++++++++++--------
 ide/lazbuild.lpr       |  8 ++---
 ide/main.pp            |  1 +
 5 files changed, 70 insertions(+), 21 deletions(-)

diff --git a/ide/buildmanager.pas b/ide/buildmanager.pas
index c5987d11f0..8c029bb1b8 100644
--- a/ide/buildmanager.pas
+++ b/ide/buildmanager.pas
@@ -50,7 +50,6 @@ uses
   IDECmdLine, LazarusIDEStrConsts, DialogProcs, IDEProcs,
   InputHistory, EditDefineTree, ProjectResources, MiscOptions, LazConf,
   EnvironmentOpts, TransferMacros, CompilerOptions,
-  ExtToolEditDlg{needed for environment options ExternalUserTools},
   ExtTools, etMakeMsgParser, etFPCMsgParser,
   Compiler, FPCSrcScan, PackageDefs, PackageSystem, Project, ProjectIcon,
   ModeMatrixOpts, BaseBuildManager, ApplicationBundle;
diff --git a/ide/environmentopts.pp b/ide/environmentopts.pp
index e913d7e3d9..1c83c770c0 100644
--- a/ide/environmentopts.pp
+++ b/ide/environmentopts.pp
@@ -1443,7 +1443,8 @@ begin
   end;
   
   // external tools
-  fExternalUserTools:=ExternalUserToolsClass.Create;
+  if Assigned(ExternalUserToolsClass) then
+    fExternalUserTools:=ExternalUserToolsClass.Create;
   FMaxExtToolsInParallel:=0;
 
   // naming
@@ -1871,7 +1872,8 @@ begin
     end;
 
     // external tools
-    fExternalUserTools.Load(FConfigStore,Path+'ExternalTools/');
+    if Assigned(fExternalUserTools) then
+      fExternalUserTools.Load(FConfigStore,Path+'ExternalTools/');
     FMaxExtToolsInParallel:=FXMLCfg.GetValue(Path+'ExternalTools/MaxInParallel',0);
 
     // naming
@@ -2209,7 +2211,8 @@ begin
     FXMLCfg.SetDeleteValue(Path+'Recent/UseUnitDlg/AddToImplementation',FUseUnitDlgOptions.AddToImplementation,False);
 
     // external tools
-    fExternalUserTools.Save(FConfigStore,Path+'ExternalTools/');
+    if Assigned(fExternalUserTools) then
+      fExternalUserTools.Save(FConfigStore,Path+'ExternalTools/');
     FXMLCfg.SetDeleteValue(Path+'ExternalTools/MaxInParallel',FMaxExtToolsInParallel,0);
 
     // naming
diff --git a/ide/lazbuild.lpi b/ide/lazbuild.lpi
index d68c3fc7ec..aefdaae9f0 100644
--- a/ide/lazbuild.lpi
+++ b/ide/lazbuild.lpi
@@ -9,13 +9,35 @@
       <SessionStorage Value="InIDEConfig"/>
       <MainUnit Value="0"/>
     </General>
-    <MacroValues Count="1">
-      <Macro1 Name="LCLWidgetType" Value="nogui"/>
-    </MacroValues>
-    <BuildModes Count="1">
-      <Item1 Name="default" Default="True"/>
+    <BuildModes Count="2">
+      <Item1 Name="Debug" Default="True"/>
+      <Item2 Name="Release">
+        <CompilerOptions>
+          <Version Value="11"/>
+          <Target>
+            <Filename Value="../lazbuild"/>
+          </Target>
+          <SearchPaths>
+            <IncludeFiles Value="include;include/$(TargetOS)"/>
+            <OtherUnitFiles Value="../designer;../packager;../debugger;../ide;../components/synedit"/>
+            <UnitOutputDirectory Value="../units/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)"/>
+          </SearchPaths>
+          <CodeGeneration>
+            <SmartLinkUnit Value="True"/>
+            <Optimizations>
+              <OptimizationLevel Value="3"/>
+            </Optimizations>
+          </CodeGeneration>
+          <Linking>
+            <Debugging>
+              <GenerateDebugInfo Value="False"/>
+            </Debugging>
+            <LinkSmart Value="True"/>
+          </Linking>
+        </CompilerOptions>
+      </Item2>
       <SharedMatrixOptions Count="1">
-        <Item1 ID="037437114172" Modes="default" Type="IDEMacro" MacroName="LCLWidgetType" Value="nogui"/>
+        <Item1 ID="037437114172" Type="IDEMacro" MacroName="LCLWidgetType" Value="nogui"/>
       </SharedMatrixOptions>
     </BuildModes>
     <PublishOptions>
@@ -30,7 +52,7 @@
         <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
-    <RequiredPackages Count="4">
+    <RequiredPackages Count="3">
       <Item1>
         <PackageName Value="DebuggerIntf"/>
       </Item1>
@@ -38,13 +60,10 @@
         <PackageName Value="CodeTools"/>
       </Item2>
       <Item3>
-        <PackageName Value="SynEdit"/>
-      </Item3>
-      <Item4>
         <PackageName Value="IDEIntf"/>
-      </Item4>
+      </Item3>
     </RequiredPackages>
-    <Units Count="4">
+    <Units Count="5">
       <Unit0>
         <Filename Value="lazbuild.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -64,6 +83,11 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="IDECmdLine"/>
       </Unit3>
+      <Unit4>
+        <Filename Value="../components/synedit/synregexpr.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="SynRegExpr"/>
+      </Unit4>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
@@ -73,8 +97,30 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="include;include/$(TargetOS)"/>
-      <OtherUnitFiles Value="../designer;../packager;../debugger;../ide"/>
+      <OtherUnitFiles Value="../designer;../packager;../debugger;../ide;../components/synedit"/>
       <UnitOutputDirectory Value="../units/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)"/>
     </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <IncludeAssertionCode Value="True"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <Checks>
+        <IOChecks Value="True"/>
+        <RangeChecks Value="True"/>
+        <OverflowChecks Value="True"/>
+        <StackChecks Value="True"/>
+      </Checks>
+      <VerifyObjMethodCallValidity Value="True"/>
+    </CodeGeneration>
+    <Linking>
+      <Debugging>
+        <DebugInfoType Value="dsDwarf2Set"/>
+        <UseHeaptrc Value="True"/>
+        <TrashVariables Value="True"/>
+        <UseExternalDbgSyms Value="True"/>
+      </Debugging>
+    </Linking>
   </CompilerOptions>
 </CONFIG>
diff --git a/ide/lazbuild.lpr b/ide/lazbuild.lpr
index 6a7fbb1365..be0a1d6290 100644
--- a/ide/lazbuild.lpr
+++ b/ide/lazbuild.lpr
@@ -31,7 +31,7 @@ uses
   Classes, SysUtils, math, CustApp,
   Interfaces, // this includes the NoGUI widgetset
   // LCL
-  LCLPlatformDef, {InterfaceBase,} LCLProc, Dialogs, Forms, Controls,
+  LCLPlatformDef, LCLProc, Controls, Dialogs, Forms,
   // codetools
   CodeCache, CodeToolManager, DefineTemplates, FileProcs,
   // IDEIntf
@@ -45,7 +45,9 @@ uses
   IDECmdLine, MiscOptions, Project, LazConf, PackageDefs,
   PackageLinks, PackageSystem, InterPkgConflictFiles, BuildLazDialog,
   BuildProfileManager, BuildManager, BaseBuildManager, ModeMatrixOpts;
-  
+  // Hack: The project refers directly to SynRegExpr in SynEdit directory
+  //  without pulling the whole package with it. Must be solved properly later.
+
 type
   TPkgAction = (
     lpaBuild, // build package, default
@@ -1303,10 +1305,8 @@ Var
   NeedArg: Boolean;
 
   Function FindLongOpt(S : String) : boolean;
-
   Var
     I : integer;
-
   begin
     If CaseSensitiveOptions then
       begin
diff --git a/ide/main.pp b/ide/main.pp
index 00be8bafef..02c3c0e363 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -1334,6 +1334,7 @@ begin
   EditorOpts.Load;
 
   ExternalUserTools:=TExternalUserTools(EnvironmentOptions.ExternalToolMenuItems);
+  Assert(Assigned(ExternalUserTools), 'TMainIDE.LoadGlobalOptions: ExternalUserTools=Nil.');
   ExternalUserTools.LoadShortCuts(EditorOpts.KeyMap);
 
   MiscellaneousOptions := TMiscellaneousOptions.Create;