paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-04 04:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

IDE: enabled build modes, build macros and conditionals

Browse Source 
git-svn-id: trunk@27837 -
This commit is contained in:
mattias 2010-10-24 19:24:19 +00:00
parent ad8cb136fd
commit 48c3d01369
6 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/IDEWindowHelpTree.xml
View File

@ -131,7 +131,7 @@
<Node31 Name="ProjectApplicationOptionsFrame" Path="Project_Options" HasHelp="True" IsRoot="True"/>
<Node32 Name="EditorMultiWindowOptionsFrame" Path="_Editor_Options_MultiWindow" HasHelp="True" IsRoot="True"/>
<Node33 Name="CompilerPathOptionsFrame" Path="Compiler_Options#Paths" HasHelp="True" IsRoot="True"/>
<Node34 Name="BuildModesEditorFrame" Path="Compiler_Options#Build_Modes" HasHelp="True" IsRoot="True"/>
<Node34 Name="BuildModesEditorFrame" Path="Compiler_Options#Build_modes" HasHelp="True" IsRoot="True"/>
<Node35 Name="CompilerParsingOptionsFrame" Path="Compiler_Options#Parsing" HasHelp="True" IsRoot="True"/>
<Node36 Name="CompilerCodegenOptionsFrame" Path="Compiler_Options#Code" HasHelp="True" IsRoot="True"/>
<Node37 Name="CompilerLinkingOptionsFrame" Path="Compiler_Options#Linking" HasHelp="True" IsRoot="True"/>

9
ide/compileroptionsdlg.pp
View File

@ -643,9 +643,6 @@ begin
// build modes
HasBuildModes:=(Options is TProjectCompilerOptions);
{$IFNDEF EnableBuildModes}
HasBuildModes:= false;
{$ENDIF}
if HasBuildModes then begin
// show build modes
if FBuildModesTVNode=nil then begin
@ -1524,10 +1521,8 @@ end;
procedure TfrmCompilerOptions.SetupMacrosTab(Page: integer);
begin
MacrosPage:=MainNoteBook.Pages[Page];
MacrosPage.Caption:='Build macros';
{$IFDEF EnableBuildModes}
MacrosPage.Caption:=lisBuildMacros;
CategoryTreeView.Items.AddObject(nil,MacrosPage.Caption,MacrosPage);
{$ENDIF}
end;
{------------------------------------------------------------------------------
@ -1732,9 +1727,7 @@ procedure TfrmCompilerOptions.SetupBuildModesTab(Page: integer);
begin
// Setup the Build Modes Tab
MainNoteBook.Page[Page].Caption:='Build modes';
{$IFDEF EnableBuildModes}
fBuildModesTVNode:=CategoryTreeView.Items.AddObject(nil,MainNoteBook.Page[Page].Caption,MainNoteBook.Page[Page]);
{$ENDIF}
fBuildModeFrame:=TBuildModesEditorFrame.Create(Self);
fBuildModeFrame.Setup(nil);

3
ide/frames/buildmodeseditor.pas
View File

@ -768,10 +768,9 @@ begin
Result:=AProject.BuildModes[i];
end;
{$IFDEF EnableBuildModes}
initialization
RegisterIDEOptionsEditor(GroupCompiler, TBuildModesEditorFrame,
CompilerOptionsBuildModes);
{$ENDIF}
end.

2
ide/frames/compiler_buildmacro_options.pas
View File

@ -1067,11 +1067,9 @@ begin
Options.Conditionals:=CondSynEdit.Lines.Text;
end;
{$IFDEF EnableBuildModes}
initialization
RegisterIDEOptionsEditor(GroupCompiler, TCompOptBuildMacrosFrame,
CompilerOptionsConditional);
{$ENDIF}
end.

1
ide/msgquickfixes.pas
View File

@ -28,6 +28,7 @@
1. option: if the ancestor has a function with the same name: update the parameter list
2. option: remove the method
3. option: add a virtual method to the ancestor
- complete function implementations with missing parameters
}
unit MsgQuickFixes;

9
packager/packagedefs.pas
View File

@ -47,10 +47,7 @@ interface
uses
Classes, SysUtils, LCLProc, LResources, Graphics, Forms, FileUtil,
AVL_Tree, LazConfigStorage,
{$IFDEF EnableBuildModes}
CodeToolsCfgScript,
{$ENDIF}
DefineTemplates, CodeToolManager, Laz_XMLCfg, CodeCache,
CodeToolsCfgScript, DefineTemplates, CodeToolManager, Laz_XMLCfg, CodeCache,
PropEdits, LazIDEIntf, MacroIntf, PackageIntf,
EditDefineTree, CompilerOptions, CompOptsModes, IDEOptionDefs,
LazarusIDEStrConsts, IDEProcs, ComponentReg,
@ -2033,11 +2030,9 @@ end;
procedure TLazPackage.OnMacroListSubstitution(TheMacro: TTransferMacro;
const MacroName: string; var s: string; const Data: PtrInt;
var Handled, Abort: boolean; Depth: integer);
{$IFDEF EnableBuildModes}
var
Values: TCTCfgScriptVariables;
Macro: PCTCfgScriptVariable;
{$ENDIF}
var
NewValue: String;
begin
@ -2051,7 +2046,6 @@ begin
end;
end;
{$IFDEF EnableBuildModes}
// check build macros
if (MacroName<>'') and IsValidIdent(MacroName) then
begin
@ -2067,7 +2061,6 @@ begin
end;
end;
end;
{$ENDIF}
// check local macros
if CompareText(MacroName,'PkgOutDir')=0 then begin