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

IDE: debugln when help macro fails

Browse Source 
git-svn-id: trunk@41938 -
This commit is contained in:
mattias 2013-06-29 12:52:42 +00:00
parent 2c88bfd8f5
commit cfb2ee3fcb
4 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ide/buildmanager.pas
View File

@ -232,7 +232,8 @@ type
procedure BMLazConfMacroFunction(var s: string);
begin
GlobalMacroList.SubstituteStr(s);
if not GlobalMacroList.SubstituteStr(s) then
debugln(['BMLazConfMacroFunction failed "',s,'"']);
end;
function CompareUnitFiles(UnitFile1, UnitFile2: PUnitFile): integer;

2
ide/environmentopts.pp
View File

@ -1777,7 +1777,7 @@ begin
try
ParsedValue:=UnparsedValue;
if not GlobalMacroList.SubstituteStr(ParsedValue) then begin
debugln(['TEnvironmentOptions.GetParsedValue failed for ',dbgs(o)]);
debugln(['TEnvironmentOptions.GetParsedValue failed for ',dbgs(o),' Value="',UnparsedValue,'"']);
end;
ParseStamp:=CompilerParseStamp;

9
ide/idehelpmanager.pas
View File

@ -1080,6 +1080,8 @@ end;
function TIDEHelpDatabases.GetBaseDirectoryForBasePathObject(
BasePathObject: TObject): string;
var
s: String;
begin
Result:='';
DebugLn('TIDEHelpDatabases.GetBaseDirectoryForBasePathObject BasePathObject=',dbgsName(BasePathObject));
@ -1091,8 +1093,11 @@ begin
Result:=TProject(BasePathObject).ProjectDirectory
else if BasePathObject is TLazPackage then
Result:=TLazPackage(BasePathObject).Directory;
if Result<>'' then
IDEMacros.SubstituteMacros(Result);
if Result<>'' then begin
s:=Result;
if not IDEMacros.SubstituteMacros(Result) then
debugln(['TIDEHelpDatabases.GetBaseDirectoryForBasePathObject macros failed "',s,'"']);
end;
Result:=AppendPathDelim(Result);
end;

20
ide/project.pp
View File

@ -3147,7 +3147,8 @@ end;
function TProject.GetTitle: string;
begin
Result:=Title;
MacroEngine.SubstituteStr(Result);
if not MacroEngine.SubstituteStr(Result) then
debugln(['TProject.GetTitle failed Title="',Title,'"']);
end;
function TProject.TitleIsDefault(Fuzzy: boolean): boolean;
@ -5292,7 +5293,8 @@ end;
function TProject.GetPOOutDirectory: string;
begin
Result:=POOutputDirectory;
IDEMacros.SubstituteMacros(Result);
if not IDEMacros.SubstituteMacros(Result) then
debugln(['TProject.GetPOOutDirectory failed POOutputDirectory="',POOutputDirectory,'"']);
Result:=TrimFilename(Result);
if not FilenameIsAbsolute(Result) then
Result:=TrimFilename(AppendPathDelim(ProjectDirectory)+Result);
@ -6178,10 +6180,16 @@ begin
Result:=s;
if LazProject=nil then exit;
//debugln(['TProjectCompilerOptions.SubstituteProjectMacros s="',s,'"']);
if PlatformIndependent then
LazProject.MacroEngine.SubstituteStr(Result,CompilerOptionMacroPlatformIndependent)
else
LazProject.MacroEngine.SubstituteStr(Result,CompilerOptionMacroNormal);
if PlatformIndependent then begin
if not LazProject.MacroEngine.SubstituteStr(Result,CompilerOptionMacroPlatformIndependent)
then
debugln(['TProjectCompilerOptions.SubstituteProjectMacros failed: "',CompilerOptionMacroPlatformIndependent,'"']);
end
else begin
if not LazProject.MacroEngine.SubstituteStr(Result,CompilerOptionMacroNormal)
then
debugln(['TProjectCompilerOptions.SubstituteProjectMacros failed: "',CompilerOptionMacroNormal,'"']);
end;
end;
procedure TProjectCompilerOptions.Assign(Source: TPersistent);