paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-06-23 22:58:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fix selection of package

Browse Source 
git-svn-id: trunk@32895 -
This commit is contained in:
michael 2016-01-09 17:46:24 +00:00
parent 4ccc75e2e8
commit a87e83e9b7
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
utils/fpdoc/fpdoc.pp
View File

@ -178,16 +178,20 @@ end;
procedure TFPDocApplication.ParseCommandLine; procedure TFPDocApplication.ParseCommandLine;
Const
SOptProject = '--project=';
SOptPackage = '--package=';
Function ProjectOpt(Const s : string) : boolean; Function ProjectOpt(Const s : string) : boolean;
begin begin
Result:=(Copy(s,1,3)='-p=') or (Copy(s,1,10)='--project='); Result:=(Copy(s,1,3)='-p=') or (Copy(s,1,Length(SOptProject))=SOptProject);
end; end;
Function PackageOpt(Const s : string) : boolean; Function PackageOpt(Const s : string) : boolean;
begin begin
Result:=((Copy(s,1,3)='-a=') or (Copy(s,1,10)='--package=')); Result:=((Copy(s,1,3)='-a=') or (Copy(s,1,Length(SOptPackage))=SOptPackage));
end; end;
var var
@ -195,17 +199,18 @@ var
s : string; s : string;
begin begin
// Check project // Check project
for i := 1 to ParamCount do for i := 1 to ParamCount do
begin begin
s:=ParamStr(I); s:=ParamStr(I);
If ProjectOpt(S) then If ProjectOpt(S) then
ParseOption(s); ParseOption(s);
If (FCreator.Packages.Count=1) then
FPackage:=FCreator.Packages[0]
else if (FCreator.Options.DefaultPackageName<>'') then
Fpackage:=FCreator.Packages.FindPackage(FCreator.Options.DefaultPackageName);
end; end;
If (FCreator.Packages.Count=1) then
FPackage:=FCreator.Packages[0]
else if (FCreator.Options.DefaultPackageName<>'') then
Fpackage:=FCreator.Packages.FindPackage(FCreator.Options.DefaultPackageName);
If FCreator.Project.Packages.Count=0 then If FCreator.Project.Packages.Count=0 then
begin // Add default package if none defined begin // Add default package if none defined
FPackage:=FCreator.Packages.Add as TFPDocPackage; FPackage:=FCreator.Packages.Add as TFPDocPackage;
@ -224,6 +229,11 @@ begin
ParseOption(s); ParseOption(s);
end; end;
SelectedPackage; // Will print error if none available. SelectedPackage; // Will print error if none available.
// Set defaults
if FCreator.Options.BackEnd='' then
FCreator.Options.BackEnd:='html';
if SelectedPackage.Output='' then
SelectedPackage.Output:=SelectedPackage.Name;
end; end;
procedure TFPDocApplication.ParseOption(Const S : String); procedure TFPDocApplication.ParseOption(Const S : String);
@ -369,11 +379,6 @@ begin
FCreator.Options.BackendOptions.Add(Arg); FCreator.Options.BackendOptions.Add(Arg);
end; end;
end; end;
// Set defaults
if FCreator.Options.BackEnd='' then
FCreator.Options.BackEnd:='html';
if SelectedPackage.Output='' then
SelectedPackage.Output:=SelectedPackage.Name;
end; end;
Procedure TFPDocApplication.DoRun; Procedure TFPDocApplication.DoRun;