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

chmhelp: fixed path sep normalization

Browse Source 
git-svn-id: trunk@53231 -
This commit is contained in:
mattias 2016-10-26 16:48:20 +00:00
parent f22350e1c5
commit e5eb945c49
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/chmhelp/packages/idehelp/chmlangref.pas
View File

@ -104,7 +104,7 @@ begin
begin
fCHMSearchPath := '$(LazarusDir)/docs/chm;$(LazarusDir)/docs/html';
IDEMacros.SubstituteMacros(fCHMSearchPath);
fCHMSearchPath := MinimizeSearchPath(SetDirSeparators(fCHMSearchPath));
fCHMSearchPath := MinimizeSearchPath(GetForcedPathDelims(fCHMSearchPath));
end;
Filename:=SearchFileInPath(ChmFileName,'',fCHMSearchPath,';',[]);

2
components/chmhelp/packages/idehelp/chmprog.pas
View File

@ -186,7 +186,7 @@ begin
begin
Result := '$(LazarusDir)/docs/chm;$(LazarusDir)/docs/html';
IDEMacros.SubstituteMacros(Result);
Result:=MinimizeSearchPath(SetDirSeparators(Result));
Result:=MinimizeSearchPath(GetForcedPathDelims(Result));
end;
end;

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

@ -264,7 +264,7 @@ function TChmHelpViewer.GetHelpEXE: String;
begin
Result := fHelpExe;
if Result='' then
Result := SetDirSeparators('$(LazarusDir)/components/chmhelp/lhelp/lhelp$(ExeExt)');
Result := GetForcedPathDelims('$(LazarusDir)/components/chmhelp/lhelp/lhelp$(ExeExt)');
if not IDEMacros.SubstituteMacros(Result) then
Exit('');
end;
@ -275,7 +275,7 @@ begin
if Result='' then
Result:='$(LazarusDir)/docs/chm;$(LazarusDir)/docs/html;$(LazarusDir)/docs/html/lcl';
IDEMacros.SubstituteMacros(Result);
Result:=MinimizeSearchPath(SetDirSeparators(Result));
Result:=MinimizeSearchPath(GetForcedPathDelims(Result));
end;
function TChmHelpViewer.GetFileNameAndURL(RawUrl:String; out FileName: String; out URL: String
@ -368,7 +368,7 @@ begin
Exit;
end;
LHelpProject := '$(LazarusDir)'+SetDirSeparators('/components/chmhelp/lhelp/lhelp.lpi');
LHelpProject := '$(LazarusDir)'+GetForcedPathDelims('/components/chmhelp/lhelp/lhelp.lpi');
if not IDEMacros.SubstituteMacros(LHelpProject) then exit;
LHelpProject:=TrimFilename(LHelpProject);
if not FileExistsUTF8(LHelpProject) then
@ -417,7 +417,7 @@ begin
Result := False;
ALazBuild:= '$(LazarusDir)/$MakeExe(lazbuild)';
if not IDEMacros.SubstituteMacros(ALazBuild) then exit;
ALazBuild:=TrimFilename(SetDirSeparators(ALazBuild));
ALazBuild:=TrimFilename(GetForcedPathDelims(ALazBuild));
Result:=FileExistsUTF8(ALazBuild);
end;
@ -514,11 +514,11 @@ begin
IDEMessageDialog(HELP_MissingLhelp,
Format(HELP_UnableToFindTheLhelpViewerPleaseCompileTheLhelpPro,
[LineEnding, HelpExeFileName, LineEnding+LineEnding, LineEnding,
SetDirSeparators('components/chmhelp/lhelp/lhelp.lpi')]),
GetForcedPathDelims('components/chmhelp/lhelp/lhelp.lpi')]),
mtError,[mbCancel]);
Debugln(Format('ChmHelpViewer: '+HELP_UnableToFindTheLhelpViewerPleaseCompileTheLhelpPro,
[LineEnding, HelpExeFileName, LineEnding+LineEnding, LineEnding,
SetDirSeparators('components/chmhelp/lhelp/lhelp.lpi')]));
GetForcedPathDelims('components/chmhelp/lhelp/lhelp.lpi')]));
exit;
end;