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

chmhelp: fixed change separators on macros

Browse Source 
git-svn-id: trunk@45113 -
This commit is contained in:
mattias 2014-05-20 12:25:13 +00:00
parent bd9aff9132
commit bc15322505
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/chmhelp/packages/idehelp/lazchmhelp.pas
View File

@ -254,6 +254,7 @@ var
Buffer: array[0..511] of char; Buffer: array[0..511] of char;
BufP: Integer; BufP: Integer;
PCP: String; PCP: String;
LHelpProjectDir: String;
begin begin
Result := mrCancel; Result := mrCancel;
@ -266,9 +267,9 @@ begin
Exit; Exit;
end; end;
LHelpProject := '$(LazarusDir)/components/chmhelp/lhelp/lhelp.lpi'; LHelpProject := '$(LazarusDir)'+SetDirSeparators('/components/chmhelp/lhelp/lhelp.lpi');
if not IDEMacros.SubstituteMacros(LHelpProject) then exit; if not IDEMacros.SubstituteMacros(LHelpProject) then exit;
LHelpProject:=TrimFilename(SetDirSeparators(LHelpProject)); LHelpProject:=TrimFilename(LHelpProject);
if not FileExistsUTF8(LHelpProject) then if not FileExistsUTF8(LHelpProject) then
begin begin
debugln(['TChmHelpViewer.CheckBuildLHelp failed because lhelp.lpi not found']); debugln(['TChmHelpViewer.CheckBuildLHelp failed because lhelp.lpi not found']);
@ -305,9 +306,7 @@ begin
IDEMessagesWindow.BeginBlock; IDEMessagesWindow.BeginBlock;
IDEMessagesWindow.AddMsg('- Building lhelp -','',0); IDEMessagesWindow.AddMsg('- Building lhelp -','',0);
LHelpProject := '$(LazarusDir)/components/chmhelp/lhelp/'; LHelpProjectDir := ExtractFilePath(LHelpProject);
IDEMacros.SubstituteMacros(LHelpProject);
LHelpProject:=TrimFilename(SetDirSeparators(LHelpProject));
while Proc.Running do begin while Proc.Running do begin
while Proc.Output.NumBytesAvailable > 0 do while Proc.Output.NumBytesAvailable > 0 do
@ -318,7 +317,7 @@ begin
if not(BufC in [#13, #10]) then if not(BufC in [#13, #10]) then
begin begin
IDEMessagesWindow.AddMsg(PChar(@Buffer[0]),LHelpProject,1); IDEMessagesWindow.AddMsg(PChar(@Buffer[0]),LHelpProjectDir,1);
Buffer[0] := BufC; Buffer[0] := BufC;
BufP := 1; BufP := 1;
LastWasEOL:=False; LastWasEOL:=False;
@ -343,7 +342,7 @@ begin
end; end;
if BufP > 0 then if BufP > 0 then
IDEMessagesWindow.AddMsg(PChar(@Buffer[0]),LHelpProject,0); IDEMessagesWindow.AddMsg(PChar(@Buffer[0]),LHelpProjectDir,0);
if Proc.ExitStatus = 0 then if Proc.ExitStatus = 0 then