--- Merging r32795 into '.':

U    packages/hash/src/md5.pp
--- Recording mergeinfo for merge of r32795 into '.':
 U   .
--- Merging r32804 into '.':
U    packages/openssl/src/openssl.pas
--- Recording mergeinfo for merge of r32804 into '.':
 G   .
--- Merging r32805 into '.':
U    packages/openssl/examples/test1.pas
--- Recording mergeinfo for merge of r32805 into '.':
 G   .
--- Merging r32806 into '.':
U    packages/fcl-fpcunit/src/demo/consolerunner/testrunner.pp
U    packages/fcl-fpcunit/src/fpcunit.pp
--- Recording mergeinfo for merge of r32806 into '.':
 G   .
--- Merging r32809 into '.':
U    utils/fpdoc/fpdoc.pp
--- Recording mergeinfo for merge of r32809 into '.':
 G   .
--- Merging r32814 into '.':
U    packages/rtl-unicode/src/collations/collation_zh_be.inc
U    packages/rtl-unicode/src/collations/collation_es_le.inc
U    packages/rtl-unicode/src/collations/collation_ko_le.inc
U    packages/rtl-unicode/src/collations/collation_zh.pas
U    packages/rtl-unicode/src/collations/collation_ru_be.inc
U    packages/rtl-unicode/src/collations/collation_sv_be.inc
U    packages/rtl-unicode/src/collations/collation_ja_be.inc
U    packages/rtl-unicode/src/collations/collation_ru.pas
U    packages/rtl-unicode/src/collations/collation_zh_le.inc
U    packages/rtl-unicode/src/collations/collation_de.pas
U    packages/rtl-unicode/src/collations/collation_sv.pas
U    packages/rtl-unicode/src/collations/collation_ja.pas
U    packages/rtl-unicode/src/collations/collation_ru_le.inc
U    packages/rtl-unicode/src/collations/collation_sv_le.inc
U    packages/rtl-unicode/src/collations/collation_ja_le.inc
U    packages/rtl-unicode/src/collations/collation_es_be.inc
U    packages/rtl-unicode/src/collations/collation_ko_be.inc
U    packages/rtl-unicode/src/collations/collation_es.pas
U    packages/rtl-unicode/src/collations/collation_ko.pas
U    packages/rtl-unicode/src/collations/collation_fr_ca.pas
U    packages/rtl-unicode/src/inc/ucadata.inc
U    packages/rtl-unicode/src/inc/ucadata_le.inc
U    packages/rtl-unicode/src/inc/ucadata_be.inc
--- Recording mergeinfo for merge of r32814 into '.':
 G   .
--- Merging r32820 into '.':
U    packages/winunits-jedi/src/jwaactivex.pas
U    rtl/objpas/types.pp
U    rtl/objpas/classes/classesh.inc
U    rtl/objpas/classes/streams.inc
--- Recording mergeinfo for merge of r32820 into '.':
 G   .
--- Merging r32826 into '.':
U    packages/fcl-process/src/process.pp
--- Recording mergeinfo for merge of r32826 into '.':
 G   .
--- Merging r32860 into '.':
U    packages/paszlib/examples/miniunz.pas
--- Recording mergeinfo for merge of r32860 into '.':
 G   .
--- Merging r32861 into '.':
U    packages/paszlib/src/zipper.pp
--- Recording mergeinfo for merge of r32861 into '.':
 G   .
--- Merging r32862 into '.':
A    packages/paszlib/examples/fpzipper.lpi
A    packages/paszlib/examples/fpunzipper.lpi
A    packages/paszlib/examples/fpzipper.lpr
A    packages/paszlib/examples/fpunzipper.lpr
--- Recording mergeinfo for merge of r32862 into '.':
 G   .
--- Merging r32868 into '.':
U    packages/fcl-fpcunit/src/consoletestrunner.pas
--- Recording mergeinfo for merge of r32868 into '.':
 G   .
--- Merging r32891 into '.':
A    packages/fcl-process/examples
A    packages/fcl-process/examples/demoproject.ico
A    packages/fcl-process/examples/demoproject.pp
A    packages/fcl-process/examples/demoproject.lpi
A    packages/fcl-process/examples/echoparams.pp
A    packages/fcl-process/examples/demoproject.res
--- Recording mergeinfo for merge of r32891 into '.':
 G   .
--- Merging r32892 into '.':
A    packages/fcl-process/examples/demoruncommand.lpi
A    packages/fcl-process/examples/demoruncommand.pp
--- Recording mergeinfo for merge of r32892 into '.':
 G   .
--- Merging r32893 into '.':
G    packages/fcl-process/src/process.pp
--- Recording mergeinfo for merge of r32893 into '.':
 G   .
--- Merging r32895 into '.':
G    utils/fpdoc/fpdoc.pp
--- Recording mergeinfo for merge of r32895 into '.':
 G   .

# revisions: 32795,32804,32805,32806,32809,32814,32820,32826,32860,32861,32862,32868,32891,32892,32893,32895


git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@33748 3ad0048d-3df7-0310-abae-a5850022a9f2

1 files changed, 16 insertions, 6 deletions

diff --git a/utils/fpdoc/fpdoc.pp b/utils/fpdoc/fpdoc.pp
index 586decbf63..39f1c928e9 100644
--- a/utils/fpdoc/fpdoc.pp
+++ b/utils/fpdoc/fpdoc.pp
@@ -176,16 +176,20 @@ end;
 
 procedure TFPDocApplication.ParseCommandLine;
 
+Const
+  SOptProject = '--project=';
+  SOptPackage = '--package=';
+  
   Function ProjectOpt(Const s : string) : boolean;
 
   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;
 
   Function PackageOpt(Const s : string) : boolean;
 
   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;
 
 var
@@ -193,17 +197,18 @@ var
   s : string;
 
 begin
+
   // Check project
   for i := 1 to ParamCount do
     begin
     s:=ParamStr(I);
     If ProjectOpt(S) then
       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;
+  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
     begin // Add default package if none defined
     FPackage:=FCreator.Packages.Add as TFPDocPackage;
@@ -222,6 +227,11 @@ begin
       ParseOption(s);
     end;
   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;
 
 procedure TFPDocApplication.ParseOption(Const S : String);