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

DocMgr: removed package, fixed various problems

Browse Source 
git-svn-id: trunk@34917 -
This commit is contained in:
dodi 2012-01-25 08:38:05 +00:00
parent 6e6c4d9600
commit 59043e7ffb
9 changed files with 36 additions and 134 deletions

1
.gitattributes vendored
View File

@ -3726,7 +3726,6 @@ examples/fpdocmanager/flogview.lfm svneol=native#text/plain
examples/fpdocmanager/flogview.pas svneol=native#text/pascal
examples/fpdocmanager/fmain.lfm svneol=native#text/plain
examples/fpdocmanager/fmain.pas svneol=native#text/pascal
examples/fpdocmanager/fpdocengine.lpk svneol=native#text/plain
examples/fpdocmanager/fupdateview.lfm svneol=native#text/plain
examples/fpdocmanager/fupdateview.pas svneol=native#text/pascal
examples/fpdocmanager/ulpk.pp svneol=native#text/pascal

18
examples/fpdocmanager/FPDocManager.lpi
View File

@ -32,18 +32,15 @@
<WorkingDirectory Value="D:\AllDocs"/>
</local>
</RunParams>
<RequiredPackages Count="3">
<RequiredPackages Count="2">
<Item1>
<PackageName Value="FPDocEngine"/>
<PackageName Value="SynEdit"/>
</Item1>
<Item2>
<PackageName Value="SynEdit"/>
</Item2>
<Item3>
<PackageName Value="LCL"/>
</Item3>
</Item2>
</RequiredPackages>
<Units Count="9">
<Units Count="10">
<Unit0>
<Filename Value="FPDocManager.lpr"/>
<IsPartOfProject Value="True"/>
@ -97,6 +94,11 @@
<IsPartOfProject Value="True"/>
<UnitName Value="ConfigFile"/>
</Unit8>
<Unit9>
<Filename Value="..\..\..\fpc-trunk\utils\fpdoc\dglobals.pp"/>
<IsPartOfProject Value="True"/>
<UnitName Value="dGlobals"/>
</Unit9>
</Units>
</ProjectOptions>
<CompilerOptions>
@ -107,6 +109,7 @@
</Target>
<SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/>
<OtherUnitFiles Value="..\..\..\fpc-trunk\utils\fpdoc"/>
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<Linking>
@ -120,7 +123,6 @@
<CompilerMessages>
<UseMsgFile Value="True"/>
</CompilerMessages>
<CustomOptions Value="-uDoDi"/>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions>

3
examples/fpdocmanager/FPDocManager.lpr
View File

@ -7,7 +7,7 @@ uses
cthreads,
{$ENDIF}{$ENDIF}
Interfaces, // this includes the LCL widgetset
Forms, umakeskel, fMain, fConfig, uManager, fLogView,
Forms, dGlobals, umakeskel, fMain, fConfig, uManager, fLogView,
fUpdateView, ulpk, ConfigFile;
{$R *.res}
@ -16,7 +16,6 @@ begin
RequireDerivedFormResource := True;
Application.Initialize;
Application.CreateForm(TMain, Main);
Application.CreateForm(TCfgWizard, CfgWizard);
Application.CreateForm(TLogView, LogView);
Application.CreateForm(TUpdateView, UpdateView);
Application.Run;

5
examples/fpdocmanager/README.txt
View File

@ -20,7 +20,12 @@ Release notes 1.0
The FPDoc Manager requires FPC 2.7 (rev. 19947) for proper operation of the
FPDoc units.
For reference to the proper FPDoc units please update the dGlobals.pp reference
in the project file, to point to your FPC/utils/fpdoc/ directory.
A package FPDocEngine.lpk has been created for the FPDoc units, please move it
into your $FPC/utils/fpdoc/ directory and compile the package there.
This package has been removed again, because it introduces complications when
a mix of FPC 2.6 and 2.7 units was used.
DoDi

12
examples/fpdocmanager/fmain.lfm
View File

@ -27,17 +27,17 @@ object Main: TMain
Height = 464
Top = 0
Width = 475
ActivePage = ViewFinal
ActivePage = ViewUnits
Align = alClient
TabIndex = 1
TabIndex = 0
TabOrder = 1
object ViewUnits: TTabSheet
Caption = 'Units'
ClientHeight = 414
ClientHeight = 436
ClientWidth = 467
object lbUnits: TListBox
Left = 0
Height = 414
Height = 436
Top = 0
Width = 100
Align = alLeft
@ -47,12 +47,12 @@ object Main: TMain
end
object GroupBox1: TGroupBox
Left = 100
Height = 414
Height = 436
Top = 0
Width = 367
Align = alClient
Caption = 'Actions'
ClientHeight = 396
ClientHeight = 418
ClientWidth = 363
TabOrder = 1
object swAll: TRadioButton

5
examples/fpdocmanager/fmain.pas
View File

