git-svn-id: branches/fixes_2_0@61014 -
This commit is contained in:
mattias 2019-04-18 08:13:51 +00:00
parent d93e7e3dbc
commit 4874a3ba56
3 changed files with 7 additions and 12 deletions

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="11"/> <Version Value="10"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<General> <General>
<Flags> <Flags>
@ -16,19 +16,15 @@
</BuildModes> </BuildModes>
<PublishOptions> <PublishOptions>
<Version Value="2"/> <Version Value="2"/>
<IgnoreBinaries Value="False"/>
<IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
<ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
</PublishOptions> </PublishOptions>
<RunParams> <RunParams>
<local> <local>
<FormatVersion Value="1"/>
<LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -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"/>
<Modes Count="1">
<Mode0 Name="default">
<local>
<LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
</local>
</Mode0>
</Modes>
</RunParams> </RunParams>
<RequiredPackages Count="2"> <RequiredPackages Count="2">
<Item1> <Item1>

Binary file not shown.

View File

@ -4642,9 +4642,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;