paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-21 03:39:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

undo

Browse Source 
git-svn-id: trunk@61011 -
This commit is contained in:
mattias 2019-04-18 08:11:56 +00:00
parent ab0aa9bf2a
commit a06e60a246
6 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
components/chmhelp/lhelp/lhelp.res
View File

Binary file not shown.

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

@ -239,7 +239,10 @@ begin
end; end;
{$IFDEF CHMLOADTIMES} {$IFDEF CHMLOADTIMES}
DebugLn(['CHMLOADTIMES: ',Format('Loading chm files took %d ms',[DateTimeToTimeStamp(Now-StartTime).Time])]); DebugLn(['CHMLOADTIMES: ',Format('Loading chm files took %d ms',[DateTimeToTimeStamp(Now-StartTime).Time])]);
{$ENDIF} {$ENDIF}
finally finally
fHelpConnection.EndUpdate; fHelpConnection.EndUpdate;
CHMFiles.Free; CHMFiles.Free;
@ -448,7 +451,6 @@ var
i: Integer; i: Integer;
DB: TFPDocHTMLHelpDatabase; DB: TFPDocHTMLHelpDatabase;
BaseURL: THelpBaseURLObject; BaseURL: THelpBaseURLObject;
HelpDB: THelpDatabase;
begin begin
inherited Create(TheOwner); inherited Create(TheOwner);
fHelpConnection := TLHelpConnection.Create; fHelpConnection := TLHelpConnection.Create;
@ -456,9 +458,7 @@ begin
AddSupportedMimeType('application/x-chm'); AddSupportedMimeType('application/x-chm');
for i := 0 to HelpDatabases.Count-1 do for i := 0 to HelpDatabases.Count-1 do
begin begin
HelpDB := HelpDatabases.Items[i]; DB := TFPDocHTMLHelpDatabase(HelpDatabases.Items[i]);
if not (HelpDB is TFPDocHTMLHelpDatabase) then continue;
DB := TFPDocHTMLHelpDatabase(HelpDB);
BaseURL := THelpBaseURLObject(DB.BasePathObject); BaseURL := THelpBaseURLObject(DB.BasePathObject);
if (DB.ID = 'RTLUnits') and (BaseURL.BaseURL = '') then if (DB.ID = 'RTLUnits') and (BaseURL.BaseURL = '') then
begin begin
@ -537,7 +537,7 @@ begin
SearchPath := GetHelpFilesPath; SearchPath := GetHelpFilesPath;
// Start up help viewer if needed - and tell it to hide // Start up help viewer if needed - and tell it to hide
if not (fHelpConnection.ServerRunning) then if not(fHelpConnection.ServerRunning) then
begin begin
fHelpConnection.StartHelpServer(HelpLabel, HelpExeFileName, true); fHelpConnection.StartHelpServer(HelpLabel, HelpExeFileName, true);
Response := fHelpConnection.RunMiscCommand(mrVersion); Response := fHelpConnection.RunMiscCommand(mrVersion);

8
docs/html/build_lcl_docs.lpi
View File

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="12"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<General> <General>
<Flags> <Flags>
<LRSInOutputDirectory Value="False"/> <LRSInOutputDirectory Value="False"/>
<CompatibilityMode Value="True"/>
</Flags> </Flags>
<SessionStorage Value="InIDEConfig"/> <SessionStorage Value="InIDEConfig"/>
<MainUnit Value="0"/>
<Title Value="build_lcl_docs"/> <Title Value="build_lcl_docs"/>
</General> </General>
<BuildModes Count="1"> <BuildModes Count="1">
@ -19,13 +19,13 @@
</PublishOptions> </PublishOptions>
<RunParams> <RunParams>
<local> <local>
<LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/> <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
</local> </local>
<FormatVersion Value="2"/> <FormatVersion Value="2"/>
<Modes Count="1"> <Modes Count="1">
<Mode0 Name="default"> <Mode0 Name="default">
<local> <local>
<LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/> <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
</local> </local>
</Mode0> </Mode0>
</Modes> </Modes>

BIN
examples/database/dblookup/project1.res
View File

Binary file not shown.

BIN
ide/lazarus.res
View File

Binary file not shown.

5
ide/project.pp
View File

@ -4678,9 +4678,8 @@ var
PkgDependency: TPkgDependency; PkgDependency: TPkgDependency;
begin begin
PkgDependency:=FindDependencyByNameInList(FirstRequiredDependency,pdlRequires,PackageName); PkgDependency:=FindDependencyByNameInList(FirstRequiredDependency,pdlRequires,PackageName);
Result := Assigned(PkgDependency); if PkgDependency=nil then exit(false);
if Result then RemoveRequiredDependency(PkgDependency);
RemoveRequiredDependency(PkgDependency);
end; end;
procedure TProject.LockUnitComponentDependencies; procedure TProject.LockUnitComponentDependencies;