@ -452,9 +452,10 @@ end;
procedure TMain.mnConfigClick(Sender: TObject);
begin
Manager.BeginUpdate;
if not assigned(CfgWizard) then
CfgWizard := TCfgWizard.Create(self);
if CfgWizard.ShowModal <> mrCancel then begin
//UpdateDocs; - by Manager!?
//Manager.Config.;
//all done
end;
Manager.EndUpdate;
end;

112
examples/fpdocmanager/fpdocengine.lpk
View File

@ -1,112 +0,0 @@
<?xml version="1.0"?>
<CONFIG>
<Package Version="4">
<PathDelim Value="\"/>
<Name Value="FPDocEngine"/>
<AddToProjectUsesSection Value="True"/>
<Author Value="DoDi"/>
<AutoUpdate Value="Manually"/>
<CompilerOptions>
<Version Value="11"/>
<PathDelim Value="\"/>
<SearchPaths>
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<Other>
<CompilerMessages>
<UseMsgFile Value="True"/>
</CompilerMessages>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions>
<Description Value="FPDoc tools as a package."/>
<License Value="LGPL"/>
<Version Major="1"/>
<Files Count="18">
<Item1>
<Filename Value="dglobals.pp"/>
<UnitName Value="dGlobals"/>
</Item1>
<Item2>
<Filename Value="dwlinear.pp"/>
<UnitName Value="dwlinear"/>
</Item2>
<Item3>
<Filename Value="dwriter.pp"/>
<UnitName Value="dWriter"/>
</Item3>
<Item4>
<Filename Value="dw_dxml.pp"/>
<UnitName Value="dw_dXML"/>
</Item4>
<Item5>
<Filename Value="dw_html.pp"/>
<UnitName Value="dw_HTML"/>
</Item5>
<Item6>
<Filename Value="dw_htmlchm.inc"/>
<Type Value="Include"/>
</Item6>
<Item7>
<Filename Value="dw_ipflin.pas"/>
<UnitName Value="dw_ipflin"/>
</Item7>
<Item8>
<Filename Value="dw_latex.pp"/>
<UnitName Value="dw_LaTeX"/>
</Item8>
<Item9>
<Filename Value="dw_linrtf.pp"/>
<UnitName Value="dw_LinRTF"/>
</Item9>
<Item10>
<Filename Value="dw_lintmpl.pp"/>
<UnitName Value="dw_lintmpl"/>
</Item10>
<Item11>
<Filename Value="dw_man.pp"/>
<UnitName Value="dw_man"/>
</Item11>
<Item12>
<Filename Value="dw_txt.pp"/>
<UnitName Value="dw_txt"/>
</Item12>
<Item13>
<Filename Value="dw_xml.pp"/>
<UnitName Value="dw_XML"/>
</Item13>
<Item14>
<Filename Value="fpdocproj.pas"/>
<UnitName Value="fpdocproj"/>
</Item14>
<Item15>
<Filename Value="fpdocxmlopts.pas"/>
<UnitName Value="fpdocxmlopts"/>
</Item15>
<Item16>
<Filename Value="mgrfpdocproj.pp"/>
<UnitName Value="mgrfpdocproj"/>
</Item16>
<Item17>
<Filename Value="mkfpdoc.pp"/>
<UnitName Value="mkfpdoc"/>
</Item17>
<Item18>
<Filename Value="sh_pas.pp"/>
<UnitName Value="sh_pas"/>
</Item18>
</Files>
<LazDoc Paths="docs"/>
<RequiredPkgs Count="1">
<Item1>
<PackageName Value="FCL"/>
</Item1>
</RequiredPkgs>
<UsageOptions>
<UnitPath Value="$(PkgOutDir)"/>
</UsageOptions>
<PublishOptions>
<Version Value="2"/>
</PublishOptions>
</Package>
</CONFIG>

2
examples/fpdocmanager/umakeskel.pas
View File

@ -50,7 +50,7 @@ interface
{$h+}
{$IF FPC_FULLVERSION<20701}
{.$ERROR requires FPC 2.7.1 at least}
{$ERROR requires FPC 2.7.1 at least}
{$ENDIF}
uses

12
examples/fpdocmanager/umanager.pas
View File

@ -205,7 +205,7 @@ var
implementation
uses
uLpk;
uLpk, PParser;
const
ConfigName = 'docmgr.ini';
@ -926,7 +926,14 @@ function TFPDocManager.TestRun(APkg: TDocPackage; AUnit: string): boolean;
begin
BeginTest(APkg.ProjectFile);
try
Result := Helper.TestRun(APkg, AUnit);
try
Result := Helper.TestRun(APkg, AUnit);
except
on E: EParserError do
DoLog(Format('%s(%d,%d): %s',[e.Filename, e.Row, e.Column, e.Message]));
on E: Exception do
DoLog(E.Message);
end;
finally
EndTest;
end;
@ -1059,6 +1066,7 @@ begin
try
//override options for test
ParseFPDocOption('--format=html');
ParseFPDocOption('-v');
ParseFPDocOption('-n');
//verbose?
CreateUnitDocumentation(AUnit, True);