From bd1a1d6b00dbb381b3835683574dcad4f5c75412 Mon Sep 17 00:00:00 2001 From: mattias Date: Fri, 23 Mar 2012 16:20:52 +0000 Subject: [PATCH] lazbuild: do not create fpcsrc defines git-svn-id: trunk@36279 - --- components/codetools/definetemplates.pas | 1 + ide/buildmanager.pas | 27 +++++++++++++----------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/components/codetools/definetemplates.pas b/components/codetools/definetemplates.pas index 7d878137eb..49aa61025a 100644 --- a/components/codetools/definetemplates.pas +++ b/components/codetools/definetemplates.pas @@ -1963,6 +1963,7 @@ begin Ok:=false; try if (FPCSrcDir='') or (not DirPathExists(FPCSrcDir)) then begin + CTDumpStack; DebugLn(['CreateFPCSrcTemplate FPCSrcDir does not exist: FPCSrcDir="',FPCSrcDir,'"']); exit; end; diff --git a/ide/buildmanager.pas b/ide/buildmanager.pas index 1efcd04c8e..0018997a73 100644 --- a/ide/buildmanager.pas +++ b/ide/buildmanager.pas @@ -724,19 +724,22 @@ begin AddTemplate(ADefTempl,false, 'NOTE: Could not create Define Template for Free Pascal Compiler'); // create template for FPC source directory - ADefTempl:=CreateFPCSourceTemplate(UnitSetCache,nil); - AddTemplate(ADefTempl,false,lisNOTECouldNotCreateDefineTemplateForFreePascal); + if HasGUI then + begin + ADefTempl:=CreateFPCSourceTemplate(UnitSetCache,nil); + AddTemplate(ADefTempl,false,lisNOTECouldNotCreateDefineTemplateForFreePascal); - // create compiler macros for the lazarus sources - if CodeToolBoss.DefineTree.FindDefineTemplateByName(StdDefTemplLazarusSrcDir, - true)=nil - then begin - ADefTempl:=CreateLazarusSourceTemplate( - '$('+ExternalMacroStart+'LazarusDir)', - '$('+ExternalMacroStart+'LCLWidgetType)', - MiscellaneousOptions.BuildLazOpts.ExtraOptions,nil); - AddTemplate(ADefTempl,true, - lisNOTECouldNotCreateDefineTemplateForLazarusSources); + // create compiler macros for the lazarus sources + if CodeToolBoss.DefineTree.FindDefineTemplateByName(StdDefTemplLazarusSrcDir, + true)=nil + then begin + ADefTempl:=CreateLazarusSourceTemplate( + '$('+ExternalMacroStart+'LazarusDir)', + '$('+ExternalMacroStart+'LCLWidgetType)', + MiscellaneousOptions.BuildLazOpts.ExtraOptions,nil); + AddTemplate(ADefTempl,true, + lisNOTECouldNotCreateDefineTemplateForLazarusSources); + end; end; CodeToolBoss.DefineTree.ClearCache;