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

IDE: when changing build IDE extra options, invalidate macros, bug #16844

Browse Source 
git-svn-id: trunk@26467 -
This commit is contained in:
mattias 2010-07-05 07:41:47 +00:00
parent 2f6e099b6a
commit f9840ae34a
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/codetools/codetools.lpk
View File

@ -5,20 +5,22 @@
<AddToProjectUsesSection Value="False"/> <AddToProjectUsesSection Value="False"/>
<Author Value="Mattias Gaertner"/> <Author Value="Mattias Gaertner"/>
<CompilerOptions> <CompilerOptions>
<Version Value="8"/> <Version Value="9"/>
<SearchPaths> <SearchPaths>
<UnitOutputDirectory Value="units/$(TargetCPU)-$(TargetOS)"/> <UnitOutputDirectory Value="units/$(TargetCPU)-$(TargetOS)"/>
</SearchPaths> </SearchPaths>
<Parsing> <Parsing>
<SyntaxOptions> <SyntaxOptions>
<AllowLabel Value="False"/> <AllowLabel Value="False"/>
<UseAnsiStrings Value="False"/>
</SyntaxOptions> </SyntaxOptions>
</Parsing> </Parsing>
<Other> <Other>
<Verbosity> <Verbosity>
<ShowHints Value="False"/> <ShowHints Value="False"/>
</Verbosity> </Verbosity>
<CustomOptions Value="$(IDEBuildOptions)"/> <CustomOptions Value="$(IDEBuildOptions)
"/>
<CompilerPath Value="$(CompPath)"/> <CompilerPath Value="$(CompPath)"/>
</Other> </Other>
</CompilerOptions> </CompilerOptions>

2
components/codetools/pascalreadertool.pas
View File

@ -1941,6 +1941,7 @@ function TPascalReaderTool.FindForwardTypeNode(TypeNode: TCodeTreeNode;
function Next: TCodeTreeNode; function Next: TCodeTreeNode;
begin begin
Result:=FindForwardTypeNode;
if Result.PriorBrother<>nil then if Result.PriorBrother<>nil then
// search upwards // search upwards
Result:=Result.PriorBrother Result:=Result.PriorBrother
@ -2002,6 +2003,7 @@ function TPascalReaderTool.FindTypeOfForwardNode(TypeNode: TCodeTreeNode
function Next: TCodeTreeNode; function Next: TCodeTreeNode;
begin begin
Result:=FindTypeOfForwardNode;
if Result.NextBrother<>nil then if Result.NextBrother<>nil then
// search forwards // search forwards
Result:=Result.NextBrother Result:=Result.NextBrother

4
ide/buildlazdialog.pas
View File

@ -304,6 +304,7 @@ function ShowConfigureBuildLazarusDlg(
// mrYes=save and compile // mrYes=save and compile
var var
ConfigBuildLazDlg: TConfigureBuildLazarusDlg; ConfigBuildLazDlg: TConfigureBuildLazarusDlg;
OldExtraOptions: String;
begin begin
Result := mrCancel; Result := mrCancel;
ConfigBuildLazDlg := TConfigureBuildLazarusDlg.Create(nil); ConfigBuildLazDlg := TConfigureBuildLazarusDlg.Create(nil);
@ -313,7 +314,10 @@ begin
if Result in [mrOk,mrYes] if Result in [mrOk,mrYes]
then begin then begin
//DebugLn('ShowConfigureBuildLazarusDialog'); //DebugLn('ShowConfigureBuildLazarusDialog');
OldExtraOptions:=AOptions.ExtraOptions;
AOptions.Assign(ConfigBuildLazDlg.Options); AOptions.Assign(ConfigBuildLazDlg.Options);
if OldExtraOptions<>AOptions.ExtraOptions then
IncreaseCompilerParseStamp;
end; end;
finally finally
ConfigBuildLazDlg.Free; ConfigBuildLazDlg.Free;